diff options
author | Artturi <Artturin@artturin.com> | 2022-02-03 16:04:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-03 16:04:57 +0200 |
commit | 0f491bd7a3548dacb485885b6766e143dbb7a2cc (patch) | |
tree | c99d426dc831961c10df144c1f15941237d54fa0 | |
parent | 48819015f91a322243a9cbb008a4a638ad26f901 (diff) | |
parent | ccc26c651f3615f73a4ddee0dccbdadcc1d0c89d (diff) | |
download | nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar.gz nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar.bz2 nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar.lz nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar.xz nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.tar.zst nixpkgs-0f491bd7a3548dacb485885b6766e143dbb7a2cc.zip |
Merge pull request #157264 from FliegendeWurst/disable-broken-parallel
-rw-r--r-- | pkgs/applications/editors/deadpixi-sam/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/alliance/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cdesktopenv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ats2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/fpc/lazarus.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/mlton/from-git-source.nix | 3 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/stdcompat/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlidl/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlp4/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ipvsadm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/netboot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/patchutils/generic.nix | 3 |
14 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index e17fb402ed3..3f84666fe02 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libX11 libXi libXt libXft ]; + # build fails when run in parallel + enableParallelBuilding = false; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 909a3ec767c..cf135b9469a 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; + # Disable parallel build, errors: + # ./pat_decl_y.y:736:5: error: expected '=', ... + enableParallelBuilding = false; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 7715f4f232a..71b661f1265 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -46,6 +46,8 @@ in stdenv.mkDerivation rec { bison ncompress gawk autoPatchelfHook makeWrapper fakeroot rpcsvc-proto ]; + # build fails otherwise + enableParallelBuilding = false; makeFlags = [ "World" diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index c75600b5341..e8c3af5d7e1 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + # Disable parallel build, errors: + # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. + enableParallelBuilding = false; + setupHook = with lib; let hookFiles = diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 5cd0609960d..5ddaa7c429f 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ libqt5pas qtbase ]; + # Disable parallel build, errors: + # Fatal: (1018) Compilation aborted + enableParallelBuilding = false; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional withQt wrapQtAppsHook; diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index ec0b96bbf23..b91e6c7480d 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation { buildInputs = [mltonBootstrap gmp]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" sed -i "s|/tmp|$TMPDIR|" bin/regression diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index df5c1a58b17..2e626695714 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ]; + # build fails otherwise + enableParallelBuilding = false; configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 36a1c7f755e..1c3da92273c 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml ]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index acf1730af1b..97a769628fe 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { buildInputs = [ which ocaml ocamlbuild ]; + # build fails otherwise + enableParallelBuilding = false; + dontAddPrefix = true; preConfigure = '' diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index fbd4d8efdac..c9881674691 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; + # Disable parallel build, errors: + # *** No rule to make target 'libipvs/libipvs.a', needed by 'ipvsadm'. Stop. + enableParallelBuilding = false; + preBuild = '' makeFlagsArray+=( INCLUDE=$(pkg-config --cflags libnl-genl-3.0) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 00dfd7c4817..1731da35876 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; + # Disable parallel build, errors: + # *** No rule to make target '../util/libfaxutil.so.7.0.4', needed by 'faxmsg'. Stop. + enableParallelBuilding = false; + postPatch = ". ${postPatch}"; dontAddPrefix = true; postInstall = ". ${postInstall}"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 28ff8ac8070..d284c94e20a 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -89,6 +89,10 @@ stdenv.mkDerivation rec { sed -i '/ENV{PATH}/d' node/lib/Munin/Node/Service.pm ''; + # Disable parallel build, errors: + # Can't locate Munin/Common/Defaults.pm in @INC ... + enableParallelBuilding = false; + # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index cfd768e40ab..995c7ff7267 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Disable parallel build, errors: + # link: `parseopt.lo' is not a valid libtool object + enableParallelBuilding = false; + meta = with lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 923dd06d182..d1cd4334e11 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ extraBuildInputs; hardeningDisable = [ "format" ]; + # tests fail when building in parallel + enableParallelBuilding = false; + postInstall = '' for bin in $out/bin/{splitdiff,rediff,editdiff,dehtmldiff}; do wrapProgram "$bin" \ |