public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47582 from srhb/dockerTools-nix-stable 

dockerTools: Use nix instead of nixUnstable
This commit is contained in:
lewo 2018-10-01 10:04:20 +02:00 committed by GitHub
parent 56b4db9710 b256df4937
commit 976edf17bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/docker/default.nix
View File

@ -10,7 +10,7 @@
lib, lib,
pkgs, pkgs,
pigz, pigz,
nixUnstable, nix,
perl, perl,
runCommand, runCommand,
rsync, rsync,
@ -262,7 +262,7 @@ rec {
''; '';
nixRegistration = contents: runCommand "nix-registration" { nixRegistration = contents: runCommand "nix-registration" {
buildInputs = [ nixUnstable perl ]; buildInputs = [ nix perl ];
# For obtaining the closure of `contents'. # For obtaining the closure of `contents'.
exportReferencesGraph = exportReferencesGraph =
let contentsList = if builtins.isList contents then contents else [ contents ]; let contentsList = if builtins.isList contents then contents else [ contents ];
@ -803,7 +803,7 @@ rec {
echo " be better to only have one layer that contains a nix store." echo " be better to only have one layer that contains a nix store."
# This requires Nix 1.12 or higher # This requires Nix 1.12 or higher
export NIX_REMOTE=local?root=$PWD export NIX_REMOTE=local?root=$PWD
${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump ${nix}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump
# We fill the store in order to run the 'verify' command that # We fill the store in order to run the 'verify' command that
# generates hash and size of output paths. # generates hash and size of output paths.
@ -814,7 +814,7 @@ rec {
storePaths=$(cat ${nixRegistration contents}/storePaths) storePaths=$(cat ${nixRegistration contents}/storePaths)
echo "Copying everything to /nix/store (will take a while)..." echo "Copying everything to /nix/store (will take a while)..."
cp -prd $storePaths nix/store/ cp -prd $storePaths nix/store/
${nixUnstable}/bin/nix-store --verify --check-contents ${nix}/bin/nix-store --verify --check-contents
mkdir -p nix/var/nix/gcroots/docker/ mkdir -p nix/var/nix/gcroots/docker/
for i in ${lib.concatStringsSep " " contents}; do for i in ${lib.concatStringsSep " " contents}; do