summary refs log tree commit diff
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2022-05-23 20:00:45 +0200
committerJanne Heß <janne@hess.ooo>2022-05-23 20:00:45 +0200
commit7ae60dd7068478db5d936a3850b6df859aec21d0 (patch)
tree6f485b37d4545bc643347b9661936ed18e6d629e
parente728029b3070c170a87273ccc873b18e492fcc93 (diff)
22.05 beta release 22.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 010acdb72f678..575df74452bdf 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -107,7 +107,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = "https://nixos.org/channels/nixos-unstable";
+      default = "https://nixos.org/channels/nixos-22.05";
       description = "Default NixOS channel to which the root user is subscribed.";
     };
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 0df443dd204cb..22adb8fd1e711 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 - 379959)}.${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,