summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-05-22 17:56:13 -0700
committerJonathan Ringer <jonringer117@gmail.com>2021-05-22 17:56:13 -0700
commit12c5acf3760c8b88d0f2ae9578c4805da7866ed1 (patch)
tree4a89aa6aeb17d7312ceeec4235cc88fb7b310c28
parent900115a4f7fdd9189e7803ca781a65be663f2c89 (diff)
21.05 beta release21.05-beta
-rw-r--r--nixos/modules/misc/version.nix2
-rw-r--r--nixos/release.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index a6fffb76f6e8..5127ef341a32 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -76,7 +76,7 @@ in
defaultChannel = mkOption {
internal = true;
type = types.str;
- default = "https://nixos.org/channels/nixos-unstable";
+ default = "https://nixos.org/channels/nixos-21.05";
description = "Default NixOS channel to which the root user is subscribed.";
};
diff --git a/nixos/release.nix b/nixos/release.nix
index 2367e79e4ad0..37dd3ff6055f 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 - 291486)}.${nixpkgs.shortRev}";
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,