From 36c7f77a98baba7c0226d2624573ba5f4343d74c Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 29 Nov 2023 13:56:17 +0000
Subject: [PATCH] nixpkgs: 2023-11-28 -> 2023-11-29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/c9702bf40b036c0f1d3d5b0aaf3eee2bf920124c' (2023-11-28)
  → 'github:nixos/nixpkgs/6711380ae7874005d707d7d03830bd5eee40b43b' (2023-11-29)
```
---
 flake.lock          |  6 +++---
 nixpatches/list.nix | 34 ++++++++++++++++------------------
 overlays/cross.nix  | 11 -----------
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index a4ff4309..0c8812c4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,11 +53,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1701180790,
-        "narHash": "sha256-kYWcHsk2A1VUpiOvSo7Pq175WnSVeltspTGM2q+Cr3U=",
+        "lastModified": 1701298762,
+        "narHash": "sha256-WFJCmIVabZrrV5VICcvXdoYF5WYQ2LbxSjGVQRn09pg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9702bf40b036c0f1d3d5b0aaf3eee2bf920124c",
+        "rev": "6711380ae7874005d707d7d03830bd5eee40b43b",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 6b4cc4eb..379965c8 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -24,32 +24,30 @@ let
     );
 in [
   (fetchpatch' {
-    title = "fetchFromGitLab: passthru owner and repo";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/270393";
-    hash = "sha256-Kqqfy9Mludc5wr0TSUg9gEOZsfUL65WpF+hy64k33MY=";
+    title = "ripgrep: fix shell completions when cross compiling";
+    saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367";
+    hash = "sha256-AkxtrCJrf0wpTdty4SOIWBrWwqfG7rBI4ON38BjDi6s=";
   })
+  # (fetchpatch' {
+  #   title = "nixos/slskd: allow omitting username from yaml config";
+  #   saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
+  #   hash = "sha256-xQEj/oIfNcE4td9jxzDzhlnIYpncOOdXZuswkmcLNuk=";
+  # })
+  # (fetchpatch' {
+  #   title = "nixos/slskd: don't enable nginx unless nginx.enable was set";
+  #   saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
+  #   hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
+  # })
   (fetchpatch' {
-    # out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
-    title = "nixos/slskd: allow omitting username from yaml config";
-    saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";
-    hash = "sha256-xQEj/oIfNcE4td9jxzDzhlnIYpncOOdXZuswkmcLNuk=";
-  })
-  (fetchpatch' {
-    # out for PR: <https://github.com/NixOS/nixpkgs/pull/270646>
-    title = "nixos/slskd: don't enable nginx unless nginx.enable was set";
-    saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
-    hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
+    title = "nixos/slskd: option fixes";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/270646";
+    hash = "sha256-5brmmPfYp7G+5Dr5q2skWSwkrEwsRAe/UetoN0AqGjY=";
   })
   (fetchpatch' {
     title = "vala: look for files in targetOffset";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/267550";
     hash = "sha256-Dl9ZQazjXjIbw38Q78otQvgVCB/QZAC1IYoFX0Tuyw0=";
   })
-  (fetchpatch' {
-    title = "tuba: 0.4.1 -> 0.5.0";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/269725";
-    hash = "sha256-U2ipKRCFqczxj2kuIDPPRI/qnObJN/yz160Cvd4VFQ4=";
-  })
   # (fetchpatch' {
   #   # N.B.: obsoleted by 267550 PR above
   #   title = "vala: search for vapi files in targetOffset, not hostOffset";
diff --git a/overlays/cross.nix b/overlays/cross.nix
index b5060608..a021186d 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -1814,17 +1814,6 @@ in {
   #   });
   # });
 
-  ripgrep = prev.ripgrep.overrideAttrs (upstream: {
-    # 2023/11/27: upstreaming is out for PR: <https://github.com/NixOS/nixpkgs/pull/270521>
-    # ripgrep generates its own manpage.
-    # this is only problematic on a non-binfmt machine
-    preFixup = lib.replaceStrings
-      [ "$out/bin/rg" ]
-      [ "${final.stdenv.hostPlatform.emulator final.buildPackages} $out/bin/rg" ]
-      upstream.preFixup
-    ;
-  });
-
   # rmlint = prev.rmlint.override {
   #   # fixes "Checking whether the C compiler works... no"
   #   # rmlint is scons; it reads the CC environment variable, though, so *may* be cross compilable