make-initrd: use closureInfo again

nixos/modules/profiles/installation-device.nix

@@ -102,10 +102,10 @@ with lib;
         stdenv
         stdenvNoCC # for runCommand
         busybox
-        jq # for closureInfo
         # For boot.initrd.systemd
         makeInitrdNGTool
-      ];
+      ]
+      ++ jq.all; # for closureInfo
 
     boot.swraid.enable = true;
     # remove warning about unset mail

pkgs/build-support/kernel/make-initrd.nix

@@ -20,7 +20,6 @@ let
 in
 {
   stdenvNoCC,
-  perl,
   cpio,
   ubootTools,
   lib,
@@ -101,7 +100,6 @@ stdenvNoCC.mkDerivation (
     builder = ./make-initrd.sh;
 
     nativeBuildInputs = [
-      perl
       cpio
     ] ++ lib.optional makeUInitrd ubootTools;
 
@@ -121,14 +119,7 @@ stdenvNoCC.mkDerivation (
     symlinks = map (x: x.symlink) contents;
     suffices = map (x: if x ? suffix then x.suffix else "none") contents;
 
-    # For obtaining the closure of `contents'.
-    # Note: we don't use closureInfo yet, as that won't build with nix-1.x.
-    # See #36268.
-    exportReferencesGraph = lib.zipListsWith (x: i: [
-      ("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}")
-      x.object
-    ]) contents (lib.range 0 (lib.length contents - 1));
-    pathsFromGraph = ./paths-from-graph.pl;
+    closureInfo = "${pkgsBuildHost.closureInfo { rootPaths = objects; }}";
   }
   // lib.optionalAttrs makeUInitrd {
     uInitrdCompression = uInitrdCompression;

pkgs/build-support/kernel/make-initrd.sh

@@ -26,7 +26,7 @@ done
 
 
 # Get the paths in the closure of `object'.
-storePaths=$(perl $pathsFromGraph closure-*)
+storePaths="$(cat $closureInfo/store-paths)"
 
 
 # Paths in cpio archives *must* be relative, otherwise the kernel

pkgs/top-level/aliases.nix

@@ -1028,6 +1028,7 @@ mapAliases {
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
   paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
   paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17
+  pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead";# Added 2025-01-23
   paperless-ng = paperless-ngx; # Added 2022-04-11
   partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08
   patchelfStable = patchelf; # Added 2024-01-25

pkgs/top-level/all-packages.nix

@@ -727,8 +727,6 @@ with pkgs;
     callPackages ../build-support/setup-hooks/patch-rc-path-hooks { }
   ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix;
 
-  pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
-
   pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }
     ../build-support/setup-hooks/prune-libtool-files.sh;