diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml
index 4b6574288e..3e6cd73790 100644
--- a/doc/manual/writing-nix-expressions.xml
+++ b/doc/manual/writing-nix-expressions.xml
@@ -782,6 +782,9 @@ stdenv.mkDerivation {
true and
false.
+ The null value, denoted as
+ null.
+
diff --git a/nix.spec.in b/nix.spec.in
index d091405626..66e55ba158 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -152,10 +152,6 @@ cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/
rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
-%check
-make check
-
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/perl/Makefile.am b/perl/Makefile.am
index aaf76bbc8f..b8e60bc2dc 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -1,4 +1,4 @@
-PERL_MODULES = lib/Nix/Store.pm lib/Nix/Manifest.pm lib/Nix/GeneratePatches.pm lib/Nix/SSH.pm lib/Nix/CopyClosure.pm lib/Nix/Config.pm.in lib/Nix/Utils.pm
+PERL_MODULES = lib/Nix/Store.pm lib/Nix/Manifest.pm lib/Nix/GeneratePatches.pm lib/Nix/SSH.pm lib/Nix/CopyClosure.pm lib/Nix/Config.pm.in lib/Nix/Utils.pm lib/Nix/Crypto.pm
all: $(PERL_MODULES:.in=)
diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in
index ee9d865ca3..e07d4c08f1 100644
--- a/perl/lib/Nix/Config.pm.in
+++ b/perl/lib/Nix/Config.pm.in
@@ -13,6 +13,7 @@ $storeDir = $ENV{"NIX_STORE_DIR"} || "@storedir@";
$bzip2 = "@bzip2@";
$xz = "@xz@";
$curl = "@curl@";
+$openssl = "@openssl@";
$useBindings = "@perlbindings@" eq "yes";
@@ -32,7 +33,7 @@ sub readConfig {
open CONFIG, "<$config" or die "cannot open `$config'";
while () {
- /^\s*([\w|-]+)\s*=\s*(.*)$/ or next;
+ /^\s*([\w\-\.]+)\s*=\s*(.*)$/ or next;
$config{$1} = $2;
}
close CONFIG;
diff --git a/perl/lib/Nix/Crypto.pm b/perl/lib/Nix/Crypto.pm
new file mode 100644
index 0000000000..0286e88d3d
--- /dev/null
+++ b/perl/lib/Nix/Crypto.pm
@@ -0,0 +1,42 @@
+package Nix::Crypto;
+
+use strict;
+use MIME::Base64;
+use Nix::Store;
+use Nix::Config;
+use IPC::Open2;
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw(signString isValidSignature);
+
+sub signString {
+ my ($privateKeyFile, $s) = @_;
+ my $hash = hashString("sha256", 0, $s);
+ my ($from, $to);
+ my $pid = open2($from, $to, $Nix::Config::openssl, "rsautl", "-sign", "-inkey", $privateKeyFile);
+ print $to $hash;
+ close $to;
+ local $/ = undef;
+ my $sig = <$from>;
+ close $from;
+ waitpid($pid, 0);
+ die "$0: OpenSSL returned exit code $? while signing hash\n" if $? != 0;
+ my $sig64 = encode_base64($sig, "");
+ return $sig64;
+}
+
+sub isValidSignature {
+ my ($publicKeyFile, $sig64, $s) = @_;
+ my ($from, $to);
+ my $pid = open2($from, $to, $Nix::Config::openssl, "rsautl", "-verify", "-inkey", $publicKeyFile, "-pubin");
+ print $to decode_base64($sig64);
+ close $to;
+ my $decoded = <$from>;
+ close $from;
+ waitpid($pid, 0);
+ return 0 if $? != 0;
+ my $hash = hashString("sha256", 0, $s);
+ return $decoded eq $hash;
+}
+
+1;
diff --git a/perl/lib/Nix/Manifest.pm b/perl/lib/Nix/Manifest.pm
index 04c699b43e..015c928356 100644
--- a/perl/lib/Nix/Manifest.pm
+++ b/perl/lib/Nix/Manifest.pm
@@ -8,6 +8,7 @@ use File::stat;
use File::Path;
use Fcntl ':flock';
use Nix::Config;
+use Nix::Crypto;
our @ISA = qw(Exporter);
our @EXPORT = qw(readManifest writeManifest updateManifestDB addPatch deleteOldManifests parseNARInfo);
@@ -394,9 +395,10 @@ sub deleteOldManifests {
# Parse a NAR info file.
sub parseNARInfo {
- my ($storePath, $content) = @_;
+ my ($storePath, $content, $requireValidSig, $location) = @_;
- my ($storePath2, $url, $fileHash, $fileSize, $narHash, $narSize, $deriver, $system);
+ my ($storePath2, $url, $fileHash, $fileSize, $narHash, $narSize, $deriver, $system, $sig);
+ my $signedData = "";
my $compression = "bzip2";
my @refs;
@@ -412,11 +414,13 @@ sub parseNARInfo {
elsif ($1 eq "References") { @refs = split / /, $2; }
elsif ($1 eq "Deriver") { $deriver = $2; }
elsif ($1 eq "System") { $system = $2; }
+ elsif ($1 eq "Signature") { $sig = $2; last; }
+ $signedData .= "$line\n";
}
return undef if $storePath ne $storePath2 || !defined $url || !defined $narHash;
- return
+ my $res =
{ url => $url
, compression => $compression
, fileHash => $fileHash
@@ -427,6 +431,36 @@ sub parseNARInfo {
, deriver => $deriver
, system => $system
};
+
+ if ($requireValidSig) {
+ if (!defined $sig) {
+ warn "NAR info file `$location' lacks a signature; ignoring\n";
+ return undef;
+ }
+ my ($sigVersion, $keyName, $sig64) = split ";", $sig;
+ $sigVersion //= 0;
+ if ($sigVersion != 1) {
+ warn "NAR info file `$location' has unsupported version $sigVersion; ignoring\n";
+ return undef;
+ }
+ return undef unless defined $keyName && defined $sig64;
+ my $publicKeyFile = $Nix::Config::config{"binary-cache-public-key-$keyName"};
+ if (!defined $publicKeyFile) {
+ warn "NAR info file `$location' is signed by unknown key `$keyName'; ignoring\n";
+ return undef;
+ }
+ if (! -f $publicKeyFile) {
+ die "binary cache public key file `$publicKeyFile' does not exist\n";
+ return undef;
+ }
+ if (!isValidSignature($publicKeyFile, $sig64, $signedData)) {
+ warn "NAR info file `$location' has an invalid signature; ignoring\n";
+ return undef;
+ }
+ $res->{signedBy} = $keyName;
+ }
+
+ return $res;
}
diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
index c449ed5241..d46af57e64 100644
--- a/perl/lib/Nix/Store.xs
+++ b/perl/lib/Nix/Store.xs
@@ -20,6 +20,8 @@ void doInit()
if (!store) {
try {
settings.processEnvironment();
+ settings.loadConfFile();
+ settings.update();
settings.lockCPU = false;
store = openStore();
} catch (Error & e) {
diff --git a/release.nix b/release.nix
index 11ed7a1c30..6708719094 100644
--- a/release.nix
+++ b/release.nix
@@ -6,7 +6,7 @@ let
pkgs = import {};
- systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
+ systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" /* "x86_64-freebsd" "i686-freebsd" */ ];
jobs = rec {
@@ -23,7 +23,7 @@ let
inherit officialRelease;
buildInputs =
- [ curl bison flex2535 perl libxml2 libxslt w3m bzip2
+ [ curl bison flex perl libxml2 libxslt w3m bzip2
tetex dblatex nukeReferences pkgconfig sqlite git
];
@@ -175,6 +175,8 @@ let
rpm_fedora18x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora18x86_64) 60;
rpm_fedora19i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora19i386) 70;
rpm_fedora19x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora19x86_64) 70;
+ rpm_fedora20i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora20i386) 70;
+ rpm_fedora20x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora20x86_64) 70;
deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50;
@@ -212,15 +214,15 @@ let
meta.description = "Release-critical builds";
constituents =
[ tarball
- build.i686-freebsd
+ #build.i686-freebsd
build.i686-linux
build.x86_64-darwin
- build.x86_64-freebsd
+ #build.x86_64-freebsd
build.x86_64-linux
- binaryTarball.i686-freebsd
+ #binaryTarball.i686-freebsd
binaryTarball.i686-linux
binaryTarball.x86_64-darwin
- binaryTarball.x86_64-freebsd
+ #binaryTarball.x86_64-freebsd
binaryTarball.x86_64-linux
deb_debian7i386
deb_debian7x86_64
@@ -230,6 +232,8 @@ let
deb_ubuntu1310x86_64
rpm_fedora19i386
rpm_fedora19x86_64
+ rpm_fedora20i386
+ rpm_fedora20x86_64
tests.remote_builds
tests.nix_copy_closure
];
diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in
index 950bcd1785..e6925d7316 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -42,6 +42,8 @@ my $caBundle = $ENV{"CURL_CA_BUNDLE"} // $ENV{"OPENSSL_X509_CERT_FILE"};
my $userName = getpwuid($<) or die "cannot figure out user name";
+my $requireSignedBinaryCaches = ($Nix::Config::config{"signed-binary-caches"} // "0") ne "0";
+
sub addRequest {
my ($storePath, $url, $head) = @_;
@@ -120,9 +122,10 @@ sub processRequests {
sub initCache {
- my $dbPath = "$Nix::Config::stateDir/binary-cache-v2.sqlite";
+ my $dbPath = "$Nix::Config::stateDir/binary-cache-v3.sqlite";
unlink "$Nix::Config::stateDir/binary-cache-v1.sqlite";
+ unlink "$Nix::Config::stateDir/binary-cache-v2.sqlite";
# Open/create the database.
$dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
@@ -159,7 +162,7 @@ EOF
narSize integer,
refs text,
deriver text,
- system text,
+ signedBy text,
timestamp integer not null,
primary key (cache, storePath),
foreign key (cache) references BinaryCaches(id) on delete cascade
@@ -183,7 +186,7 @@ EOF
$insertNAR = $dbh->prepare(
"insert or replace into NARs(cache, storePath, url, compression, fileHash, fileSize, narHash, " .
- "narSize, refs, deriver, system, timestamp) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") or die;
+ "narSize, refs, deriver, signedBy, timestamp) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") or die;
$queryNAR = $dbh->prepare("select * from NARs where cache = ? and storePath = ?") or die;
@@ -309,14 +312,16 @@ sub processNARInfo {
return undef;
}
- my $narInfo = parseNARInfo($storePath, $request->{content});
+ my $narInfo = parseNARInfo($storePath, $request->{content}, $requireSignedBinaryCaches, $request->{url});
return undef unless defined $narInfo;
+ die if $requireSignedBinaryCaches && !defined $narInfo->{signedBy};
+
# Cache the result.
$insertNAR->execute(
$cache->{id}, basename($storePath), $narInfo->{url}, $narInfo->{compression},
$narInfo->{fileHash}, $narInfo->{fileSize}, $narInfo->{narHash}, $narInfo->{narSize},
- join(" ", @{$narInfo->{refs}}), $narInfo->{deriver}, $narInfo->{system}, time())
+ join(" ", @{$narInfo->{refs}}), $narInfo->{deriver}, $narInfo->{signedBy}, time())
if shouldCache $request->{url};
return $narInfo;
@@ -330,6 +335,10 @@ sub getCachedInfoFrom {
my $res = $queryNAR->fetchrow_hashref();
return undef unless defined $res;
+ # We may previously have cached this info when signature checking
+ # was disabled. In that case, ignore the cached info.
+ return undef if $requireSignedBinaryCaches && !defined $res->{signedBy};
+
return
{ url => $res->{url}
, compression => $res->{compression}
@@ -339,6 +348,7 @@ sub getCachedInfoFrom {
, narSize => $res->{narSize}
, refs => [ split " ", $res->{refs} ]
, deriver => $res->{deriver}
+ , signedBy => $res->{signedBy}
} if defined $res;
}
@@ -522,7 +532,8 @@ sub downloadBinary {
next;
}
my $url = "$cache->{url}/$info->{url}"; # FIXME: handle non-relative URLs
- print STDERR "\n*** Downloading ‘$url’ to ‘$storePath’...\n";
+ die if $requireSignedBinaryCaches && !defined $info->{signedBy};
+ print STDERR "\n*** Downloading ‘$url’ ", ($requireSignedBinaryCaches ? "(signed by ‘$info->{signedBy}’) " : ""), "to ‘$storePath’...\n";
checkURL $url;
if (system("$Nix::Config::curl --fail --location --insecure '$url' $decompressor | $Nix::Config::binDir/nix-store --restore $destPath") != 0) {
warn "download of `$url' failed" . ($! ? ": $!" : "") . "\n";
@@ -530,6 +541,7 @@ sub downloadBinary {
}
# Tell Nix about the expected hash so it can verify it.
+ die unless defined $info->{narHash} && $info->{narHash} ne "";
print "$info->{narHash}\n";
print STDERR "\n";
diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index 8ac95e90e5..07752f144f 100755
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -152,6 +152,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
@exprs = ("./default.nix") if scalar @exprs == 0;
+$ENV{'IN_NIX_SHELL'} = 1 if $runEnv;
+
foreach my $expr (@exprs) {
@@ -177,13 +179,13 @@ foreach my $expr (@exprs) {
# Build or fetch all dependencies of the derivation.
my @inputDrvs = grep { my $x = $_; (grep { $x =~ $_ } @envExclude) == 0 } @{$drv->{inputDrvs}};
- system("$Nix::Config::binDir/nix-store -r @buildArgs @inputDrvs @{$drv->{inputSrcs}} > /dev/null") == 0
+ system("$Nix::Config::binDir/nix-store", "-r", "--no-output", "--no-gc-warning", @buildArgs, @inputDrvs, @{$drv->{inputSrcs}}) == 0
or die "$0: failed to build all dependencies\n";
# Set the environment.
if ($pure) {
foreach my $name (keys %ENV) {
- next if $name eq "HOME" || $name eq "USER" || $name eq "LOGNAME" || $name eq "DISPLAY" || $name eq "PATH";
+ next if $name eq "HOME" || $name eq "USER" || $name eq "LOGNAME" || $name eq "DISPLAY" || $name eq "PATH" || $name eq "TERM" || $name eq "IN_NIX_SHELL";
delete $ENV{$name};
}
# NixOS hack: prevent /etc/bashrc from sourcing /etc/profile.
@@ -193,8 +195,6 @@ foreach my $expr (@exprs) {
$ENV{'NIX_STORE'} = $Nix::Config::storeDir;
$ENV{$_} = $drv->{env}->{$_} foreach keys %{$drv->{env}};
- $ENV{'IN_NIX_SHELL'} = 1;
-
# Run a shell using the derivation's environment. For
# convenience, source $stdenv/setup to setup additional
# environment variables and shell functions. Also don't lose
@@ -211,6 +211,7 @@ foreach my $expr (@exprs) {
'set +e; ' .
'[ -n "$PS1" ] && PS1="\n\[\033[1;32m\][nix-shell:\w]$\[\033[0m\] "; ' .
'unset NIX_ENFORCE_PURITY; ' .
+ 'unset NIX_INDENT_MAKE; ' .
'shopt -u nullglob; ' .
$envCommand);
$ENV{BASH_ENV} = $rcfile;
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index 16eb754c5d..06e7bdb7b8 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -8,10 +8,15 @@ if test -n "$HOME"; then
@coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
fi
+ export PATH=$NIX_LINK/bin:$PATH
+
# Subscribe the root user to the Nixpkgs channel by default.
if [ ! -e $HOME/.nix-channels ]; then
echo "http://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
fi
- export PATH=$NIX_LINK/bin:$PATH
+ # Append ~/.nix-defexpr/channels/nixpkgs to $NIX_PATH so that
+ # paths work when the user has fetched the Nixpkgs
+ # channel.
+ export NIX_PATH=${NIX_PATH:+$NIX_PATH:}nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs
fi
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index 2c392c4155..bdd128a6f5 100755
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -10,6 +10,7 @@ use Nix::Config;
use Nix::Store;
use Nix::Manifest;
use Nix::Utils;
+use Nix::Crypto;
my $tmpDir = tempdir("nix-push.XXXXXX", CLEANUP => 1, TMPDIR => 1)
or die "cannot create a temporary directory";
@@ -25,6 +26,8 @@ my $writeManifest = 0;
my $manifestPath;
my $archivesURL;
my $link = 0;
+my $privateKeyFile;
+my $keyName;
my @roots;
for (my $n = 0; $n < scalar @ARGV; $n++) {
@@ -57,6 +60,14 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
$archivesURL = $ARGV[$n];
} elsif ($arg eq "--link") {
$link = 1;
+ } elsif ($arg eq "--key") {
+ $n++;
+ die "$0: `$arg' requires an argument\n" unless $n < scalar @ARGV;
+ $privateKeyFile = $ARGV[$n];
+ } elsif ($arg eq "--key-name") {
+ $n++;
+ die "$0: `$arg' requires an argument\n" unless $n < scalar @ARGV;
+ $keyName = $ARGV[$n];
} elsif (substr($arg, 0, 1) eq "-") {
die "$0: unknown flag `$arg'\n";
} else {
@@ -99,7 +110,7 @@ foreach my $storePath (@storePaths) {
my $pathHash = substr(basename($storePath), 0, 32);
my $narInfoFile = "$destDir/$pathHash.narinfo";
if (-e $narInfoFile) {
- my $narInfo = parseNARInfo($storePath, readFile($narInfoFile));
+ my $narInfo = parseNARInfo($storePath, readFile($narInfoFile), 0, $narInfoFile) or die "cannot read `$narInfoFile'\n";
my $narFile = "$destDir/$narInfo->{url}";
if (-e $narFile) {
print STDERR "skipping existing $storePath\n";
@@ -245,6 +256,11 @@ for (my $n = 0; $n < scalar @storePaths2; $n++) {
}
}
+ if (defined $privateKeyFile && defined $keyName) {
+ my $sig = signString($privateKeyFile, $info);
+ $info .= "Signature: 1;$keyName;$sig\n";
+ }
+
my $pathHash = substr(basename($storePath), 0, 32);
$dst = "$destDir/$pathHash.narinfo";
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 12c6aa8dcd..2087c7c43f 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -137,6 +137,18 @@ static void * oomHandler(size_t requested)
}
+static Symbol getName(const AttrName & name, EvalState & state, Env & env) {
+ if (name.symbol.set()) {
+ return name.symbol;
+ } else {
+ Value nameValue;
+ name.expr->eval(state, env, nameValue);
+ state.forceStringNoCtx(nameValue);
+ return state.symbols.create(nameValue.string.s);
+ }
+}
+
+
EvalState::EvalState()
: sWith(symbols.create(""))
, sOutPath(symbols.create("outPath"))
@@ -264,6 +276,11 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, con
throw EvalError(format(s) % s2 % s3);
}
+LocalNoInlineNoReturn(void throwEvalError(const char * s, const Symbol & sym, const Pos & p1, const Pos & p2))
+{
+ throw EvalError(format(s) % sym % p1 % p2);
+}
+
LocalNoInlineNoReturn(void throwTypeError(const char * s))
{
throw TypeError(s);
@@ -574,12 +591,14 @@ void ExprPath::eval(EvalState & state, Env & env, Value & v)
void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
{
state.mkAttrs(v, attrs.size());
+ Env *dynamicEnv = &env;
if (recursive) {
/* Create a new environment that contains the attributes in
this `rec'. */
Env & env2(state.allocEnv(attrs.size()));
env2.up = &env;
+ dynamicEnv = &env2;
AttrDefs::iterator overrides = attrs.find(state.sOverrides);
bool hasOverrides = overrides != attrs.end();
@@ -622,9 +641,24 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
}
}
- else {
+ else
foreach (AttrDefs::iterator, i, attrs)
v.attrs->push_back(Attr(i->first, i->second.e->maybeThunk(state, env), &i->second.pos));
+
+ /* dynamic attrs apply *after* rec and __overrides */
+ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs) {
+ Value nameVal;
+ i->nameExpr->eval(state, *dynamicEnv, nameVal);
+ state.forceStringNoCtx(nameVal);
+ Symbol nameSym = state.symbols.create(nameVal.string.s);
+ Bindings::iterator j = v.attrs->find(nameSym);
+ if (j != v.attrs->end())
+ throwEvalError("dynamic attribute `%1%' at %2% already defined at %3%", nameSym, i->pos, *j->pos);
+
+ i->valueExpr->setName(nameSym);
+ /* Keep sorted order so find can catch duplicates */
+ v.attrs->insert(lower_bound(v.attrs->begin(), v.attrs->end(), Attr(nameSym, 0)),
+ Attr(nameSym, i->valueExpr->maybeThunk(state, *dynamicEnv), &i->pos));
}
}
@@ -678,17 +712,18 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
foreach (AttrPath::const_iterator, i, attrPath) {
nrLookups++;
Bindings::iterator j;
+ Symbol name = getName(*i, state, env);
if (def) {
state.forceValue(*vAttrs);
if (vAttrs->type != tAttrs ||
- (j = vAttrs->attrs->find(*i)) == vAttrs->attrs->end())
+ (j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
{
def->eval(state, env, v);
return;
}
} else {
state.forceAttrs(*vAttrs);
- if ((j = vAttrs->attrs->find(*i)) == vAttrs->attrs->end())
+ if ((j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
throwEvalError("attribute `%1%' missing", showAttrPath(attrPath));
}
vAttrs = j->value;
@@ -719,8 +754,9 @@ void ExprOpHasAttr::eval(EvalState & state, Env & env, Value & v)
foreach (AttrPath::const_iterator, i, attrPath) {
state.forceValue(*vAttrs);
Bindings::iterator j;
+ Symbol name = getName(*i, state, env);
if (vAttrs->type != tAttrs ||
- (j = vAttrs->attrs->find(*i)) == vAttrs->attrs->end())
+ (j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
{
mkBool(v, false);
return;
@@ -925,6 +961,17 @@ void ExprOpNot::eval(EvalState & state, Env & env, Value & v)
}
+void ExprBuiltin::eval(EvalState & state, Env & env, Value & v)
+{
+ // Not a hot path at all, but would be nice to access state.baseEnv directly
+ Env *baseEnv = &env;
+ while (baseEnv->up) baseEnv = baseEnv->up;
+ Bindings::iterator binding = baseEnv->values[0]->attrs->find(name);
+ assert(binding != baseEnv->values[0]->attrs->end());
+ v = *binding->value;
+}
+
+
void ExprOpEq::eval(EvalState & state, Env & env, Value & v)
{
Value v1; e1->eval(state, env, v1);
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index 5d0360401d..911850cc5b 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -117,6 +117,8 @@ or { return OR_KW; }
return INT;
}
+\$\{ { return DOLLAR_CURLY; }
+
\" { BEGIN(STRING); return '"'; }
([^\$\"\\]|\$[^\{\"]|\\.)+ {
/* !!! Not quite right: we want a follow restriction on
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index f4b4295e29..9f0bc2630d 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -61,6 +61,8 @@ void ExprAttrs::show(std::ostream & str)
str << "inherit " << i->first << " " << "; ";
else
str << i->first << " = " << *i->second.e << "; ";
+ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs)
+ str << "\"${" << *i->nameExpr << "}\" = " << *i->valueExpr << "; ";
str << "}";
}
@@ -121,6 +123,11 @@ void ExprOpNot::show(std::ostream & str)
str << "! " << *e;
}
+void ExprBuiltin::show(std::ostream & str)
+{
+ str << "builtins." << name;
+}
+
void ExprConcatStrings::show(std::ostream & str)
{
bool first = true;
@@ -148,12 +155,19 @@ std::ostream & operator << (std::ostream & str, const Pos & pos)
string showAttrPath(const AttrPath & attrPath)
{
- string s;
+ std::ostringstream out;
+ bool first = true;
foreach (AttrPath::const_iterator, i, attrPath) {
- if (!s.empty()) s += '.';
- s += *i;
+ if (!first)
+ out << '.';
+ else
+ first = false;
+ if (i->symbol.set())
+ out << i->symbol;
+ else
+ out << "\"${" << *i->expr << "}\"";
}
- return s;
+ return out.str();
}
@@ -213,17 +227,25 @@ void ExprSelect::bindVars(const StaticEnv & env)
{
e->bindVars(env);
if (def) def->bindVars(env);
+ foreach (AttrPath::iterator, i, attrPath)
+ if (!i->symbol.set())
+ i->expr->bindVars(env);
}
void ExprOpHasAttr::bindVars(const StaticEnv & env)
{
e->bindVars(env);
+ foreach (AttrPath::iterator, i, attrPath)
+ if (!i->symbol.set())
+ i->expr->bindVars(env);
}
void ExprAttrs::bindVars(const StaticEnv & env)
{
+ const StaticEnv *dynamicEnv = &env;
if (recursive) {
StaticEnv newEnv(false, &env);
+ dynamicEnv = &newEnv;
unsigned int displ = 0;
foreach (AttrDefs::iterator, i, attrs)
@@ -236,6 +258,11 @@ void ExprAttrs::bindVars(const StaticEnv & env)
else
foreach (AttrDefs::iterator, i, attrs)
i->second.e->bindVars(env);
+
+ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs) {
+ i->nameExpr->bindVars(*dynamicEnv);
+ i->valueExpr->bindVars(*dynamicEnv);
+ }
}
void ExprList::bindVars(const StaticEnv & env)
@@ -314,6 +341,10 @@ void ExprOpNot::bindVars(const StaticEnv & env)
e->bindVars(env);
}
+void ExprBuiltin::bindVars(const StaticEnv & env)
+{
+}
+
void ExprConcatStrings::bindVars(const StaticEnv & env)
{
foreach (vector::iterator, i, *es)
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 61eb81fab1..bc6993477c 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -50,10 +50,19 @@ struct Env;
struct Value;
struct EvalState;
struct StaticEnv;
+struct Expr;
/* An attribute path is a sequence of attribute names. */
-typedef vector AttrPath;
+struct AttrName
+{
+ Symbol symbol;
+ Expr *expr;
+ AttrName(const Symbol & s) : symbol(s) {};
+ AttrName(Expr *e) : expr(e) {};
+};
+
+typedef std::vector AttrPath;
string showAttrPath(const AttrPath & attrPath);
@@ -138,7 +147,7 @@ struct ExprSelect : Expr
Expr * e, * def;
AttrPath attrPath;
ExprSelect(Expr * e, const AttrPath & attrPath, Expr * def) : e(e), def(def), attrPath(attrPath) { };
- ExprSelect(Expr * e, const Symbol & name) : e(e), def(0) { attrPath.push_back(name); };
+ ExprSelect(Expr * e, const Symbol & name) : e(e), def(0) { attrPath.push_back(AttrName(name)); };
COMMON_METHODS
};
@@ -163,6 +172,14 @@ struct ExprAttrs : Expr
};
typedef std::map AttrDefs;
AttrDefs attrs;
+ struct DynamicAttrDef {
+ Expr * nameExpr;
+ Expr * valueExpr;
+ Pos pos;
+ DynamicAttrDef(Expr * nameExpr, Expr * valueExpr, const Pos & pos) : nameExpr(nameExpr), valueExpr(valueExpr), pos(pos) { };
+ };
+ typedef std::vector DynamicAttrDefs;
+ DynamicAttrDefs dynamicAttrs;
ExprAttrs() : recursive(false) { };
COMMON_METHODS
};
@@ -248,6 +265,13 @@ struct ExprOpNot : Expr
COMMON_METHODS
};
+struct ExprBuiltin : Expr
+{
+ Symbol name;
+ ExprBuiltin(const Symbol & name) : name(name) { };
+ COMMON_METHODS
+};
+
#define MakeBinOp(name, s) \
struct Expr##name : Expr \
{ \
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 7699cf502b..55a42fcaba 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -74,37 +74,49 @@ static void dupAttr(const AttrPath & attrPath, const Pos & pos, const Pos & prev
static void dupAttr(Symbol attr, const Pos & pos, const Pos & prevPos)
{
- AttrPath attrPath; attrPath.push_back(attr);
throw ParseError(format("attribute `%1%' at %2% already defined at %3%")
- % showAttrPath(attrPath) % pos % prevPos);
+ % attr % pos % prevPos);
}
static void addAttr(ExprAttrs * attrs, AttrPath & attrPath,
Expr * e, const Pos & pos)
{
- unsigned int n = 0;
- foreach (AttrPath::const_iterator, i, attrPath) {
- n++;
- ExprAttrs::AttrDefs::iterator j = attrs->attrs.find(*i);
- if (j != attrs->attrs.end()) {
- if (!j->second.inherited) {
- ExprAttrs * attrs2 = dynamic_cast(j->second.e);
- if (!attrs2 || n == attrPath.size()) dupAttr(attrPath, pos, j->second.pos);
- attrs = attrs2;
- } else
- dupAttr(attrPath, pos, j->second.pos);
- } else {
- if (n == attrPath.size())
- attrs->attrs[*i] = ExprAttrs::AttrDef(e, pos);
- else {
+ AttrPath::iterator i;
+ // All attrpaths have at least one attr
+ assert(!attrPath.empty());
+ for (i = attrPath.begin(); i + 1 < attrPath.end(); i++) {
+ if (i->symbol.set()) {
+ ExprAttrs::AttrDefs::iterator j = attrs->attrs.find(i->symbol);
+ if (j != attrs->attrs.end()) {
+ if (!j->second.inherited) {
+ ExprAttrs * attrs2 = dynamic_cast(j->second.e);
+ if (!attrs2) dupAttr(attrPath, pos, j->second.pos);
+ attrs = attrs2;
+ } else
+ dupAttr(attrPath, pos, j->second.pos);
+ } else {
ExprAttrs * nested = new ExprAttrs;
- attrs->attrs[*i] = ExprAttrs::AttrDef(nested, pos);
+ attrs->attrs[i->symbol] = ExprAttrs::AttrDef(nested, pos);
attrs = nested;
}
+ } else {
+ ExprAttrs *nested = new ExprAttrs;
+ attrs->dynamicAttrs.push_back(ExprAttrs::DynamicAttrDef(i->expr, nested, pos));
+ attrs = nested;
}
}
- e->setName(attrPath.back());
+ if (i->symbol.set()) {
+ ExprAttrs::AttrDefs::iterator j = attrs->attrs.find(i->symbol);
+ if (j != attrs->attrs.end()) {
+ dupAttr(attrPath, pos, j->second.pos);
+ } else {
+ attrs->attrs[i->symbol] = ExprAttrs::AttrDef(e, pos);
+ e->setName(i->symbol);
+ }
+ } else {
+ attrs->dynamicAttrs.push_back(ExprAttrs::DynamicAttrDef(i->expr, e, pos));
+ }
}
@@ -243,7 +255,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err
char * id; // !!! -> Symbol
char * path;
char * uri;
- std::vector * attrNames;
+ std::vector * attrNames;
std::vector * string_parts;
}
@@ -254,7 +266,8 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err
%type formals
%type formal
%type attrs attrpath
-%type string_parts ind_string_parts
+%type string_parts_interpolated ind_string_parts
+%type string_parts string_attr
%type attr
%token ID ATTRPATH
%token STR IND_STR
@@ -300,7 +313,11 @@ expr_function
| WITH expr ';' expr_function
{ $$ = new ExprWith(CUR_POS, $2, $4); }
| LET binds IN expr_function
- { $$ = new ExprLet($2, $4); }
+ { if (!$2->dynamicAttrs.empty())
+ throw ParseError(format("dynamic attributes not allowed in let at %1%")
+ % CUR_POS);
+ $$ = new ExprLet($2, $4);
+ }
| expr_if
;
@@ -311,13 +328,13 @@ expr_if
expr_op
: '!' expr_op %prec NOT { $$ = new ExprOpNot($2); }
-| '-' expr_op %prec NEGATE { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__sub")), new ExprInt(0)), $2); }
+| '-' expr_op %prec NEGATE { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("sub")), new ExprInt(0)), $2); }
| expr_op EQ expr_op { $$ = new ExprOpEq($1, $3); }
| expr_op NEQ expr_op { $$ = new ExprOpNEq($1, $3); }
- | expr_op '<' expr_op { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__lessThan")), $1), $3); }
- | expr_op LEQ expr_op { $$ = new ExprOpNot(new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__lessThan")), $3), $1)); }
- | expr_op '>' expr_op { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__lessThan")), $3), $1); }
- | expr_op GEQ expr_op { $$ = new ExprOpNot(new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__lessThan")), $1), $3)); }
+ | expr_op '<' expr_op { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("lessThan")), $1), $3); }
+ | expr_op LEQ expr_op { $$ = new ExprOpNot(new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("lessThan")), $3), $1)); }
+ | expr_op '>' expr_op { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("lessThan")), $3), $1); }
+ | expr_op GEQ expr_op { $$ = new ExprOpNot(new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("lessThan")), $1), $3)); }
| expr_op AND expr_op { $$ = new ExprOpAnd($1, $3); }
| expr_op OR expr_op { $$ = new ExprOpOr($1, $3); }
| expr_op IMPL expr_op { $$ = new ExprOpImpl($1, $3); }
@@ -329,9 +346,9 @@ expr_op
l->push_back($3);
$$ = new ExprConcatStrings(false, l);
}
- | expr_op '-' expr_op { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__sub")), $1), $3); }
- | expr_op '*' expr_op { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__mul")), $1), $3); }
- | expr_op '/' expr_op { $$ = new ExprApp(new ExprApp(new ExprVar(noPos, data->symbols.create("__div")), $1), $3); }
+ | expr_op '-' expr_op { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("sub")), $1), $3); }
+ | expr_op '*' expr_op { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("mul")), $1), $3); }
+ | expr_op '/' expr_op { $$ = new ExprApp(new ExprApp(new ExprBuiltin(data->symbols.create("div")), $1), $3); }
| expr_op CONCAT expr_op { $$ = new ExprOpConcatLists($1, $3); }
| expr_app
;
@@ -362,12 +379,7 @@ expr_simple
$$ = new ExprVar(CUR_POS, data->symbols.create($1));
}
| INT { $$ = new ExprInt($1); }
- | '"' string_parts '"' {
- /* For efficiency, and to simplify parse trees a bit. */
- if ($2->empty()) $$ = new ExprString(data->symbols.create(""));
- else if ($2->size() == 1 && dynamic_cast($2->front())) $$ = $2->front();
- else $$ = new ExprConcatStrings(true, $2);
- }
+ | '"' string_parts '"' { $$ = $2; }
| IND_STRING_OPEN ind_string_parts IND_STRING_CLOSE {
$$ = stripIndentation(data->symbols, *$2);
}
@@ -381,7 +393,7 @@ expr_simple
‘throw’. */
$$ = path2 == ""
? (Expr * ) new ExprApp(
- new ExprVar(noPos, data->symbols.create("throw")),
+ new ExprBuiltin(data->symbols.create("throw")),
new ExprString(data->symbols.create(
(format("file `%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)") % path).str())))
: (Expr * ) new ExprPath(path2);
@@ -400,9 +412,27 @@ expr_simple
;
string_parts
- : string_parts STR { $$ = $1; $1->push_back($2); }
- | string_parts DOLLAR_CURLY expr '}' { backToString(scanner); $$ = $1; $1->push_back($3); }
- | { $$ = new vector; }
+ : STR
+ | string_parts_interpolated { $$ = new ExprConcatStrings(true, $1); }
+ | { $$ = new ExprString(data->symbols.create("")) }
+ ;
+
+string_parts_interpolated
+ : string_parts_interpolated STR { $$ = $1; $1->push_back($2); }
+ | string_parts_interpolated DOLLAR_CURLY expr '}' { backToString(scanner); $$ = $1; $1->push_back($3); }
+ | STR DOLLAR_CURLY expr '}'
+ {
+ backToString(scanner);
+ $$ = new vector;
+ $$->push_back($1);
+ $$->push_back($3);
+ }
+ | DOLLAR_CURLY expr '}'
+ {
+ backToString(scanner);
+ $$ = new vector;
+ $$->push_back($2);
+ }
;
ind_string_parts
@@ -416,39 +446,70 @@ binds
| binds INHERIT attrs ';'
{ $$ = $1;
foreach (AttrPath::iterator, i, *$3) {
- if ($$->attrs.find(*i) != $$->attrs.end())
- dupAttr(*i, makeCurPos(@3, data), $$->attrs[*i].pos);
+ if ($$->attrs.find(i->symbol) != $$->attrs.end())
+ dupAttr(i->symbol, makeCurPos(@3, data), $$->attrs[i->symbol].pos);
Pos pos = makeCurPos(@3, data);
- $$->attrs[*i] = ExprAttrs::AttrDef(new ExprVar(CUR_POS, *i), pos, true);
+ $$->attrs[i->symbol] = ExprAttrs::AttrDef(new ExprVar(CUR_POS, i->symbol), pos, true);
}
}
| binds INHERIT '(' expr ')' attrs ';'
{ $$ = $1;
/* !!! Should ensure sharing of the expression in $4. */
- foreach (vector::iterator, i, *$6) {
- if ($$->attrs.find(*i) != $$->attrs.end())
- dupAttr(*i, makeCurPos(@6, data), $$->attrs[*i].pos);
- $$->attrs[*i] = ExprAttrs::AttrDef(new ExprSelect($4, *i), makeCurPos(@6, data));
+ foreach (AttrPath::iterator, i, *$6) {
+ if ($$->attrs.find(i->symbol) != $$->attrs.end())
+ dupAttr(i->symbol, makeCurPos(@6, data), $$->attrs[i->symbol].pos);
+ $$->attrs[i->symbol] = ExprAttrs::AttrDef(new ExprSelect($4, i->symbol), makeCurPos(@6, data));
}
}
| { $$ = new ExprAttrs; }
;
attrs
- : attrs attr { $$ = $1; $1->push_back(data->symbols.create($2)); /* !!! dangerous */ }
- | { $$ = new vector; }
+ : attrs attr { $$ = $1; $1->push_back(AttrName(data->symbols.create($2))); }
+ | attrs string_attr
+ { $$ = $1;
+ ExprString *str = dynamic_cast($2);
+ if (str) {
+ $$->push_back(AttrName(str->s));
+ delete str;
+ } else
+ throw ParseError(format("dynamic attributes not allowed in inherit at %1%")
+ % makeCurPos(@2, data));
+ }
+ | { $$ = new AttrPath; }
;
attrpath
- : attrpath '.' attr { $$ = $1; $1->push_back(data->symbols.create($3)); }
- | attr { $$ = new vector; $$->push_back(data->symbols.create($1)); }
+ : attrpath '.' attr { $$ = $1; $1->push_back(AttrName(data->symbols.create($3))); }
+ | attrpath '.' string_attr
+ { $$ = $1;
+ ExprString *str = dynamic_cast($3);
+ if (str) {
+ $$->push_back(AttrName(str->s));
+ delete str;
+ } else
+ $$->push_back(AttrName($3));
+ }
+ | attr { $$ = new vector; $$->push_back(AttrName(data->symbols.create($1))); }
+ | string_attr
+ { $$ = new vector;
+ ExprString *str = dynamic_cast($1);
+ if (str) {
+ $$->push_back(AttrName(str->s));
+ delete str;
+ } else
+ $$->push_back(AttrName($1));
+ }
;
attr
: ID { $$ = $1; }
| OR_KW { $$ = "or"; }
- | '"' STR '"'
- { $$ = strdup(((string) ((ExprString *) $2)->s).c_str()); delete $2; }
+ ;
+
+string_attr
+ : '"' string_parts '"' { $$ = $2; }
+ | DOLLAR_CURLY expr '}' { $$ = new ExprConcatStrings(true, new vector(1, $2)); }
;
expr_list
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index bb6739d205..ca316f08af 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -582,8 +582,8 @@ static void prim_storePath(EvalState & state, Value * * args, Value & v)
if (!isInStore(path))
throw EvalError(format("path `%1%' is not in the Nix store") % path);
Path path2 = toStorePath(path);
- if (!store->isValidPath(path2))
- throw EvalError(format("store path `%1%' is not valid") % path2);
+ if (!settings.readOnlyMode)
+ store->ensurePath(path2);
context.insert(path2);
mkString(v, path, context);
}
@@ -1242,7 +1242,7 @@ void EvalState::createBaseEnv()
language feature gets added. It's not necessary to increase it
when primops get added, because you can just use `builtins ?
primOp' to check. */
- mkInt(v, 1);
+ mkInt(v, 2);
addConstant("__langVersion", v);
// Miscellaneous
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 8df2a7f52a..fb70cb0767 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -31,8 +31,11 @@ static void sigintHandler(int signo)
}
+static bool gcWarning = true;
+
void printGCWarning()
{
+ if (!gcWarning) return;
static bool haveWarned = false;
warnOnce(haveWarned,
"you did not specify `--add-root'; "
@@ -208,6 +211,8 @@ static void initAndRun(int argc, char * * argv)
settings.useBuildHook = false;
else if (arg == "--show-trace")
settings.showTrace = true;
+ else if (arg == "--no-gc-warning")
+ gcWarning = false;
else if (arg == "--option") {
++i; if (i == args.end()) throw UsageError("`--option' requires two arguments");
string name = *i;
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 63e34d2560..4329d9a22b 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1011,7 +1011,7 @@ void DerivationGoal::outputsSubstituted()
trace("all outputs substituted (maybe)");
if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback)
- throw Error(format("some substitutes for the outputs of derivation `%1%' failed; try `--fallback'") % drvPath);
+ throw Error(format("some substitutes for the outputs of derivation `%1%' failed (usually happens due to networking issues); try `--fallback' to build derivation from source ") % drvPath);
/* If the substitutes form an incomplete closure, then we should
build the dependencies of this derivation, but after that, we
@@ -1623,10 +1623,13 @@ void DerivationGoal::startBuilder()
startNest(nest, lvlInfo, format(repair ? "repairing path(s) %1%" : "building path(s) %1%") % showPaths(missingPaths));
/* Right platform? */
- if (!canBuildLocally(drv.platform))
+ if (!canBuildLocally(drv.platform)) {
+ if (settings.printBuildTrace)
+ printMsg(lvlError, format("@ unsupported-platform %1% %2%") % drvPath % drv.platform);
throw Error(
format("a `%1%' is required to build `%3%', but I am a `%2%'")
% drv.platform % settings.thisSystem % drvPath);
+ }
/* Construct the environment passed to the builder. */
@@ -2746,6 +2749,7 @@ void SubstitutionGoal::finished()
logPipe.readSide.close();
/* Get the hash info from stdout. */
+ string dummy = readLine(outPipe.readSide);
string expectedHashStr = statusOk(status) ? readLine(outPipe.readSide) : "";
outPipe.readSide.close();
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index ce9b10f053..d212259f3b 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -734,6 +734,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
/* Allow other processes to add to the store from here on. */
fdGCLock.close();
+ fds.clear();
/* Delete the trash directory. */
printMsg(lvlInfo, format("deleting `%1%'") % state.trashDir);
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index cf74747dac..e2781e540b 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -233,6 +233,15 @@ static bool isPrebuilt(EvalState & state, DrvInfo & elem)
}
+static void checkSelectorUse(DrvNames & selectors)
+{
+ /* Check that all selectors have been used. */
+ foreach (DrvNames::iterator, i, selectors)
+ if (i->hits == 0 && i->fullName != "*")
+ throw Error(format("selector `%1%' matches no derivations") % i->fullName);
+}
+
+
static DrvInfos filterBySelector(EvalState & state, const DrvInfos & allElems,
const Strings & args, bool newestOnly)
{
@@ -315,11 +324,7 @@ static DrvInfos filterBySelector(EvalState & state, const DrvInfos & allElems,
}
}
- /* Check that all selectors have been used. */
- foreach (DrvNames::iterator, i, selectors)
- if (i->hits == 0 && i->fullName != "*")
- throw Error(format("selector `%1%' matches no derivations")
- % i->fullName);
+ checkSelectorUse(selectors);
return elems;
}
@@ -673,11 +678,14 @@ static void opSetFlag(Globals & globals,
foreach (DrvNames::iterator, j, selectors)
if (j->matches(drvName)) {
printMsg(lvlInfo, format("setting flag on `%1%'") % i->name);
+ j->hits++;
setMetaFlag(globals.state, *i, flagName, flagValue);
break;
}
}
+ checkSelectorUse(selectors);
+
/* Write the new user environment. */
if (createUserEnv(globals.state, installedElems,
globals.profile, settings.envKeepDerivations, lockToken)) break;
@@ -887,7 +895,6 @@ static void queryJSON(Globals & globals, vector & elems)
static void opQuery(Globals & globals,
Strings args, Strings opFlags, Strings opArgs)
{
- typedef vector< map > ResultSet;
Strings remaining;
string attrPath;
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 5bd8558361..69a98fe472 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -35,6 +35,7 @@ void printHelp()
static Path gcRoot;
static int rootNr = 0;
static bool indirectRoot = false;
+static bool noOutput = false;
LocalStore & ensureLocalStore()
@@ -139,8 +140,9 @@ static void opRealise(Strings opFlags, Strings opArgs)
if (!ignoreUnknown)
foreach (Paths::iterator, i, paths) {
PathSet paths = realisePath(*i, false);
- foreach (PathSet::iterator, j, paths)
- cout << format("%1%\n") % *j;
+ if (!noOutput)
+ foreach (PathSet::iterator, j, paths)
+ cout << format("%1%\n") % *j;
}
}
@@ -900,6 +902,8 @@ void run(Strings args)
}
else if (arg == "--indirect")
indirectRoot = true;
+ else if (arg == "--no-output")
+ noOutput = true;
else if (arg[0] == '-') {
opFlags.push_back(arg);
if (arg == "--max-freed" || arg == "--max-links" || arg == "--max-atime") { /* !!! hack */
diff --git a/substitute.mk b/substitute.mk
index 967ad257b6..d90bded78a 100644
--- a/substitute.mk
+++ b/substitute.mk
@@ -35,6 +35,7 @@
-e "s^@version\@^$(VERSION)^g" \
-e "s^@perlbindings\@^$(perlbindings)^g" \
-e "s^@testPath\@^$(coreutils):$$(dirname $$(type -p expr))^g" \
+ -e "s^@openssl\@^$(openssl_prog)^g" \
< $< > $@ || rm $@
if test -x $<; then chmod +x $@; fi
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index eb2ebbff82..9bd4fecb6d 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -40,6 +40,31 @@ nix-store --check-validity $outPath
nix-store -qR $outPath | grep input-2
+# Test whether Nix notices if the NAR doesn't match the hash in the NAR info.
+clearStore
+
+nar=$(ls $cacheDir/*.nar.xz | head -n1)
+mv $nar $nar.good
+mkdir -p $TEST_ROOT/empty
+nix-store --dump $TEST_ROOT/empty | xz > $nar
+
+nix-build --option binary-caches "file://$cacheDir" dependencies.nix -o $TEST_ROOT/result 2>&1 | tee $TEST_ROOT/log
+grep -q "hash mismatch in downloaded path" $TEST_ROOT/log
+
+mv $nar.good $nar
+
+
+# Test whether this unsigned cache is rejected if the user requires signed caches.
+clearStore
+
+rm -f $NIX_STATE_DIR/binary-cache*
+
+if nix-store --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' -r $outPath; then
+ echo "unsigned binary cache incorrectly accepted"
+ exit 1
+fi
+
+
# Test whether fallback works if we have cached info but the
# corresponding NAR has disappeared.
clearStore
diff --git a/tests/lang/eval-okay-dynamic-attrs-2.exp b/tests/lang/eval-okay-dynamic-attrs-2.exp
new file mode 100644
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs-2.exp
@@ -0,0 +1 @@
+true
diff --git a/tests/lang/eval-okay-dynamic-attrs-2.nix b/tests/lang/eval-okay-dynamic-attrs-2.nix
new file mode 100644
index 0000000000..6d57bf8549
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs-2.nix
@@ -0,0 +1 @@
+{ a."${"b"}" = true; a."${"c"}" = false; }.a.b
diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.exp b/tests/lang/eval-okay-dynamic-attrs-bare.exp
new file mode 100644
index 0000000000..df8750afc0
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs-bare.exp
@@ -0,0 +1 @@
+{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; }
diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.nix b/tests/lang/eval-okay-dynamic-attrs-bare.nix
new file mode 100644
index 0000000000..0dbe15e638
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs-bare.nix
@@ -0,0 +1,17 @@
+let
+ aString = "a";
+
+ bString = "b";
+in {
+ hasAttrs = { a.b = null; } ? ${aString}.b;
+
+ selectAttrs = { a.b = true; }.a.${bString};
+
+ selectOrAttrs = { }.${aString} or true;
+
+ binds = { ${aString}."${bString}c" = true; }.a.bc;
+
+ recBinds = rec { ${bString} = a; a = true; }.b;
+
+ multiAttrs = { ${aString} = true; ${bString} = false; }.a;
+}
diff --git a/tests/lang/eval-okay-dynamic-attrs.exp b/tests/lang/eval-okay-dynamic-attrs.exp
new file mode 100644
index 0000000000..df8750afc0
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs.exp
@@ -0,0 +1 @@
+{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; }
diff --git a/tests/lang/eval-okay-dynamic-attrs.nix b/tests/lang/eval-okay-dynamic-attrs.nix
new file mode 100644
index 0000000000..ee02ac7e65
--- /dev/null
+++ b/tests/lang/eval-okay-dynamic-attrs.nix
@@ -0,0 +1,17 @@
+let
+ aString = "a";
+
+ bString = "b";
+in {
+ hasAttrs = { a.b = null; } ? "${aString}".b;
+
+ selectAttrs = { a.b = true; }.a."${bString}";
+
+ selectOrAttrs = { }."${aString}" or true;
+
+ binds = { "${aString}"."${bString}c" = true; }.a.bc;
+
+ recBinds = rec { "${bString}" = a; a = true; }.b;
+
+ multiAttrs = { "${aString}" = true; "${bString}" = false; }.a;
+}
diff --git a/tests/lang/eval-okay-redefine-builtin.exp b/tests/lang/eval-okay-redefine-builtin.exp
new file mode 100644
index 0000000000..c508d5366f
--- /dev/null
+++ b/tests/lang/eval-okay-redefine-builtin.exp
@@ -0,0 +1 @@
+false
diff --git a/tests/lang/eval-okay-redefine-builtin.nix b/tests/lang/eval-okay-redefine-builtin.nix
new file mode 100644
index 0000000000..df9fc3f37d
--- /dev/null
+++ b/tests/lang/eval-okay-redefine-builtin.nix
@@ -0,0 +1,3 @@
+let
+ throw = abort "Error!";
+in (builtins.tryEval ).success
diff --git a/tests/lang/eval-okay-tail-call-1.exp b/tests/lang/eval-okay-tail-call-1.exp-disabled
similarity index 100%
rename from tests/lang/eval-okay-tail-call-1.exp
rename to tests/lang/eval-okay-tail-call-1.exp-disabled