From aba5eee83737b247ed0238ecb700fa7241ba200a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 26 Mar 2024 00:57:17 +0000
Subject: [PATCH] nixpkgs: 2024-03-25 -> 2024-03-26; others
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/8794d573a4fdd15b0002135cebf65a8f5d9adb6c' (2024-03-25)
  → 'github:nixos/nixpkgs/c904e6bf24e582e4fe28e988b7cdb7e9fda595c3' (2024-03-26)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/0d2dc20762f21c3e43fc2acc03f9552adbc392bc' (2024-03-25)
  → 'github:nixos/nixpkgs/da0502af1164c4fd04ebcd3acde1e378a861bd19' (2024-03-26)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/59f7ad2c27737a7ea7ad16a48c95631f159ef822' (2024-03-24)
  → 'github:nix-community/nixpkgs-wayland/7274c73cf5708ed3a814edc9605463ec4a116619' (2024-03-25)
• Updated input 'uninsane-dot-org':
    'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=9a3b2d74c3e6d177fd1317d03f4e3eecca7beb7b' (2024-03-19)
  → 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=b9502e6f190752d327f8cee7fa4b139094bd7c16' (2024-03-25)
```
---
 flake.lock          | 26 +++++++++++++-------------
 nixpatches/list.nix | 25 +++++++------------------
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4a76da96..d1949b2d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,11 +167,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1711324949,
-        "narHash": "sha256-qm03BYQFhkDGsFYZxmUsXLNl0UpvahlsQl1BFIpJq8k=",
+        "lastModified": 1711411323,
+        "narHash": "sha256-FFkKkIKY9VO8hjF7vq52/3SACgcF/1UtNjh07zyLOs0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8794d573a4fdd15b0002135cebf65a8f5d9adb6c",
+        "rev": "c904e6bf24e582e4fe28e988b7cdb7e9fda595c3",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1711325166,
-        "narHash": "sha256-yF/5TIe3aDhEFdoafR30/1PYd4zD8qcz5nuh81dn0Ts=",
+        "lastModified": 1711414118,
+        "narHash": "sha256-99Hnbv8lg8YFh9+DCAMXm9zRoX+OdCEPKmX/6I7k5g0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d2dc20762f21c3e43fc2acc03f9552adbc392bc",
+        "rev": "da0502af1164c4fd04ebcd3acde1e378a861bd19",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711284444,
-        "narHash": "sha256-zaxF0fvo/FH1yVBsNbtOD+b+igp3g4IA8+cOdx44KzA=",
+        "lastModified": 1711390813,
+        "narHash": "sha256-HU/X5KpquAh5xLWICdUe/D2t1dVv32WEXwJtCXVKWKg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "59f7ad2c27737a7ea7ad16a48c95631f159ef822",
+        "rev": "7274c73cf5708ed3a814edc9605463ec4a116619",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710845014,
-        "narHash": "sha256-qae28wYfrv3hfgmGXyyclY1p5rcpzMRICYttZ/s07HA=",
+        "lastModified": 1711371733,
+        "narHash": "sha256-+brjlMyLVnVADY31sN82Ap0IsPE2WZEwHUd94sY6BXI=",
         "ref": "refs/heads/master",
-        "rev": "9a3b2d74c3e6d177fd1317d03f4e3eecca7beb7b",
-        "revCount": 236,
+        "rev": "b9502e6f190752d327f8cee7fa4b139094bd7c16",
+        "revCount": 237,
         "type": "git",
         "url": "https://git.uninsane.org/colin/uninsane"
       },
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 7359a521..0ab80aee 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -37,21 +37,9 @@ in [
     saneCommit = "d599839060400762a67d2c01d15b102ffe75e703";
     title = "gnupg: fix cross compilation";
     hash = "sha256-d3kD2/UyMzzdBkiEdWtCibbWiPWBZLUWRry1TMkS25g=";
+    merged.staging = "20240326000000";
   })
 
-  (fetchpatch' {
-    # fixes build break
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/297984";
-    title = "handbrake: 1.6.1 -> 1.7.3";
-    hash = "sha256-9CshjlhJRKCXBPZslyTdLnlfHSX+f0nrz+dqayClB8w=";
-  })
-
-  (fetchpatch' {
-    # fixes build break
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/297929";
-    title = "space-cadet-pinball: 2.0.1 -> 2.1.0";
-    hash = "sha256-XntS18eEnB29zjV8jWTzVI0JUHWysjv1Z/ooIW4nvEo=";
-  })
   (fetchpatch' {
     # fixes build break
     prUrl = "https://github.com/NixOS/nixpkgs/pull/297581";
@@ -84,11 +72,12 @@ in [
   #   saneCommit = "ea084e5739a68436cc240aeca5c10b92de1e3138";
   #   hash = "sha256-25zB5eM1WBVEigmrq1mY9GXwEkS/jf5v7BCfmN6Wux4=";
   # })
-  (fetchpatch' {
-    title = "nixos/slskd: option fixes";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/270646";
-    hash = "sha256-5brmmPfYp7G+5Dr5q2skWSwkrEwsRAe/UetoN0AqGjY=";
-  })
+  # (fetchpatch' {
+  #   # 2024/03/25: probably obsoleted by <https://github.com/NixOS/nixpkgs/pull/281075> ?
+  #   title = "nixos/slskd: option fixes";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/270646";
+  #   hash = "sha256-5brmmPfYp7G+5Dr5q2skWSwkrEwsRAe/UetoN0AqGjY=";
+  # })
   (fetchpatch' {
     title = "gcr: remove build gnupg from runtime closure";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/263158";