Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2019-04-08 14:23:48 +02:00
commit 9b7eac332b
6 changed files with 15 additions and 8 deletions

View file

@ -1,5 +1,5 @@
{ nix ? builtins.fetchGit ./. { nix ? builtins.fetchGit ./.
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09"; } , nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-19.03"; }
, officialRelease ? false , officialRelease ? false
, systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
}: }:

View file

@ -1,6 +1,6 @@
{ useClang ? false }: { useClang ? false }:
with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.09"; }) {}; with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-19.03"; }) {};
with import ./release-common.nix { inherit pkgs; }; with import ./release-common.nix { inherit pkgs; };

View file

@ -1,7 +1,7 @@
%glr-parser %glr-parser
%pure-parser %pure-parser
%locations %locations
%error-verbose %define parse.error verbose
%defines %defines
/* %no-lines */ /* %no-lines */
%parse-param { void * scanner } %parse-param { void * scanner }

View file

@ -12,6 +12,7 @@
#include "json.hh" #include "json.hh"
#include "nar-info.hh" #include "nar-info.hh"
#include "parsed-derivations.hh" #include "parsed-derivations.hh"
#include "machines.hh"
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
@ -4411,6 +4412,11 @@ static void primeCache(Store & store, const PathSet & paths)
PathSet willBuild, willSubstitute, unknown; PathSet willBuild, willSubstitute, unknown;
unsigned long long downloadSize, narSize; unsigned long long downloadSize, narSize;
store.queryMissing(paths, willBuild, willSubstitute, unknown, downloadSize, narSize); store.queryMissing(paths, willBuild, willSubstitute, unknown, downloadSize, narSize);
if (!willBuild.empty() && 0 == settings.maxBuildJobs && getMachines().empty())
throw Error(
"%d derivations need to be built, but neither local builds ('--max-jobs') "
"nor remote builds ('--builders') are enabled", willBuild.size());
} }

View file

@ -89,10 +89,11 @@ void parseMachines(const std::string & s, Machines & machines)
Machines getMachines() Machines getMachines()
{ {
static auto machines = [&]() {
Machines machines; Machines machines;
parseMachines(settings.builders, machines); parseMachines(settings.builders, machines);
return machines;
}();
return machines; return machines;
} }

View file

@ -1 +1 @@
[ true false true false true false true false true true true true true true true true true true true false true false "int" "bool" "string" "null" "set" "list" "lambda" "lambda" "lambda" "lambda" ] [ true false true false true false true false true true true true true true true true true true true false true true true false "int" "bool" "string" "null" "set" "list" "lambda" "lambda" "lambda" "lambda" ]