ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

integration-tests: Also run apply test against stable nixpkgs

Browse source
This commit is contained in:
Zhaofeng Li 2022-01-27 18:48:25 -08:00
parent 6bff965a39
commit 0a955d0a4c
5 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
flake.lock
View file

@ -68,16 +68,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1642492175, "lastModified": 1643080866,
"narHash": "sha256-lo5hxiY8U4eREChAR7JD94zns92hQqmp3wg3qTFolPA=", "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9789ed45b759c8f770bcba4b06c1a1c5ec386664", "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -87,9 +87,26 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nix-eval-jobs": "nix-eval-jobs", "nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"stable": "stable",
"utils": "utils" "utils": "utils"
} }
}, },
"stable": {
"locked": {
"lastModified": 1642961095,
"narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1638122382,

4
flake.nix
View file

@ -2,7 +2,9 @@
description = "A simple, stateless NixOS deployment tool modeled after NixOps."; description = "A simple, stateless NixOS deployment tool modeled after NixOps.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
stable.url = "github:NixOS/nixpkgs/nixos-21.11";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
# not yet upstreamed # not yet upstreamed

6
integration-tests/default.nix
View file

@ -7,4 +7,10 @@
flakes = import ./flakes {}; flakes = import ./flakes {};
flakes-streaming = import ./flakes { evaluator = "streaming"; }; flakes-streaming = import ./flakes { evaluator = "streaming"; };
parallel = import ./parallel {}; parallel = import ./parallel {};
apply-stable = let
test = import ./apply { pkgs = import ./nixpkgs-stable.nix; };
in test.override (old: {
name = "apply-stable";
});
} }

8
integration-tests/nixpkgs-stable.nix Normal file
View file

@ -0,0 +1,8 @@
let
flake = (import ../flake-compat.nix).defaultNix;
in import flake.inputs.stable.outPath {
overlays = [
flake._evalJobsOverlay
flake.overlay
];
}

2
integration-tests/tools.nix
View file

@ -174,7 +174,7 @@ let
} // test // { } // test // {
testScript = fullScript; testScript = fullScript;
}; };
in pkgs.nixosTest combined; in lib.makeOverridable pkgs.nixosTest combined;
in { in {
inherit pkgs nodes colmena colmenaExec inherit pkgs nodes colmena colmenaExec
getStandaloneConfigFor inputClosureOf makeTest; getStandaloneConfigFor inputClosureOf makeTest;