From 545eb50c7df9973afebdfdeac350481bf6eeb81e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jul 2024 15:51:02 +0200 Subject: [PATCH 1/2] ci/update-pinned-nixpkgs.sh: Allow setting the rev This script only needs to make sure that the revision has the relevant packages built, it doesn't necessarily need to be a channel version. This commit makes it possible to set the revision explicitly when calling the update script. --- ci/update-pinned-nixpkgs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/update-pinned-nixpkgs.sh b/ci/update-pinned-nixpkgs.sh index 7765581300572..d44b59d80ede2 100755 --- a/ci/update-pinned-nixpkgs.sh +++ b/ci/update-pinned-nixpkgs.sh @@ -10,7 +10,8 @@ repo=https://github.com/nixos/nixpkgs branch=nixpkgs-unstable file=$SCRIPT_DIR/pinned-nixpkgs.json -rev=$(git ls-remote "$repo" refs/heads/"$branch" | cut -f1) +defaultRev=$(git ls-remote "$repo" refs/heads/"$branch" | cut -f1) +rev=${1:-$defaultRev} sha256=$(nix-prefetch-url --unpack "$repo/archive/$rev.tar.gz" --name source) jq -n --arg rev "$rev" --arg sha256 "$sha256" '$ARGS.named' | tee /dev/stderr > $file From 8e1b9b9eb38108a7eac6d683a2121fc9134eb0f7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jul 2024 15:52:11 +0200 Subject: [PATCH 2/2] ci/pinned-nixpkgs.json: update Update it to https://hydra.nixos.org/eval/1807730#tabs-inputs, which notably contains some fixes for nixfmt: https://github.com/NixOS/nixfmt/pull/215 --- ci/pinned-nixpkgs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index 29af1b0225816..b32545b900a54 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "cfb89a95f19bea461fc37228dc4d07b22fe617c2", - "sha256": "1yhsacvry6j8r02lk70p9dphjpi8lpzgq2qay8hiy4nqlys0mrch" + "rev": "521d48afa9ae596930a95325529df27fa7135ff5", + "sha256": "0a1pa5azw990narsfipdli1wng4nc3vhvrp00hb8v1qfchcq7dc9" }