diff options
| -rw-r--r-- | release.nix | 10 | ||||
| -rw-r--r-- | src/libstore/build.cc | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-tail-call-1.exp-disabled (renamed from tests/lang/eval-okay-tail-call-1.exp) | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/release.nix b/release.nix index 11ed7a1c30cc..b559024375cc 100644 --- a/release.nix +++ b/release.nix @@ -6,7 +6,7 @@ let pkgs = import <nixpkgs> {}; - 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 { @@ -212,15 +212,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 diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 0a8bdbaf5e9c..dcd7343394f9 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 diff --git a/tests/lang/eval-okay-tail-call-1.exp b/tests/lang/eval-okay-tail-call-1.exp-disabled index f7393e847d34..f7393e847d34 100644 --- a/tests/lang/eval-okay-tail-call-1.exp +++ b/tests/lang/eval-okay-tail-call-1.exp-disabled |