Merge pull request #408 from nix-community/ci

switch to nix stable
This commit is contained in:
Jörg Thalheim 2021-12-01 10:09:42 +00:00 committed by GitHub
commit c486ca73f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions

12
ci/flake.lock generated
View file

@ -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": {

View file

@ -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"
];
}

View file

@ -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

View file

@ -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

View file

@ -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