ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #120 from hercules-ci/nixos-unstable-is-reference-nixpkgs

Browse source 
ci.nix: Set nixos-unstable as reference nixpkgs
This commit is contained in:
Robert Hensing 2021-06-03 11:12:04 +02:00 committed by GitHub
commit f94dc40f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/ci.nix
View file

@ -7,7 +7,6 @@ in
dimension "Nixpkgs version" { dimension "Nixpkgs version" {
"nixos-20_09" = { "nixos-20_09" = {
nixpkgsSource = "nixos-20.09"; nixpkgsSource = "nixos-20.09";
isReferenceNixpkgs = true;
enableDoc = true; enableDoc = true;
dockerSupportsSystemd = true; dockerSupportsSystemd = true;
nixosHasPodmanDockerSocket = false; nixosHasPodmanDockerSocket = false;
@ -18,6 +17,7 @@ dimension "Nixpkgs version" {
}; };
"nixos-unstable" = { "nixos-unstable" = {
nixpkgsSource = "nixos-unstable"; nixpkgsSource = "nixos-unstable";
isReferenceNixpkgs = true; # match ./default.nix
enableDoc = true; enableDoc = true;
}; };
} ( } (

2
nix/default.nix
View file

@ -1,5 +1,5 @@
{ sources ? import ./sources.nix { sources ? import ./sources.nix
, nixpkgsName ? "nixos-unstable" , nixpkgsName ? "nixos-unstable" # match ./ci.nix isReferenceNixpkgs
, nixpkgsSrc ? sources.${nixpkgsName} , nixpkgsSrc ? sources.${nixpkgsName}
, system ? builtins.currentSystem , system ? builtins.currentSystem
, dockerSupportsSystemd ? false , dockerSupportsSystemd ? false