diff options
| author | Artturin <Artturin@artturin.com> | 2023-11-22 22:35:51 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-11-22 22:39:48 +0200 |
| commit | be6349fdee1e4622e442b665d929cafaeadbc42a (patch) | |
| tree | 187230becc70fb5553e24fc0cda7a9cd4ef5332a /nixos | |
| parent | ba1a718f343b934a5285ca12853a2df41d72465b (diff) | |
| download | nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar.gz nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar.bz2 nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar.lz nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar.xz nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.tar.zst nixlib-be6349fdee1e4622e442b665d929cafaeadbc42a.zip | |
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 dc7b3febf8d862328d8704de5c8437d2df442c76. Revert "nixos/release: fix versionSuffix eval" This reverts commit 625c450024e24c55cac035372bc49b39f8df005b.
Diffstat (limited to 'nixos')
| -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, 2 insertions, 3 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 893eaa0afe43..a7ca7a5c74a4 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-23.11"; + default = "https://nixos.org/channels/nixos-unstable"; description = lib.mdDoc "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 2837004a8df2..45dbf45b3ae7 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -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; diff --git a/nixos/release.nix b/nixos/release.nix index a1b4508ca40b..2acc5ade7848 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -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’, |