109: Flake update + test 22.11 r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-05-15 12:20:02 +00:00 committed by GitHub
commit 18f4de9f58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 17 deletions

View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1683451313,
"narHash": "sha256-BBpDeKFVRKScdLgcpJLeMGjwJXgfccYJOZ2Q0gWwg4o=",
"lastModified": 1684003056,
"narHash": "sha256-zl11zyRNKzAW7YLvTkxmFjSBqxZbEvfwZqNCT91ELfU=",
"owner": "nix-community",
"repo": "disko",
"rev": "35c3426fece22a6084c0bd64eccc37ff546da6ee",
"rev": "8f95856432e091e5ac56fea2df81e905ddd02d27",
"type": "github"
},
"original": {
@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1683458821,
"narHash": "sha256-fBAUiZ0XGoYy9sBud+rR2T18yIeRzb9aVkGBkOjzFwc=",
"lastModified": 1683560683,
"narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f3e943c249229affaaabd302e1cc14c769eef9d8",
"rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github"
},
"original": {
@ -41,19 +41,37 @@
"type": "github"
}
},
"nixos-2211": {
"locked": {
"lastModified": 1684141842,
"narHash": "sha256-sbdzOwBDcyzz/Dr1ztdF+tElMyM/cgx+4XxVgz+NLRM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2eb0795720849ae19c068e39b17362d3ebcd585c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-images": {
"inputs": {
"nixos-2211": [],
"nixos-2211": [
"nixos-2211"
],
"nixos-unstable": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1683490943,
"narHash": "sha256-LTuFkrzjsEdcbB0Y/CCMnH49UTqKyyhCVQ6aGPDSNKc=",
"lastModified": 1684151031,
"narHash": "sha256-6bBOxHIRCn4WQBsjsnaLL7bwcHuCLQj1Xd3gnmbZ9LQ=",
"owner": "nix-community",
"repo": "nixos-images",
"rev": "5aeef49472f1b0bb8c8aa082eb27ae2cc951f60c",
"rev": "3758c6481cd8ad9571c0401fc634eda05a86489b",
"type": "github"
},
"original": {
@ -64,11 +82,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1683464100,
"narHash": "sha256-bQEMoa7UOVgrtY8QMgQ9lQpmi5e0stWiUTz8xtg0nos=",
"lastModified": 1684106623,
"narHash": "sha256-Fxw/lWpx+Cr1sJQ+1msdPBnrRuO0ll1eT48+ym0oqDg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "51f728c05759c8f8ce140396d89ab0a8ad9da9de",
"rev": "8fb30f6066a87a91c21241f1993a26ff57005486",
"type": "github"
},
"original": {
@ -82,6 +100,7 @@
"inputs": {
"disko": "disko",
"flake-parts": "flake-parts",
"nixos-2211": "nixos-2211",
"nixos-images": "nixos-images",
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
@ -94,11 +113,11 @@
]
},
"locked": {
"lastModified": 1683307174,
"narHash": "sha256-A7nF2Q+F+Bqs4u6VS4aOzyURfly5f4ZAiihGU0FA29g=",
"lastModified": 1684070360,
"narHash": "sha256-WaXr9ayqjp0R2+j9MrE1Ufdujw0vEA0o1G/0CrTt4Ns=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "b44794f94514b61512352a18cd77c710f0005f15",
"rev": "27107cf3dfdc3c809d2477954d92fc2cc68b4401",
"type": "github"
},
"original": {

View File

@ -6,9 +6,10 @@
flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; };
disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
# used for testing
nixos-2211.url = "github:NixOS/nixpkgs/release-22.11";
nixos-images.url = "github:nix-community/nixos-images";
nixos-images.inputs.nixos-2211.follows = "";
nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
nixos-images.inputs.nixos-2211.follows = "nixos-2211";
# used for development
treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
};

View File

@ -9,9 +9,14 @@
nixos-anywhere = config.packages.nixos-anywhere;
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-unstable-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
};
testInputs2211 = testInputs // {
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2211-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
};
in
{
from-nixos = import ./from-nixos.nix testInputs;
from-nixos-2211 = import ./from-nixos.nix testInputs2211;
from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs;
from-nixos-with-sudo-2211 = import ./from-nixos-with-sudo.nix testInputs2211;
});
}