From 51b47621ac00d9d815dec6beb0958f96d2f6eb11 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 19 Sep 2024 20:09:50 +0300 Subject: [PATCH] nixos-install: move to pkgs/by-name --- nixos/modules/installer/tools/tools.nix | 14 +------- .../by-name/ni/nixos-install}/nixos-install.8 | 0 .../ni/nixos-install}/nixos-install.sh | 0 pkgs/by-name/ni/nixos-install/package.nix | 33 +++++++++++++++++++ 4 files changed, 34 insertions(+), 13 deletions(-) rename {nixos/modules/installer/tools/manpages => pkgs/by-name/ni/nixos-install}/nixos-install.8 (100%) rename {nixos/modules/installer/tools => pkgs/by-name/ni/nixos-install}/nixos-install.sh (100%) create mode 100644 pkgs/by-name/ni/nixos-install/package.nix diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 3a89b7663385..3c5816858a46 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -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 { diff --git a/nixos/modules/installer/tools/manpages/nixos-install.8 b/pkgs/by-name/ni/nixos-install/nixos-install.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-install.8 rename to pkgs/by-name/ni/nixos-install/nixos-install.8 diff --git a/nixos/modules/installer/tools/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-install.sh rename to pkgs/by-name/ni/nixos-install/nixos-install.sh diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix new file mode 100644 index 000000000000..0d8ee638acc1 --- /dev/null +++ b/pkgs/by-name/ni/nixos-install/package.nix @@ -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"; +}