From 7ff8480fa7edd29b07e7fe18e420927a0643e5bc Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 5 Jul 2026 14:25:34 +0100
Subject: [PATCH 1/4] ci/update-pinned.sh: import Nixpkgs relative to script

Paths within a --expr expression are relative to the script file,
while relative paths in NIX_PATH are relative to the caller's CWD.

We want the Nixpkgs import to be relative to update-pinned.sh itself,
so that it does not matter where it's executed from.

See https://github.com/NixOS/nixpkgs/issues/425551

(cherry picked from commit 37aac0fb06e2ca890d463b35af6d45bad44a9f91)
---
 ci/update-pinned.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh
index 69ba7df9131d..51c99b0da98d 100755
--- a/ci/update-pinned.sh
+++ b/ci/update-pinned.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p npins -I nixpkgs=../
+#!nix-shell -i bash -E 'with import ../. {}; mkShell { packages = [ npins ]; }'
 
 set -euo pipefail
 

From e0d7f9abebb885f4e967b688caa7e91c0d0105a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Apr 2026 12:34:34 +0200
Subject: [PATCH 2/4] =?UTF-8?q?ci:=20nix=5F2=5F28=20=E2=86=92=20stable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally part of commit 07457776ad0ec171d6c728237b7cbe76685b6165
but dropped to avoid backporting #536372

(cherry picked from commit 0ffdd818b55156d6916c8004e04e298db18204c6)
---
 ci/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 6aa80f977901..06fa75bbc38f 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -70,7 +70,7 @@ rec {
   };
   parse = pkgs.lib.recurseIntoAttrs {
     nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
-    nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };
+    stable = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.stable; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
     lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; };
   };

From b40b6d6776c61e97101fd63944992a7b9201e16d Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 5 Jul 2026 14:36:01 +0100
Subject: [PATCH 3/4] ci: update pinned
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps nixpkgs-vet 0.3.2 → 0.3.4

https://github.com/NixOS/nixpkgs-vet/blob/main/CHANGELOG.md#034-2026-07-01
(cherry picked from commit a6eeac86f7099fbb4a3d41106e385c367009f4b5)
---
 ci/pinned.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index fc034a85bccf..0b3d817d1b06 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "8c91a71d13451abc40eb9dae8910f972f979852f",
-      "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz",
-      "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE="
+      "revision": "6edbf1a6a03e75886a6609c088801a0856449e88",
+      "url": "https://github.com/NixOS/nixpkgs/archive/6edbf1a6a03e75886a6609c088801a0856449e88.tar.gz",
+      "hash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30="
     }
   },
   "version": 8

From eddcb5f228506f46a0572f9802b4b1ad8d13f9be Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 5 Jul 2026 11:55:35 -0400
Subject: [PATCH 4/4] lib/tests/release: stop testing nix_2_28

See 7d940ca0826ccc5df254671d38ba41bf7b64f5c2 and #538699.

Not-cherry-picked-because: already done on master
---
 lib/tests/release.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 54d62f87b3d5..280c88cee66b 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -9,7 +9,6 @@
   pkgsBB ? pkgs.pkgsBuildBuild,
   nix ? pkgs-nixVersions.stable,
   nixVersions ? [
-    pkgs-nixVersions.nix_2_28
     nix
     pkgs-nixVersions.latest
   ],