JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109469 from domenkozar/pkgs.nixos-rebuild

Browse Source 
move nixos-rebuild into pkgs
This commit is contained in:
Domen Kožar 2021-01-16 10:58:17 +01:00 committed by GitHub
commit d3afdf90db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/installer/tools/tools.nix
View File

@ -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";

14
pkgs/os-specific/linux/nixos-rebuild/default.nix Normal file
View File

@ -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 ];
}

0
nixos/modules/installer/tools/nixos-rebuild.sh → pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };