Merge pull request #129696 from rycee/make-nixos-option-a-proper-package

nixos-option: init at <unversioned>

nixos/modules/installer/tools/nixos-option/default.nix pkgs/tools/nix/nixos-option/default.nix

···
 {lib, stdenv, boost, cmake, pkg-config, nix, ... }:
+
 stdenv.mkDerivation rec {
   name = "nixos-option";
   src = ./.;

nixos/modules/installer/tools/tools.nix

···
   nixos-option =
     if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
     then null
-    else pkgs.callPackage ./nixos-option { };
+    else pkgs.nixos-option;
 
   nixos-version = makeProg {
     name = "nixos-version";

pkgs/top-level/all-packages.nix

···
 
   nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
 
+  nixos-option = callPackage ../tools/nix/nixos-option { };
+
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 
   nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };