diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2024-07-18 20:03:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 20:03:37 +0200 |
| commit | e1413e3cf3e3332e2cf7f5b42b424d841dba2b9e (patch) | |
| tree | 5dfbb94830331339af22aebccb5c9013ded38179 | |
| parent | Merge pull request #290730 from nikstur/qemu-vm-refactoring (diff) | |
| parent | ci/pinned-nixpkgs.json: update (diff) | |
| download | nixpkgs-e1413e3cf3e3332e2cf7f5b42b424d841dba2b9e.tar.gz | |
Merge pull request #328186 from tweag/update-ci-tooling
ci: update tooling
| -rw-r--r-- | ci/pinned-nixpkgs.json | 4 | ||||
| -rwxr-xr-x | ci/update-pinned-nixpkgs.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index 29af1b022581..b32545b900a5 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "cfb89a95f19bea461fc37228dc4d07b22fe617c2", - "sha256": "1yhsacvry6j8r02lk70p9dphjpi8lpzgq2qay8hiy4nqlys0mrch" + "rev": "521d48afa9ae596930a95325529df27fa7135ff5", + "sha256": "0a1pa5azw990narsfipdli1wng4nc3vhvrp00hb8v1qfchcq7dc9" } diff --git a/ci/update-pinned-nixpkgs.sh b/ci/update-pinned-nixpkgs.sh index 776558130057..d44b59d80ede 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 |