From 03615ce2447db1befa0503b057614182db41244f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 25 Feb 2024 19:05:53 +0000
Subject: [PATCH] nixpkgs: 2024-02-24 -> 2024-02-25; sops-nix -> 2024-02-25
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/a3e2b0de906a8fe0143c2783199abdc132dee56a' (2024-02-24)
  → 'github:nixos/nixpkgs/f42891a2fa716dcab10336a1b7313993430568ea' (2024-02-25)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/b66514c14e85cd7d853d6dbbf1a421ba232eff10' (2024-02-24)
  → 'github:nixos/nixpkgs/8e474340ed0592ca21c1398d88dd89bf7100e881' (2024-02-25)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/f6b80ab6cd25e57f297fe466ad689d8a77057c11' (2024-02-21)
  → 'github:Mic92/sops-nix/2874fbbe4a65bd2484b0ad757d27a16107f6bc17' (2024-02-25)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/69405156cffbdf2be50153f13cbdf9a0bea38e49' (2024-02-17)
  → 'github:NixOS/nixpkgs/89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea' (2024-02-25)
```
---
 flake.lock          | 24 ++++++++++++------------
 nixpatches/list.nix | 31 ++++++++-----------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6c7f07da..667f2e03 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1708776075,
-        "narHash": "sha256-SFhibVONg+0qHyzmO2VmDn6kD5UZ/FN27Qpr6S1ehgU=",
+        "lastModified": 1708884056,
+        "narHash": "sha256-xOEdqLXanV6tZ5BEPg5BaGaQL4R1Lfbjd5odplK+kho=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a3e2b0de906a8fe0143c2783199abdc132dee56a",
+        "rev": "f42891a2fa716dcab10336a1b7313993430568ea",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1708210246,
-        "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
+        "lastModified": 1708819810,
+        "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
+        "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1708776830,
-        "narHash": "sha256-V0ghU3y+RwH7ZHKa7jEowts98p81MIFhgyjRYpGDgzo=",
+        "lastModified": 1708887631,
+        "narHash": "sha256-Dt36BNZnS042z1L0WKzSQg3rbov6J5gUr6rfcL2w+7c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b66514c14e85cd7d853d6dbbf1a421ba232eff10",
+        "rev": "8e474340ed0592ca21c1398d88dd89bf7100e881",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1708500294,
-        "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
+        "lastModified": 1708830076,
+        "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
+        "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 0e57aabe..76b7547c 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -32,29 +32,11 @@ in [
     title = "libkiwix: 12.1.1 -> 13.1.0";
     hash = "sha256-li6wDwhwIwRiuh4eqtRIkJbeOS/ZBIvte3LWby7RnZE=";
   })
-  (fetchpatch' {
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/291232";
-    title = "bonsai: 1.0.2 -> 1.1.0";
-    hash = "sha256-WHb/pMEQNTLugj96iv705TMmjCT1hWUFQCKKMiM/8qY=";
-  })
-  (fetchpatch' {
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/290761";
-    title = "icu: fix cross compilation";
-    # saneCommit = "ab094c1e8a511a019cd872b0e957cb42adadd39c";
-    hash = "sha256-R3EIQwIMMCACmGKbfW6Xv7uZhCDQ/bMHw8/pHcnmOLo=";
-  })
   (fetchpatch' {
     saneCommit = "20c9492d303be7cbad560e3d83bc47ab4b1e93f7";
     title = "procmail: support cross compilation";
     hash = "sha256-cC9GBF5tCeJ2GDSjMjlG4hYStIJPEoRBAK9/KhJiiIo=";
   })
-  (fetchpatch' {
-    # fixes build on moby by avoiding broken `lockfileProgs`
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/286533";
-    title = "xdg-utils: remove unnecessary input";
-    hash = "sha256-IAt07OSGaX8QHaOzlmYFTZJpvmXjYFA6/IFPsMzQVW8=";
-    merged.staging = "202402061152";
-  })
   (fetchpatch' {
     prUrl = "https://github.com/NixOS/nixpkgs/pull/280925";
     title = "j4-dmenu-desktop: pin to gcc12";  # 2024/01/14: fix build
@@ -90,11 +72,14 @@ in [
     # hash = "sha256-9PNKzNlJ62WAq6H+tqlt0spFZ1DPP1hHmpx0YPuieFE=";
     hash = "sha256-6hUdsExHSMHy6FMY1+OLtVmKpRwysGIVkcDpYv7RRBk=";
   })
-  (fetchpatch' {
-    title = "hspell: remove build perl from runtime closure";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
-    hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
-  })
+
+  # 2024/02/25: still outstanding; merge conflicts
+  # (fetchpatch' {
+  #   title = "hspell: remove build perl from runtime closure";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
+  #   hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
+  # })
+
   # (fetchpatch' {
   #   title = "trust-dns: 0.23.0 -> 0.24.0";
   #   prUrl = "https://github.com/NixOS/nixpkgs/pull/262466";