Skip to content

Commit 18f4de9

Browse files
bors[bot]Mic92
andauthored
Merge #109
109: Flake update + test 22.11 r=Mic92 a=Mic92 Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2 parents 77ffd3a + 85f36e3 commit 18f4de9

File tree

3 files changed

+42
-17
lines changed

3 files changed

+42
-17
lines changed

flake.lock

Lines changed: 35 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; };
77
disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
88
# used for testing
9+
nixos-2211.url = "github:NixOS/nixpkgs/release-22.11";
910
nixos-images.url = "github:nix-community/nixos-images";
10-
nixos-images.inputs.nixos-2211.follows = "";
1111
nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
12+
nixos-images.inputs.nixos-2211.follows = "nixos-2211";
1213
# used for development
1314
treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
1415
};

tests/flake-module.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@
99
nixos-anywhere = config.packages.nixos-anywhere;
1010
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-unstable-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
1111
};
12+
testInputs2211 = testInputs // {
13+
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2211-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
14+
};
1215
in
1316
{
1417
from-nixos = import ./from-nixos.nix testInputs;
18+
from-nixos-2211 = import ./from-nixos.nix testInputs2211;
1519
from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs;
20+
from-nixos-with-sudo-2211 = import ./from-nixos-with-sudo.nix testInputs2211;
1621
});
1722
}

0 commit comments

Comments
 (0)