From 367fc24aa89551e6eb64c60a360dc84438d6199f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 31 Jul 2024 20:59:07 +0000
Subject: [PATCH] nixpkgs: full_index=1: actually apply to all PR urls -- not
 just nixpkgs commits

---
 pkgs/additional/nixpkgs/list.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix
index 377284dfa..999e7d524 100644
--- a/pkgs/additional/nixpkgs/list.nix
+++ b/pkgs/additional/nixpkgs/list.nix
@@ -9,14 +9,14 @@ let
     revert ? false,
   }:
     let
+      # XXX(2024-07-31): full_index=1 for reproducibility (prevent patch hashes from spontaneously changing)
+      # - <https://github.com/NixOS/nixpkgs/issues/257446#issuecomment-1736563091>
       url = if prUrl != null then
         # prUrl takes precedence over any specific commit
-        "${prUrl}.diff"
+        "${prUrl}.diff?full_index=1"
       else if saneCommit != null then
         "https://git.uninsane.org/colin/nixpkgs/commit/${saneCommit}.diff"
       else
-        # XXX(2024-07-31): full_index=1 for reproducibility (prevent patch hashes from spontaneously changing)
-        # - <https://github.com/NixOS/nixpkgs/issues/257446#issuecomment-1736563091>
         "https://github.com/NixOS/nixpkgs/commit/${nixpkgsCommit}.patch?full_index=1"
       ;
     in fetchpatch2 (
@@ -36,26 +36,26 @@ in
     # merged into staging 2024-07-25
     title = "texinfo: set texinfo_cv_sys_iconv_converts_euc_cn=yes when crosscompiling";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/328919";
-    hash = "sha256-ugmBj3e3xwpqvgpg5diiJhJLHLhVg/34MUx+YRdy52A=";
+    hash = "sha256-jPbFTg5YHBxAyhOaQGuiLVximKMj7ACXzCK89ddZyNQ=";
   })
 
   (fetchpatch' {
     title = "python312Packages.contourpy: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/328218";
     saneCommit = "74a003b0af9820f6f7c6c62b3d2bec6df3a8d7b8";
-    hash = "sha256-DQC3OkW8zROfr9Y/nu0Bx5CrNtPpL5CBnf/4KQFuzGc=";
+    hash = "sha256-+7iAefzfYzAHO+f+q5JROejGjCujnwhvt8ItkU562DA=";
   })
 
   (fetchpatch' {
     title = "unl0kr: 2.0.0 -> 3.2.0";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";
-    hash = "sha256-XZSUUfMsYvTITmiJ/yCDLYAtsgXqEV0iL0oxh3ifErw=";
+    hash = "sha256-8rsX4Yrrp8lKrG3nySu8vvOofbxVRzpbjYVc+AQNqLs=";
   })
 
   (fetchpatch' {
     title = "nixos/networkmanager: split ModemManager bits into own module";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/316824";
-    hash = "sha256-woQijOvFaUj2qw5RNngY+F3hcJKihf4/c6C6/Y6mlL4=";
+    hash = "sha256-1wm23pSXN+gez/LnaIRrEXsy8hWAAy70RuJ+umVnJCI=";
     # saneCommit = "23bfba9b76757ffc00fc2be810009dcf92e2eaf2";
     # hash = "sha256-cn6ihwO3MyzdpVoJoQNKAHyo8GuGvFP6vr//7r9pzjE=";
   })
@@ -63,7 +63,7 @@ in
   (fetchpatch' {
     title = "hickory-dns: rename from trust-dns";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/316466";
-    hash = "sha256-aEqXvFj2OxUbrVsu+sCLND/Mv41gj3obv3mkB9NSbt0=";
+    hash = "sha256-0A43xaBrROJUAENNZNTCB8HLeECVy4n6oMwZluRNBZ8=";
   })
 
   (fetchpatch' {
@@ -87,21 +87,21 @@ in
     # required for gpodder to build
     title = "python311Packages.mygpoclient: 1.8 -> 1.9";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/324734";
-    hash = "sha256-sKxxYvaZ1W70H4+xZW5f54MTd4NSP3wnc0RGF4VBZ6M=";
+    hash = "sha256-W2KBnwPonYCKO4TA9+mGbknxgJaZej7iX9dFLLXf/jw=";
   })
 
   (fetchpatch' {
     # see: <https://github.com/NixOS/nixpkgs/pull/284562#issuecomment-2079104081>
     title = "nixos/lemmy: fix nginx backend to proxy needed headers";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/306984";
-    hash = "sha256-cRvnMCF7XaW+5+5eLMC8Gem16suV/t4qKB3vGyrhGxo=";
+    hash = "sha256-VErGtaZjsUNNXtVESFHAmQlTLabJfZBEftL/nYcpyyE=";
     saneCommit = "bd87a38b86f889a6902a356ab415eeead881766b";
   })
 
   (fetchpatch' {
     title = "libgweather: enable introspection on cross builds";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/251956";
-    hash = "sha256-4IrZBNeGC6JmWgGcdJYb9ybwHROU39eZht7xWkkvWug=";
+    hash = "sha256-ovWXFX6gMXM+E9yhX7GnDOB9f2HAZSjZRwGAVLTvFC0=";
   })
 
   # (fetchpatch' {