diff --git a/bors.toml b/bors.toml index 185403f..2a63539 100644 --- a/bors.toml +++ b/bors.toml @@ -1,15 +1,15 @@ cut_body_after = "" # don't include text from the PR body in the merge commit message status = [ "Evaluate flake.nix", - "check kexec-installer-2211 [x86_64-linux]", + "check kexec-installer-2305 [x86_64-linux]", "check kexec-installer-unstable [x86_64-linux]", "check shellcheck [x86_64-linux]", - "package kexec-installer-nixos-2211 [x86_64-linux]", - "package kexec-installer-nixos-2211-noninteractive [x86_64-linux]", + "package kexec-installer-nixos-2305 [x86_64-linux]", + "package kexec-installer-nixos-2305-noninteractive [x86_64-linux]", "package kexec-installer-nixos-unstable [x86_64-linux]", "package kexec-installer-nixos-unstable-noninteractive [x86_64-linux]", - "package netboot-installer-nixos-2211 [x86_64-linux]", + "package netboot-installer-nixos-2305 [x86_64-linux]", "package netboot-installer-nixos-unstable [x86_64-linux]", - "package netboot-nixos-2211 [x86_64-linux]", + "package netboot-nixos-2305 [x86_64-linux]", "package netboot-nixos-unstable [x86_64-linux]" ] diff --git a/flake.lock b/flake.lock index 9cafc67..cc72c00 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,17 @@ { "nodes": { - "disko": { - "inputs": { - "nixpkgs": "nixpkgs" - }, + "nixos-2305": { "locked": { - "lastModified": 1686150639, - "narHash": "sha256-QHorMn3tgvCE0BM4QlNb/7vuquz11cS2ke1GSfmgiPo=", - "owner": "nix-community", - "repo": "disko", - "rev": "f1178c6e72b7d8ab2b55990397969324822275eb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "nixos-2211": { - "locked": { - "lastModified": 1686174588, - "narHash": "sha256-3TWcRhBeCzW+sWZbusLkWdL2wTmwIPt3E0TyA43BkRA=", + "lastModified": 1686450428, + "narHash": "sha256-gqTXHowo0x803v93Kb8RW2wCjcYn9mqT1gk+zlyyQgY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d9b86c045e8b1f7a4b4ff106c7d83b3a6f53c7", + "rev": "067a81a6859a020135a73fcbb7b16e9fb43dc435", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -50,26 +32,9 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1685894048, - "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "disko": "disko", - "nixos-2211": "nixos-2211", + "nixos-2305": "nixos-2305", "nixos-unstable": "nixos-unstable" } } diff --git a/flake.nix b/flake.nix index 68c27b9..f002dc2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "NixOS images"; inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - inputs.nixos-2211.url = "github:NixOS/nixpkgs/release-22.11"; - inputs.disko.url = "github:nix-community/disko"; + inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; nixConfig.extra-substituters = [ "https://cache.garnix.io" @@ -12,7 +11,7 @@ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; - outputs = { self, nixos-unstable, nixos-2211, disko }: let + outputs = { self, nixos-unstable, nixos-2305 }: let supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; in { @@ -22,21 +21,21 @@ netboot-installer = nixpkgs: (nixpkgs.legacyPackages.${system}.nixos [self.nixosModules.netboot-installer]).config.system.build.netboot; in { netboot-nixos-unstable = netboot nixos-unstable; - netboot-nixos-2211 = netboot nixos-2211; + netboot-nixos-2305 = netboot nixos-2305; kexec-installer-nixos-unstable = kexec-installer nixos-unstable []; - kexec-installer-nixos-2211 = kexec-installer nixos-2211 []; + kexec-installer-nixos-2305 = kexec-installer nixos-2305 []; kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } self.nixosModules.noninteractive ]; - kexec-installer-nixos-2211-noninteractive = kexec-installer nixos-2211 [ + kexec-installer-nixos-2305-noninteractive = kexec-installer nixos-2305 [ { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } self.nixosModules.noninteractive ]; netboot-installer-nixos-unstable = netboot-installer nixos-unstable; - netboot-installer-nixos-2211 = netboot-installer nixos-2211; + netboot-installer-nixos-2305 = netboot-installer nixos-2305; }); nixosModules = { kexec-installer = ./nix/kexec-installer/module.nix; @@ -56,8 +55,8 @@ shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun} touch $out ''; - kexec-installer-2211 = nixos-2211.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { - kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2211-noninteractive; + kexec-installer-2305 = nixos-2305.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { + kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2305-noninteractive; }; }; };