diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 9a37f595093..9158d82a73a 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -35,23 +35,8 @@ in
nixosLabel = mkOption {
type = types.str;
description = ''
- NixOS version name to be used in the names of generated
- outputs and boot labels.
-
- If you ever wanted to influence the labels in your GRUB menu,
- this is option is for you.
-
- Can be set directly or with NIXOS_LABEL
- environment variable for nixos-rebuild,
- e.g.:
-
-
- #!/bin/sh
- today=`date +%Y%m%d`
- branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')`
- revision=`(cd nixpkgs ; git rev-parse HEAD)`
- export NIXOS_LABEL="$today.$branch-''${revision:0:7}"
- nixos-rebuild switch
+ Label to be used in the names of generated outputs and boot
+ labels.
'';
};
@@ -102,8 +87,8 @@ in
system = {
# These defaults are set here rather than up there so that
# changing them would not rebuild the manual
- nixosLabel = mkDefault (maybeEnv "NIXOS_LABEL" cfg.nixosVersion);
- nixosVersion = mkDefault (maybeEnv "NIXOS_VERSION" (cfg.nixosRelease + cfg.nixosVersionSuffix));
+ nixosLabel = mkDefault cfg.nixosVersion;
+ nixosVersion = mkDefault (cfg.nixosRelease + cfg.nixosVersionSuffix);
nixosRevision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));