diff options
| author | Robert Helgesson <robert@rycee.net> | 2021-07-08 23:58:40 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2021-07-09 08:59:12 +0200 |
| commit | ce6f17f9530ea013d267e07d2dd958bb4e3019dd (patch) | |
| tree | 7c3f1d843a460d0de3b393621a6b9a8f5acf6a05 | |
| parent | 805e945e82cd7f21830436b11a504d6210ed83fa (diff) | |
| download | nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar.gz nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar.bz2 nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar.lz nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar.xz nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.tar.zst nixpkgs-ce6f17f9530ea013d267e07d2dd958bb4e3019dd.zip | |
nixos-option: init at <unversioned>
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/nix/nixos-option/CMakeLists.txt (renamed from nixos/modules/installer/tools/nixos-option/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | pkgs/tools/nix/nixos-option/default.nix (renamed from nixos/modules/installer/tools/nixos-option/default.nix) | 1 | ||||
| -rw-r--r-- | pkgs/tools/nix/nixos-option/libnix-copy-paste.cc (renamed from nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc) | 0 | ||||
| -rw-r--r-- | pkgs/tools/nix/nixos-option/libnix-copy-paste.hh (renamed from nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh) | 0 | ||||
| -rw-r--r-- | pkgs/tools/nix/nixos-option/nixos-option.cc (renamed from nixos/modules/installer/tools/nixos-option/nixos-option.cc) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
7 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 1dc0578daca..f79ed3493df 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -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"; diff --git a/nixos/modules/installer/tools/nixos-option/CMakeLists.txt b/pkgs/tools/nix/nixos-option/CMakeLists.txt index e5834598c4f..e5834598c4f 100644 --- a/nixos/modules/installer/tools/nixos-option/CMakeLists.txt +++ b/pkgs/tools/nix/nixos-option/CMakeLists.txt diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix index 72eec3a3836..216e2678e2e 100644 --- a/nixos/modules/installer/tools/nixos-option/default.nix +++ b/pkgs/tools/nix/nixos-option/default.nix @@ -1,4 +1,5 @@ {lib, stdenv, boost, cmake, pkg-config, nix, ... }: + stdenv.mkDerivation rec { name = "nixos-option"; src = ./.; diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc b/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc index 875c07da639..875c07da639 100644 --- a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc +++ b/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh b/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh index 2274e9a0f85..2274e9a0f85 100644 --- a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh +++ b/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc index f779d82edbd..f779d82edbd 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/nixos-option.cc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786dd4e0dc2..909bdaa1638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31185,6 +31185,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 { }; |