diff options
| author | Domen Kožar <domen@dev.si> | 2021-01-16 10:58:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 10:58:17 +0100 |
| commit | d3afdf90dbb2883fa891476435e45981643efed3 (patch) | |
| tree | 3e8339bf9377eca7b809aaf059cbd7283fa39728 | |
| parent | d18e53761338ce6651039925f5632446ab69989b (diff) | |
| parent | c32f5b22f1c680a65f3ae63cf14dfed6b967e675 (diff) | |
| download | nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar.gz nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar.bz2 nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar.lz nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar.xz nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.tar.zst nixpkgs-d3afdf90dbb2883fa891476435e45981643efed3.zip | |
Merge pull request #109469 from domenkozar/pkgs.nixos-rebuild
move nixos-rebuild into pkgs
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nixos-rebuild/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh (renamed from nixos/modules/installer/tools/nixos-rebuild.sh) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 17 insertions, 11 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 0582812f92d..ada5f574856 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -28,17 +28,7 @@ let ]; }; - nixos-rebuild = - let fallback = import ./nix-fallback-paths.nix; in - makeProg { - name = "nixos-rebuild"; - src = ./nixos-rebuild.sh; - inherit (pkgs) runtimeShell; - nix = config.nix.package.out; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - path = makeBinPath [ pkgs.jq ]; - }; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; nixos-generate-config = makeProg { name = "nixos-generate-config"; diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix new file mode 100644 index 00000000000..93500d2eaa3 --- /dev/null +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -0,0 +1,14 @@ +{ substituteAll, runtimeShell, jq, nix, lib }: + +let + fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; +in substituteAll { + name = "nixos-rebuild"; + src = ./nixos-rebuild.sh; + dir = "bin"; + isExecutable = true; + inherit runtimeShell nix; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + path = lib.makeBinPath [ jq ]; +} diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e452e24d263..e452e24d263 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c2ace49de1..5deb6b918f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28905,6 +28905,8 @@ in nixos-generators = callPackage ../tools/nix/nixos-generators { }; + nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { }; + norwester-font = callPackage ../data/fonts/norwester {}; nut = callPackage ../applications/misc/nut { }; |