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

nixos-option: init at <unversioned>
This commit is contained in:
Robert Hensing 2021-07-09 19:54:23 +02:00 committed by GitHub
commit 8da27ef161
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 1 deletions

View file

@ -42,7 +42,7 @@ let
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";

View file

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

View file

@ -31197,6 +31197,8 @@ in
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 { };