TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* nix-store: `--substitute' -> `--register-substitutes'.

This commit is contained in:
Eelco Dolstra 2005-04-08 13:48:41 +00:00
parent 8b70f138e0
commit c702dfca3f
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/nix-pull.in
View File

@ -74,7 +74,7 @@ print "$size store paths in manifest\n";
# Register all substitutes. # Register all substitutes.
print STDERR "registering substitutes...\n"; print STDERR "registering substitutes...\n";
my $pid = open2(\*READ, \*WRITE, "$binDir/nix-store --substitute") my $pid = open2(\*READ, \*WRITE, "$binDir/nix-store --register-substitutes")
or die "cannot run nix-store"; or die "cannot run nix-store";
close READ; close READ;

2
src/nix-store/help.txt
View File

@ -9,7 +9,7 @@ Operations:
--add / -A: copy a path to the Nix store --add / -A: copy a path to the Nix store
--query / -q: query information --query / -q: query information
--substitute: register a substitute expression (dangerous!) --register-substitutes: register a substitute expression (dangerous!)
--clear-substitutes: clear all substitutes --clear-substitutes: clear all substitutes
--register-validity: register path validity (dangerous!) --register-validity: register path validity (dangerous!)
--check-validity: check path validity --check-validity: check path validity

6
src/nix-store/main.cc
View File

@ -394,7 +394,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
} }
static void opSubstitute(Strings opFlags, Strings opArgs) static void opRegisterSubstitutes(Strings opFlags, Strings opArgs)
{ {
if (!opFlags.empty()) throw UsageError("unknown flag"); if (!opFlags.empty()) throw UsageError("unknown flag");
if (!opArgs.empty()) throw UsageError("no arguments expected"); if (!opArgs.empty()) throw UsageError("no arguments expected");
@ -607,8 +607,8 @@ void run(Strings args)
op = opPrintFixedPath; op = opPrintFixedPath;
else if (arg == "--query" || arg == "-q") else if (arg == "--query" || arg == "-q")
op = opQuery; op = opQuery;
else if (arg == "--substitute") else if (arg == "--register-substitutes")
op = opSubstitute; op = opRegisterSubstitutes;
else if (arg == "--clear-substitutes") else if (arg == "--clear-substitutes")
op = opClearSubstitutes; op = opClearSubstitutes;
else if (arg == "--register-validity") else if (arg == "--register-validity")

2
tests/fallback.sh
View File

@ -5,7 +5,7 @@ outPath=$($TOP/src/nix-store/nix-store -q --fallback "$drvPath")
echo "output path is $outPath" echo "output path is $outPath"
# Register a non-existant substitute # Register a non-existant substitute
(echo $outPath && echo "" && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute (echo $outPath && echo "" && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --register-substitutes
# Build the derivation # Build the derivation
$TOP/src/nix-store/nix-store -r --fallback "$drvPath" $TOP/src/nix-store/nix-store -r --fallback "$drvPath"

2
tests/substitutes.sh
View File

@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvv "$drvPath")
echo "output path is $outPath" echo "output path is $outPath"
regSub() { regSub() {
(echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute (echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --register-substitutes
} }
# Register a substitute for the output path. # Register a substitute for the output path.

2
tests/substitutes2.sh
View File

@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$drvPath")
echo "output path is $outPath" echo "output path is $outPath"
regSub() { regSub() {
(echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute (echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --register-substitutes
} }
# Register a substitute for the output path. # Register a substitute for the output path.