wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

* Re-enable support for substitutes in the normaliser.

Browse source 
* A better substitute mechanism.

  Instead of generating a store expression for each store path for
  which we have a substitute, we can have a single store expression
  that builds a generic program that is invoked to build the desired
  store path, which is passed as an argument.

  This means that operations like `nix-pull' only produce O(1) files
  instead of O(N) files in the store when registering N substitutes.
  (It consumes O(N) database storage, of course, but that's not a
  performance problem).

* Added a test for the substitute mechanism.
  
* `nix-store --substitute' reads the substitutes from standard input,
  instead of from the command line.  This prevents us from running
  into the kernel's limit on command line length.
This commit is contained in:
Eelco Dolstra 2004-06-20 19:17:54 +00:00
parent bafb2357d1
commit 112ee89501
10 changed files with 444 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/Makefile.am
View file

@ -17,9 +17,10 @@ dependencies.sh: dependencies.nix
locking.sh: locking.nix
parallel.sh: parallel.nix
build-hook.sh: build-hook.nix
substitutes.sh: substitutes.nix substituter.nix
TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \
build-hook.sh
build-hook.sh substitutes.sh
XFAIL_TESTS =

22
tests/substituter.builder.sh Normal file
View file

@ -0,0 +1,22 @@
# Set a PATH (!!! impure).
export PATH=/bin:/usr/bin:$PATH
mkdir $out
cat > $out/substituter <<EOF
#! /bin/sh -ex
echo \$*
case \$* in
*aaaa*)
echo "Closure([\"\$2\"],[(\"\$2\",[])])" > \$1
;;
*)
mkdir \$1
echo \$3 \$4 > \$1/hello
;;
esac
EOF
chmod +x $out/substituter

6
tests/substituter.nix.in Normal file
View file

@ -0,0 +1,6 @@
derivation {
name = "substituter";
system = "@system@";
builder = "@shell@";
args = ["-e" "-x" ./substituter.builder.sh];
}

6
tests/substitutes.nix.in Normal file
View file

@ -0,0 +1,6 @@
derivation {
name = "substitutes";
system = "@system@";
builder = "@shell@";
args = ["-e" "-x" ./simple.builder.sh];
}

25
tests/substitutes.sh Normal file
View file

@ -0,0 +1,25 @@
# Instantiate.
storeExpr=$($TOP/src/nix-instantiate/nix-instantiate substitutes.nix)
echo "store expr is $storeExpr"
# Find the output path.
outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr")
echo "output path is $outPath"
# Instantiate the substitute program.
subExpr=$($TOP/src/nix-instantiate/nix-instantiate substituter.nix)
echo "store expr is $subExpr"
# Register a fake successor, and a substitute for it.
suc=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-s.store
(echo $suc && echo $subExpr && echo "/substituter" && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
$TOP/src/nix-store/nix-store --successor $storeExpr $suc
# Register a substitute for the output path.
(echo $outPath && echo $subExpr && echo "/substituter" && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
$TOP/src/nix-store/nix-store -rvvvvv "$storeExpr"
text=$(cat "$outPath"/hello)
if test "$text" != "Hallo Wereld"; then exit 1; fi