Skip to content

Commit

Permalink
Merge pull request #435 from nix-community/24.11
Browse files Browse the repository at this point in the history
Use 24.11 release
  • Loading branch information
Mic92 authored Dec 13, 2024
2 parents 653f13c + 0417215 commit f9d38ca
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 164 deletions.
139 changes: 0 additions & 139 deletions .github/settings.yml

This file was deleted.

6 changes: 3 additions & 3 deletions docs/howtos/use-without-flakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ same directory as `disko-config.nix`.
```nix
# default.nix
let
# replace nixos-24.05 with your preferred nixos version or revision from here: https://status.nixos.org/
nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.05.tar.gz";
# replace nixos-24.11 with your preferred nixos version or revision from here: https://status.nixos.org/
nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.11.tar.gz";
in
import (nixpkgs + "/nixos/lib/eval-config.nix") {
modules = [ ./configuration.nix ];
Expand All @@ -63,7 +63,7 @@ import (nixpkgs + "/nixos/lib/eval-config.nix") {
# Set this to the NixOS version that you have set in the previous step.
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "24.05";
system.stateVersion = "24.11";
}
```

Expand Down
38 changes: 19 additions & 19 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# used for testing
disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixos-images.url = "github:nix-community/nixos-images";
nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
nixos-images.inputs.nixos-stable.follows = "nixos-stable";
Expand Down
7 changes: 5 additions & 2 deletions src/nixos-anywhere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ Usage: nixos-anywhere [options] [<ssh-host>]
Options:
* -f, --flake <flake_uri>
set the flake to install the system from.
set the flake to install the system from. i.e.
nixos-anywhere --flake .#mymachine
Also supports variants:
nixos-anywhere --flake .#nixosConfigurations.mymachine.config.virtualisation.vmVariant
* --target-host <ssh-host>
specified the SSH target host to deploy onto.
* -i <identity_file>
Expand Down Expand Up @@ -486,7 +489,7 @@ runKexec() {
if [[ $kexecUrl == "" ]]; then
case "${isArch}" in
x86_64 | aarch64)
kexecUrl="https://github.com/nix-community/nixos-images/releases/download/nixos-24.05/nixos-kexec-installer-noninteractive-${isArch}-linux.tar.gz"
kexecUrl="https://github.com/nix-community/nixos-images/releases/download/nixos-24.11/nixos-kexec-installer-noninteractive-${isArch}-linux.tar.gz"
;;
*)
abort "Unsupported architecture: ${isArch}. 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

0 comments on commit f9d38ca

Please sign in to comment.