git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109469 from domenkozar/pkgs.nixos-rebuild

move nixos-rebuild into pkgs

commitd3afdf90dbb2883fa891476435e45981643efed3 authorDomen Kožar <domen@dev.si> dateSat 16 Jan 2021, 10:58 (6 years ago) parentd18e537c32f5b2
4 files changed+17−11
nixos/modules/installer/tools/tools.nix+1−11 pkgs/os-specific/linux/nixos-rebuild/default.nix+14 nixos/modules/installer/tools/nixos-rebuild.sh → pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh pkgs/top-level/all-packages.nix+2
nixos/modules/installer/tools/tools.nix+1−11
@@ -28,17 +28,7 @@ let
2828 ];
2929 };
3030
31− nixos-rebuild =
32− let fallback = import ./nix-fallback-paths.nix; in
33− makeProg {
34− name = "nixos-rebuild";
35− src = ./nixos-rebuild.sh;
36− inherit (pkgs) runtimeShell;
37− nix = config.nix.package.out;
38− nix_x86_64_linux = fallback.x86_64-linux;
39− nix_i686_linux = fallback.i686-linux;
40− path = makeBinPath [ pkgs.jq ];
41− };
31+ nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
4232
4333 nixos-generate-config = makeProg {
4434 name = "nixos-generate-config";
pkgs/os-specific/linux/nixos-rebuild/default.nixnew file+14
@@ -0,0 +1,14 @@
1+{ substituteAll, runtimeShell, jq, nix, lib }:
2+
3+let
4+ fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
5+in substituteAll {
6+ name = "nixos-rebuild";
7+ src = ./nixos-rebuild.sh;
8+ dir = "bin";
9+ isExecutable = true;
10+ inherit runtimeShell nix;
11+ nix_x86_64_linux = fallback.x86_64-linux;
12+ nix_i686_linux = fallback.i686-linux;
13+ path = lib.makeBinPath [ jq ];
14+}
nixos/modules/installer/tools/nixos-rebuild.sh → pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.shrenamed

The content is the same.

pkgs/top-level/all-packages.nix+2
@@ -28905,6 +28905,8 @@ in
2890528905
2890628906 nixos-generators = callPackage ../tools/nix/nixos-generators { };
2890728907
28908+ nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
28909+
2890828910 norwester-font = callPackage ../data/fonts/norwester {};
2890928911
2891028912 nut = callPackage ../applications/misc/nut { };