diff options
| author | Tristan Ross | 2024-11-14 08:57:15 -0800 |
|---|---|---|
| committer | Tristan Ross | 2024-11-14 08:57:15 -0800 |
| commit | 8b27c1239e5c421a2bbc2c65d52e4a6fbf2ff296 (patch) | |
| tree | ef027d1006f82e5d27e9812e7ae86de370cf947c | |
| parent | 1d95cb5fa7a38717172e090d54338ca8daef8a86 (diff) | |
24.11 beta release 24.11-beta
| -rw-r--r-- | nixos/modules/config/nix-channel.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/misc/version.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 2703a60f858f..de2c9407498e 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -70,7 +70,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = "https://nixos.org/channels/nixos-unstable"; + default = "https://nixos.org/channels/nixos-24.11"; description = "Default NixOS channel to which the root user is subscribed."; }; }; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 5fe9b6c1c700..f77261b162a6 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -42,6 +42,7 @@ let VARIANT = optionalString (cfg.variantName != null) cfg.variantName; VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id; DEFAULT_HOSTNAME = config.networking.fqdnOrHostName; + SUPPORT_END = "2025-06-30"; }; initrdReleaseContents = (removeAttrs osReleaseContents [ "BUILD_ID" ]) // { diff --git a/nixos/release.nix b/nixos/release.nix index 67fb96740007..7845ff5d180e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ with import ../lib; -{ nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "1d95cb5"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] , configuration ? {} @@ -12,7 +12,7 @@ let version = fileContents ../.version; versionSuffix = - (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; # Run the tests for each platform. You can run a test by doing # e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’, |