From aa1a5c39c9692d27ad46bbc9c213a74d1392bf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 26 Nov 2021 08:33:11 +0100 Subject: [PATCH] switch to nix stable --- ci/flake.lock | 12 ++++++------ ci/nur.nix | 4 ++-- ci/test.sh | 2 +- ci/update-nur-search.sh | 2 +- ci/update-nur.sh | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/flake.lock b/ci/flake.lock index 70ea91baf..6f934b6a2 100644 --- a/ci/flake.lock +++ b/ci/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1633329294, - "narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=", + "lastModified": 1637593665, + "narHash": "sha256-R7jKS7A+0tZS8qD5pBr1UFcMiTdsw5bfoxgXbYsoWhM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671", + "rev": "98747f27ecfee70c8c97b195cbb94df80a074dda", "type": "github" }, "original": { diff --git a/ci/nur.nix b/ci/nur.nix index c53260ae0..684f86e26 100644 --- a/ci/nur.nix +++ b/ci/nur.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, nix-prefetch-git, git, nixUnstable, glibcLocales }: +{ buildPythonApplication, lib, nix-prefetch-git, git, nix, glibcLocales }: buildPythonApplication { name = "nur"; @@ -7,7 +7,7 @@ buildPythonApplication { doCheck = false; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ nix-prefetch-git git nixUnstable ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ nix-prefetch-git git nix ]}" "--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive" ]; } diff --git a/ci/test.sh b/ci/test.sh index 1dd66332d..8fe052db7 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p bash -i bash -p python3Packages.mypy -p python3Packages.black -p python3Packages.flake8 -p nixUnstable +#!nix-shell -p bash -i bash -p python3Packages.mypy -p python3Packages.black -p python3Packages.flake8 -p nix set -eux -o pipefail # Exit with nonzero exit code if anything fails diff --git a/ci/update-nur-search.sh b/ci/update-nur-search.sh index 8405982fc..95cd16f59 100755 --- a/ci/update-nur-search.sh +++ b/ci/update-nur-search.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p git -p nixUnstable -p bash -i bash +#!nix-shell -p git -p nix -p bash -i bash set -eu -o pipefail # Exit with nonzero exit code if anything fails diff --git a/ci/update-nur.sh b/ci/update-nur.sh index 9a166e78a..8dc4147ce 100755 --- a/ci/update-nur.sh +++ b/ci/update-nur.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p git -p nixUnstable -p bash -i bash +#!nix-shell -p git -p nix -p bash -i bash set -eu -o pipefail # Exit with nonzero exit code if anything fails