Commit be6349fd authored by Artturin's avatar Artturin
Browse files

Revert "23.11 beta release" 

This line shouldn't be changed from pre to beta on master, only in the beta branch

https://nixos.github.io/release-wiki/Branch-Off.html#on-the-release-branch

This reverts commit dc7b3feb.

Revert "nixos/release: fix versionSuffix eval"

This reverts commit 625c4500.
parent ba1a718f

nixos/modules/config/nix-channel.nix

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ in 
      defaultChannel = mkOption {

        internal = true;

        type = types.str;

        default = "https://nixos.org/channels/nixos-23.11";

        default = "https://nixos.org/channels/nixos-unstable";

        description = lib.mdDoc "Default NixOS channel to which the root user is subscribed.";

      };

    };

nixos/modules/misc/version.nix

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ let 
    HOME_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/";

    DOCUMENTATION_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/learn.html";

    SUPPORT_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/community.html";

    SUPPORT_END = "2024-06-30";

    BUG_REPORT_URL = lib.optionalString (cfg.distroId == "nixos") "https://github.com/NixOS/nixpkgs/issues";

  } // lib.optionalAttrs (cfg.variant_id != null) {

    VARIANT_ID = cfg.variant_id;

nixos/release.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ let 


  version = fileContents ../.version;

  versionSuffix =

    (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 551362)}.${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’,