Merge #138

138: treewide: 22.11 -> 23.05 r=Lassulus a=Kranzes



Co-authored-by: Ilan Joselevich <[email protected]>

Author: bors[bot]

bors.toml

@@ -2,9 +2,9 @@ cut_body_after = "" # don't include text from the PR body in the merge commit me
 status = [
   "Evaluate flake.nix",
   "check from-nixos [x86_64-linux]",
-  "check from-nixos-2211 [x86_64-linux]",
+  "check from-nixos-2305 [x86_64-linux]",
   "check from-nixos-with-sudo [x86_64-linux]",
-  "check from-nixos-with-sudo-2211 [x86_64-linux]",
+  "check from-nixos-with-sudo-2305 [x86_64-linux]",
   "check treefmt [x86_64-linux]",
   "deploy",
   "devShell default [x86_64-linux]",

flake.lock

@@ -6,10 +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-2305.url = "github:NixOS/nixpkgs/release-23.05";
     nixos-images.url = "github:nix-community/nixos-images";
     nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
-    nixos-images.inputs.nixos-2211.follows = "nixos-2211";
+    nixos-images.inputs.nixos-2305.follows = "nixos-2305";
     nixos-images.inputs.disko.follows = "disko";
     # used for development
     treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };

flake.nix

@@ -49,7 +49,7 @@ step() {
   echo "### $* ###"
 }
 
-default_kexec_url=https://github.com/nix-community/nixos-images/releases/download/nixos-22.11/nixos-kexec-installer-noninteractive-x86_64-linux.tar.gz
+default_kexec_url=https://github.com/nix-community/nixos-images/releases/download/nixos-23.05/nixos-kexec-installer-noninteractive-x86_64-linux.tar.gz
 kexec_url="$default_kexec_url"
 enable_debug=""
 maybe_reboot="sleep 6 && reboot"

src/nixos-anywhere.sh

@@ -9,14 +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";
+      testInputs2305 = testInputs // {
+        kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2305-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-2305 = import ./from-nixos.nix testInputs2305;
       from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs;
-      from-nixos-with-sudo-2211 = import ./from-nixos-with-sudo.nix testInputs2211;
+      from-nixos-with-sudo-2305 = import ./from-nixos-with-sudo.nix testInputs2305;
     });
 }