emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #151 from phaer/23-11

Browse source 
build 23.11 instead of 23.05
This commit is contained in:
Jörg Thalheim 2023-12-10 11:53:27 +01:00 committed by GitHub
commit 86196b2130
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
tag: tag:
- nixos-23.05 - nixos-23.11
- nixos-unstable - nixos-unstable
os: os:
- nscloud-ubuntu-22.04-arm64-4x16 - nscloud-ubuntu-22.04-arm64-4x16

12
flake.lock
View file

@ -1,17 +1,17 @@
{ {
"nodes": { "nodes": {
"nixos-2305": { "nixos-2311": {
"locked": { "locked": {
"lastModified": 1701805708, "lastModified": 1702128801,
"narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", "narHash": "sha256-nU69ZNl1pCXEtNdyHT1/nA4NnXWsWUMpEg937BNecbo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", "rev": "8ae56eaea9054590c57f9509341601f05cbb92d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -34,7 +34,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixos-2305": "nixos-2305", "nixos-2311": "nixos-2311",
"nixos-unstable": "nixos-unstable" "nixos-unstable": "nixos-unstable"
} }
} }

27
flake.nix
View file

@ -2,7 +2,7 @@
description = "NixOS images"; description = "NixOS images";
inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; inputs.nixos-2311.url = "github:NixOS/nixpkgs/release-23.11";
nixConfig.extra-substituters = [ nixConfig.extra-substituters = [
"https://cache.garnix.io" "https://cache.garnix.io"
@ -11,7 +11,7 @@
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
]; ];
outputs = { self, nixos-unstable, nixos-2305 }: outputs = { self, nixos-unstable, nixos-2311 }:
let let
supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; supportedSystems = [ "aarch64-linux" "x86_64-linux" ];
forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; forAllSystems = nixos-unstable.lib.genAttrs supportedSystems;
@ -25,26 +25,31 @@
in in
{ {
netboot-nixos-unstable = netboot nixos-unstable; netboot-nixos-unstable = netboot nixos-unstable;
netboot-nixos-2305 = netboot nixos-2305; netboot-nixos-2311 = netboot nixos-2311;
kexec-installer-nixos-unstable = kexec-installer nixos-unstable [ ]; kexec-installer-nixos-unstable = kexec-installer nixos-unstable [ ];
kexec-installer-nixos-2305 = kexec-installer nixos-2305 [ ]; kexec-installer-nixos-2311 = kexec-installer nixos-2311 [ ];
kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [
{ {
system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
system.installer.channel.enable = false; # TODO: enable this also in the 23.11 edition, once we have it. system.installer.channel.enable = false;
} }
self.nixosModules.noninteractive self.nixosModules.noninteractive
]; ];
kexec-installer-nixos-2305-noninteractive = kexec-installer nixos-2305 [ kexec-installer-nixos-2311-noninteractive = kexec-installer nixos-2311 [
{ system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } {
system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
system.installer.channel.enable = false;
}
self.nixosModules.noninteractive self.nixosModules.noninteractive
]; ];
netboot-installer-nixos-unstable = netboot-installer nixos-unstable [ netboot-installer-nixos-unstable = netboot-installer nixos-unstable [
{ system.installer.channel.enable = false; } # TODO: enable this also in the 23.11 edition, once we have it. { system.installer.channel.enable = false; }
];
netboot-installer-nixos-2311 = netboot-installer nixos-2311 [
{ system.installer.channel.enable = false; }
]; ];
netboot-installer-nixos-2305 = netboot-installer nixos-2305 [ ];
}); });
nixosModules = { nixosModules = {
kexec-installer = ./nix/kexec-installer/module.nix; kexec-installer = ./nix/kexec-installer/module.nix;
@ -67,8 +72,8 @@
shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun} shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun}
touch $out touch $out
''; '';
kexec-installer-2305 = nixos-2305.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { kexec-installer-2311 = nixos-2311.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix {
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2305-noninteractive; kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2311-noninteractive;
}; };
}; };
}; };

3
nix/noninteractive.nix
View file

@ -55,7 +55,4 @@
}; };
networking.hostId = lib.mkDefault "8425e349"; networking.hostId = lib.mkDefault "8425e349";
# we can drop this after 23.05 has been released, which has this set by default
hardware.enableRedistributableFirmware = lib.mkForce false;
} }