Merge pull request #129696 from rycee/make-nixos-option-a-proper-package
nixos-option: init at <unversioned>
commit8da27ef161e8bd0403c8f9ae030ef1e91cb6c475
authorRobert Hensing <roberth@users.noreply.github.com>
dateFri 9 Jul 2021, 19:54 (5 years ago)
parentdf0d321ce6f17f
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
@@ -31197,6 +31197,8 @@ in
3119731197
3119831198 nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
3119931199
31200+ nixos-option = callPackage ../tools/nix/nixos-option { };
31201+
3120031202 nix-pin = callPackage ../tools/package-management/nix-pin { };
3120131203
3120231204 nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };