Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7e881fbe111
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c3d4871340a0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 28, 2017

  1. dict: disable parallel building 

    (cherry picked from commit 676b2ef)
    @orivej
    orivej committed Nov 28, 2017
    Copy the full SHA
    f2eddb1 View commit details

  2. altcoins.zcash: disable parallel building 

    (cherry picked from commit 2e55aec)
    @orivej
    orivej committed Nov 28, 2017
    Copy the full SHA
    c3d4871 View commit details
Showing with 8 additions and 2 deletions.
  1. +3 −1 pkgs/applications/altcoins/zcash/default.nix
  2. +5 −1 pkgs/servers/dict/default.nix
4 changes: 3 additions & 1 deletion pkgs/applications/altcoins/zcash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
};

enableParallelBuilding = true;
# Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
# fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory"
enableParallelBuilding = false;

buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
protobuf libevent libsodium librustzcash ]
6 changes: 5 additions & 1 deletion pkgs/servers/dict/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,11 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ bison flex libtool which ];

enableParallelBuilding = true;
# Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which
# causes bison to run twice, and break the build when this happens in
# parallel. Test with "make -j clientparse.c clientparse.h". The error
# message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'".
enableParallelBuilding = false;

patchPhase = "patch -p0 < ${./buildfix.diff}";
configureFlags = [