From 089cd8fbaca2ae8b49c3034ebb99bd9fdad6ff1c Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 8 Jun 2026 18:16:27 -0400 Subject: [PATCH 1/2] ci/update-pinned.sh: use nixpkgs from current dir, run npins upgrade too Use nixpkgs from the current directory because otherwise the npins used could be outdated. Also run npins upgrade as part of the script. --- ci/update-pinned.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh index 7e3a26695fe8..69ba7df9131d 100755 --- a/ci/update-pinned.sh +++ b/ci/update-pinned.sh @@ -1,8 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p npins +#!nix-shell -i bash -p npins -I nixpkgs=../ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +npins --lock-file pinned.json upgrade npins --lock-file pinned.json update From 1f9448d9d746daf8b338deba5fac784db360971f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 8 Jun 2026 18:16:33 -0400 Subject: [PATCH 2/2] ci: update pinned --- ci/pinned.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/pinned.json b/ci/pinned.json index bab709798be6..d161a3d78e1c 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "02f3fa0374fa13707d42d55d58ecc76b091f223c", - "url": "https://github.com/NixOS/nixpkgs/archive/02f3fa0374fa13707d42d55d58ecc76b091f223c.tar.gz", - "hash": "0z8d33c5g0gk9a74ppqq77npisf9xx9c8ai9isxa2hyjx4lv1pki" + "revision": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", + "url": "https://github.com/NixOS/nixpkgs/archive/cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73.tar.gz", + "hash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=" }, "treefmt-nix": { "type": "Git", @@ -22,10 +22,10 @@ }, "branch": "main", "submodules": false, - "revision": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "url": "https://github.com/numtide/treefmt-nix/archive/790751ff7fd3801feeaf96d7dc416a8d581265ba.tar.gz", - "hash": "1zah3dmbpn3ap5acg22kq1j19dg32gj73l43yamjcxhc38sv9kd5" + "revision": "db947814a175b7ca6ded66e21383d938df01c227", + "url": "https://github.com/numtide/treefmt-nix/archive/db947814a175b7ca6ded66e21383d938df01c227.tar.gz", + "hash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=" } }, - "version": 5 + "version": 8 }