Skip to content

Commit

Permalink
Merge pull request #120 from hercules-ci/nixos-unstable-is-reference-…
Browse files Browse the repository at this point in the history
…nixpkgs

ci.nix: Set nixos-unstable as reference nixpkgs
  • Loading branch information
roberth authored Jun 3, 2021
2 parents 4a38050 + cedf8be commit f94dc40
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion nix/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in
dimension "Nixpkgs version" {
"nixos-20_09" = {
nixpkgsSource = "nixos-20.09";
isReferenceNixpkgs = true;
enableDoc = true;
dockerSupportsSystemd = true;
nixosHasPodmanDockerSocket = false;
Expand All @@ -18,6 +17,7 @@ dimension "Nixpkgs version" {
};
"nixos-unstable" = {
nixpkgsSource = "nixos-unstable";
isReferenceNixpkgs = true; # match ./default.nix
enableDoc = true;
};
} (
Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ sources ? import ./sources.nix
, nixpkgsName ? "nixos-unstable"
, nixpkgsName ? "nixos-unstable" # match ./ci.nix isReferenceNixpkgs
, nixpkgsSrc ? sources.${nixpkgsName}
, system ? builtins.currentSystem
, dockerSupportsSystemd ? false
Expand Down

0 comments on commit f94dc40

Please sign in to comment.