Skip to content

Commit

Permalink
nixos 23.05 -> 23.11 (#261)
Browse files Browse the repository at this point in the history
  • Loading branch information
phaer authored Dec 12, 2023
1 parent 73a6d3f commit 1dc6b52
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
46 changes: 23 additions & 23 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

# used for testing
disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
nixos-2305.url = "github:NixOS/nixpkgs/release-23.05";
nixos-2311.url = "github:NixOS/nixpkgs/nixos-23.11";
nixos-images.url = "github:nix-community/nixos-images";
nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
nixos-images.inputs.nixos-2305.follows = "nixos-2305";
nixos-images.inputs.nixos-2311.follows = "nixos-2311";

# used for development
treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
Expand Down
2 changes: 1 addition & 1 deletion src/nixos-anywhere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ if [[ ${is_kexec-n} == "n" ]] && [[ ${is_installer-n} == "n" ]]; then
if [[ $kexec_url == "" ]]; then
case "${is_arch-unknown}" in
x86_64 | aarch64)
kexec_url="https://github.com/nix-community/nixos-images/releases/download/nixos-23.05/nixos-kexec-installer-noninteractive-${is_arch}-linux.tar.gz"
kexec_url="https://github.com/nix-community/nixos-images/releases/download/nixos-23.11/nixos-kexec-installer-noninteractive-${is_arch}-linux.tar.gz"
;;
*)
abort "Unsupported architecture: ${is_arch}. Our default kexec images only support x86_64 and aarch64 cpus. Checkout https://github.com/nix-community/nixos-anywhere/#using-your-own-kexec-image for more information."
Expand Down
8 changes: 4 additions & 4 deletions tests/flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
testInputs2305 = testInputs // {
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2305-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
testInputs2311 = testInputs // {
kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-2311-noninteractive}/nixos-kexec-installer-noninteractive-${system}.tar.gz";
};
in
{
from-nixos = import ./from-nixos.nix testInputs;
from-nixos-2305 = import ./from-nixos.nix testInputs2305;
from-nixos-2311 = import ./from-nixos.nix testInputs2311;
from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs;
from-nixos-with-sudo-2305 = import ./from-nixos-with-sudo.nix testInputs2305;
from-nixos-with-sudo-2311 = import ./from-nixos-with-sudo.nix testInputs2311;
});
}

0 comments on commit 1dc6b52

Please sign in to comment.