nixos-enter: move to pkgs/by-name

NixOS · Sep 20, 2024 · 825f6ff · 825f6ff
1 parent 8353a68
commit 825f6ff
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
@@ -64,16 +64,7 @@ let
     manPage = ./manpages/nixos-version.8;
   };
 
-  nixos-enter = makeProg {
-    name = "nixos-enter";
-    src = ./nixos-enter.sh;
-    inherit (pkgs) runtimeShell;
-    path = makeBinPath [
-      pkgs.util-linuxMinimal
-    ];
-    manPage = ./manpages/nixos-enter.8;
-  };
-
+  inherit (pkgs) nixos-enter;
 in
 
 {

diff --git a/...es/installer/tools/manpages/nixos-enter.8 → pkgs/by-name/ni/nixos-enter/nixos-enter.8 b/...es/installer/tools/manpages/nixos-enter.8 → pkgs/by-name/ni/nixos-enter/nixos-enter.8
diff --git a/nixos/modules/installer/tools/nixos-enter.sh → pkgs/by-name/ni/nixos-enter/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh → pkgs/by-name/ni/nixos-enter/nixos-enter.sh
diff --git a/pkgs/by-name/ni/nixos-enter/package.nix b/pkgs/by-name/ni/nixos-enter/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  substituteAll,
+  runtimeShell,
+  installShellFiles,
+  util-linuxMinimal,
+}:
+substituteAll {
+  name = "nixos-enter";
+  src = ./nixos-enter.sh;
+
+  inherit runtimeShell;
+
+  path = lib.makeBinPath [
+    util-linuxMinimal
+  ];
+
+  dir = "bin";
+  isExecutable = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage ${./nixos-enter.8}
+  '';
+
+  meta.mainProgram = "nixos-enter";
+}