Skip to content

Commit

Permalink
nixos-install: move to pkgs/by-name
Browse files Browse the repository at this point in the history
  • Loading branch information
K900 committed Sep 20, 2024
1 parent 825f6ff commit 51b4762
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 13 deletions.
14 changes: 1 addition & 13 deletions nixos/modules/installer/tools/tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,7 @@ let

inherit (pkgs) nixos-build-vms;

nixos-install = makeProg {
name = "nixos-install";
src = ./nixos-install.sh;
inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
path = makeBinPath [
pkgs.jq
nixos-enter
pkgs.util-linuxMinimal
];
manPage = ./manpages/nixos-install.8;
};

nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };

nixos-generate-config = makeProg {
Expand Down
33 changes: 33 additions & 0 deletions pkgs/by-name/ni/nixos-install/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
lib,
substituteAll,
runtimeShell,
installShellFiles,
nix,
jq,
nixos-enter,
util-linuxMinimal,
}:
substituteAll {
name = "nixos-install";
src = ./nixos-install.sh;

inherit runtimeShell nix;

path = lib.makeBinPath [
jq
nixos-enter
util-linuxMinimal
];

dir = "bin";
isExecutable = true;

nativeBuildInputs = [ installShellFiles ];

postInstall = ''
installManPage ${./nixos-install.8}
'';

meta.mainProgram = "nixos-install";
}

0 comments on commit 51b4762

Please sign in to comment.