From eefd9323ae72b2984726636cf29eadbed9b29ca0 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 24 Mar 2025 19:16:34 -0400 Subject: [PATCH] Revert "24.11 beta release" This reverts commit f49e820fbc9450736bb6ba982a2ff0a8d014ad1e. This should have only been on release-24.11, not master --- nixos/modules/config/nix-channel.nix | 2 +- nixos/release.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index de2c9407498e..2703a60f858f 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-24.11"; + default = "https://nixos.org/channels/nixos-unstable"; description = "Default NixOS channel to which the root user is subscribed."; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 2f916e0ee995..31681c2e31f5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ with import ../lib; -{ nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "1d95cb5"; } +{ nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] , configuration ? {} @@ -12,7 +12,7 @@ let version = fileContents ../.version; versionSuffix = - (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + (if stableBranch then "." else "pre") + "${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’,