nixos-option: init at <unversioned>
commitce6f17f9530ea013d267e07d2dd958bb4e3019dd
authorRobert Helgesson <robert@rycee.net>
dateThu 8 Jul 2021, 23:58 (5 years ago)
parent805e945
nixos/modules/installer/tools/tools.nix+1−1
@@ -42,7 +42,7 @@ let
4242 nixos-option =
4343 if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
4444 then null
45− else pkgs.callPackage ./nixos-option { };
45+ else pkgs.nixos-option;
4646
4747 nixos-version = makeProg {
4848 name = "nixos-version";
nixos/modules/installer/tools/nixos-option/CMakeLists.txt → pkgs/tools/nix/nixos-option/CMakeLists.txtrenamed
The content is the same.
nixos/modules/installer/tools/nixos-option/default.nix → pkgs/tools/nix/nixos-option/default.nixrenamed+1
@@ -1,4 +1,5 @@
11{lib, stdenv, boost, cmake, pkg-config, nix, ... }:
2+
23stdenv.mkDerivation rec {
34 name = "nixos-option";
45 src = ./.;
nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc → pkgs/tools/nix/nixos-option/libnix-copy-paste.ccrenamed
The content is the same.
nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh → pkgs/tools/nix/nixos-option/libnix-copy-paste.hhrenamed
The content is the same.
nixos/modules/installer/tools/nixos-option/nixos-option.cc → pkgs/tools/nix/nixos-option/nixos-option.ccrenamed
The content is the same.
pkgs/top-level/all-packages.nix+2
@@ -31185,6 +31185,8 @@ in
3118531185
3118631186 nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
3118731187
31188+ nixos-option = callPackage ../tools/nix/nixos-option { };
31189+
3118831190 nix-pin = callPackage ../tools/package-management/nix-pin { };
3118931191
3119031192 nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };