aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-03-26 15:14:53 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-03-26 15:47:14 +0300
commitcc6712ae90fb0783c51f1b3f86433adcd11a4ccb (patch)
tree40cddaad764957430a02ed027210a94843f7479f
parent0cb1e52052901c375d2b9d6bfb475b181f4464c2 (diff)
release.nix: Use pkgs.closureInfo for binaryTarball
pathsFromGraph is legacy since Nix 2.0.
-rw-r--r--release.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/release.nix b/release.nix
index 5fae5468b..91c782c51 100644
--- a/release.nix
+++ b/release.nix
@@ -115,16 +115,15 @@ let
let
toplevel = builtins.getAttr system jobs.build;
version = toplevel.src.version;
+ installerClosureInfo = closureInfo { rootPaths = [ toplevel cacert ]; };
in
runCommand "nix-binary-tarball-${version}"
- { exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ];
- buildInputs = [ perl ] ++ lib.optional (system != "aarch64-linux") shellcheck;
+ { nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
}
''
- storePaths=$(perl ${pathsFromGraph} ./closure1 ./closure2)
- printRegistration=1 perl ${pathsFromGraph} ./closure1 ./closure2 > $TMPDIR/reginfo
+ cp ${installerClosureInfo}/registration $TMPDIR/reginfo
substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
--subst-var-by nix ${toplevel} \
--subst-var-by cacert ${cacert}
@@ -150,7 +149,8 @@ let
--transform "s,$TMPDIR/install,$dir/install," \
--transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
--transform "s,$NIX_STORE,$dir/store,S" \
- $TMPDIR/install $TMPDIR/install-darwin-multi-user $TMPDIR/reginfo $storePaths
+ $TMPDIR/install $TMPDIR/install-darwin-multi-user $TMPDIR/reginfo \
+ $(cat ${installerClosureInfo}/store-paths)
'');