From abf9d678aaf6478225be5fc0577d56eecfeb9abb Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Fri, 16 May 2025 19:04:43 +0200 Subject: [PATCH] beta release --- nixos/modules/config/nix-channel.nix | 2 +- nixos/modules/misc/version.nix | 1 + 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 23b414f8194b..9a8be52da59b 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -71,7 +71,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = "https://nixos.org/channels/nixos-unstable"; + default = "https://nixos.org/channels/nixos-25.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 2a7c028a2b38..56a1ff36bb5a 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -58,6 +58,7 @@ let VARIANT = optionalString (cfg.variantName != null) cfg.variantName; VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id; DEFAULT_HOSTNAME = config.system.nixos.distroId; + SUPPORT_END = "2025-12-31"; } // cfg.extraOSReleaseArgs; diff --git a/nixos/release.nix b/nixos/release.nix index b7b550fb4721..6a14c0559e2c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -20,7 +20,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’,