summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-11-20 14:13:19 -0500
committerfigsoda <figsoda@pm.me>2023-11-21 14:04:49 -0500
commitdc7b3febf8d862328d8704de5c8437d2df442c76 (patch)
tree8c89688b62909b340761a835918a6e28d7ab64cc
parente1d09cc0fd2d759880a040ec1afc55f6e5cd7121 (diff)
23.11 beta release23.11-beta
Signed-off-by: figsoda <figsoda@pm.me>
-rw-r--r--nixos/modules/config/nix-channel.nix2
-rw-r--r--nixos/modules/misc/version.nix1
-rw-r--r--nixos/release.nix2
3 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix
index a7ca7a5c74a4..893eaa0afe43 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-unstable";
+ default = "https://nixos.org/channels/nixos-23.11";
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 45dbf45b3ae7..2837004a8df2 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -27,6 +27,7 @@ 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 2acc5ade7848..eb8435b69cb9 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 - 551362}.${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’,