diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-07-12 00:14:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 00:14:53 +0200 |
| commit | f57af4cd1e7c44853e415d263dd476d838f3d880 (patch) | |
| tree | 8a1ad92e88364a772010d27fa45401d5a76ec0dd /nixos/modules/installer/tools | |
| parent | c0ee74baac4e79aa685137eabb34dbe3f2826249 (diff) | |
| parent | 49d0af0f1eb2c239ce98cb4495b2492c08d3f586 (diff) | |
| download | nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar.gz nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar.bz2 nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar.lz nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar.xz nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.tar.zst nixpkgs-f57af4cd1e7c44853e415d263dd476d838f3d880.zip | |
Merge pull request #237442 from SuperSandro2000/nixos-option
nixos-option: update to nix 2.15
Diffstat (limited to 'nixos/modules/installer/tools')
| -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 1e36d10b391..54b0f81ee78 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 ]; |