puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #2011 from dezgeg/use-closureinfo

Browse source 
release.nix: Use pkgs.closureInfo for binaryTarball
This commit is contained in:
Eelco Dolstra 2018-03-27 15:57:17 +02:00 committed by GitHub
parent 0cb1e52052 cc6712ae90
commit 7ec13eda9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
release.nix
View file

@ -115,16 +115,15 @@ let
let let
toplevel = builtins.getAttr system jobs.build; toplevel = builtins.getAttr system jobs.build;
version = toplevel.src.version; version = toplevel.src.version;
installerClosureInfo = closureInfo { rootPaths = [ toplevel cacert ]; };
in in
runCommand "nix-binary-tarball-${version}" runCommand "nix-binary-tarball-${version}"
{ exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ]; { nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
buildInputs = [ perl ] ++ lib.optional (system != "aarch64-linux") shellcheck;
meta.description = "Distribution-independent Nix bootstrap binaries for ${system}"; meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
} }
'' ''
storePaths=$(perl ${pathsFromGraph} ./closure1 ./closure2) cp ${installerClosureInfo}/registration $TMPDIR/reginfo
printRegistration=1 perl ${pathsFromGraph} ./closure1 ./closure2 > $TMPDIR/reginfo
substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \ substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
--subst-var-by nix ${toplevel} \ --subst-var-by nix ${toplevel} \
--subst-var-by cacert ${cacert} --subst-var-by cacert ${cacert}
@ -150,7 +149,8 @@ let
--transform "s,$TMPDIR/install,$dir/install," \ --transform "s,$TMPDIR/install,$dir/install," \
--transform "s,$TMPDIR/reginfo,$dir/.reginfo," \ --transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
--transform "s,$NIX_STORE,$dir/store,S" \ --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)
''); '');