diff options
| author | Weijia Wang | 2024-05-22 18:11:14 +0200 |
|---|---|---|
| committer | Weijia Wang | 2024-05-22 18:11:14 +0200 |
| commit | 3c80acabe4eef35d8662733c7e058907fa33a65d (patch) | |
| tree | bd2298bfe293a025c971133045a6747452829dea | |
| parent | 0b49ef697b3e5cff1e6f18033de2b422e2fe1f43 (diff) | |
24.05 beta release 24.05-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 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 6498ce6c469c..84fbf45bab35 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -69,7 +69,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = "https://nixos.org/channels/nixos-unstable"; + default = "https://nixos.org/channels/nixos-24.05"; 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 29e9498018ec..92344900a09e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -31,6 +31,7 @@ let HOME_URL = optionalString isNixos "https://nixos.org/"; DOCUMENTATION_URL = optionalString isNixos "https://nixos.org/learn.html"; SUPPORT_URL = optionalString isNixos "https://nixos.org/community.html"; + SUPPORT_END = "2024-12-31"; BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues"; ANSI_COLOR = optionalString isNixos "1;34"; IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id; diff --git a/nixos/release.nix b/nixos/release.nix index 2f31973569bf..750c3221d18a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -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 - 630170)}.${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’, |