diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-06-20 15:18:58 +0200 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-07-11 17:13:21 +0200 |
commit | 49d0af0f1eb2c239ce98cb4495b2492c08d3f586 (patch) | |
tree | a5685732d24091145a220e58bd6de252af5d6654 /nixos | |
parent | 38e917e4bf5f7adcd7d9d20d67c354af9f879e1c (diff) | |
download | nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar.gz nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar.bz2 nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar.lz nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar.xz nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.tar.zst nixpkgs-49d0af0f1eb2c239ce98cb4495b2492c08d3f586.zip |
nixos/tools: remove nixos-option condition
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 5133ad18f4b..dd4709fb96f 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -42,10 +42,7 @@ let xserverEnabled = config.services.xserver.enable; }; - nixos-option = - if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" - then null - else pkgs.nixos-option; + inherit (pkgs) nixos-option; nixos-version = makeProg { name = "nixos-version"; @@ -232,9 +229,10 @@ in nixos-install nixos-rebuild nixos-generate-config + nixos-option nixos-version nixos-enter - ] ++ lib.optional (nixos-option != null) nixos-option; + ]; documentation.man.man-db.skipPackages = [ nixos-version ]; |