From 8f729c0070ec3f78edadeaebcbd110257fe4577e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 3 Sep 2019 22:37:20 +0200 Subject: [PATCH 001/211] gcc: switch default to gcc9 --- pkgs/top-level/all-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 764333fd122..04392923b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3125,9 +3125,7 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - fcppt = callPackage ../development/libraries/fcppt { - stdenv = gcc8Stdenv; - }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -3158,7 +3156,6 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; fltrdr = callPackage ../tools/misc/fltrdr { - stdenv = gcc8Stdenv; icu = icu63; }; @@ -7663,8 +7660,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/8; - gcc = gcc8; + gccFun = callPackage ../development/compilers/gcc/9; + gcc = gcc9; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { From e39773fe5b7c09ad7aa63824037993f2a5a24694 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 15:53:57 +0100 Subject: [PATCH 002/211] megahit: 1.1.4 -> 1.2.9 --- .../science/biology/megahit/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 56bb35b64df..86414980177 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchFromGitHub, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "megahit"; - version = "1.1.4"; + version = "1.2.9"; src = fetchFromGitHub { owner = "voutcn"; repo = "megahit"; rev = "v${version}"; - sha256 = "011k0776w76l03zmy70kfd3y9zjmdnspfbs9fcxmnl3bdwd36kcw"; + sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - installPhase = '' - for bin in megahit_sdbg_build megahit megahit_asm_core megahit_toolkit; do - install -vD $bin $out/bin/$bin - done - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; From c097caf6d76cd6df1da9944524909645e8de35e3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 16:12:41 +0100 Subject: [PATCH 003/211] audiofile: fix build with gcc9 --- pkgs/development/libraries/audiofile/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 1ed457aa5fe..2ae0782941d 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: +{ stdenv, lib, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: let @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; + # fix build with gcc9 + NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc_s"; + patches = [ ./gcc-6.patch ./CVE-2015-7747.patch From 6842238875a26710e87ebeeef2cda3b5ba8cce41 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 17:41:12 +0100 Subject: [PATCH 004/211] aws-sdk-cpp: fix build with gcc9 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 037fd198fef..8024f310951 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + # fix build with gcc9, can be removed after bumping to current version + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + preConfigure = '' rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp From 0e4464e604b6c794153bcc1d926e42eef34f3617 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:00:17 +0100 Subject: [PATCH 005/211] efivar: fix build with gcc9 --- pkgs/tools/system/efivar/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 365cfeab058..f02923de349 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; }) + (fetchurl { + name = "fix-misaligned-pointer.patch"; + url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch"; + sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27"; + }) + (fetchurl { + name = "fix-gcc9-error.patch"; + url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch"; + sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; + }) ]; nativeBuildInputs = [ pkgconfig ]; From 84d72c7e4ace9ead8a91c060bc253e497a2dda4b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:03:37 +0100 Subject: [PATCH 006/211] iasl: 20190108 -> 20191018 --- pkgs/development/compilers/iasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index fccdf7a978d..9eb3748d0d4 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iasl"; - version = "20190108"; + version = "20191018"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; + sha256 = "0pz95fb1zvsj9238bg7a4vxl1svn5mnjg10sn5qvgr008q0v9782"; }; NIX_CFLAGS_COMPILE = [ From 21c71e0ceb517d849317e1fa560601b5578a27ff Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:30:51 +0100 Subject: [PATCH 007/211] xsel: 2018-01-10 -> 2019-08-21 --- pkgs/tools/misc/xsel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 3d2fb50371e..4c39babc317 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { pname = "xsel-unstable"; - version = "2018-01-10"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "kfish"; repo = "xsel"; - rev = "9bfc13d64b5acb92c6648c696a9d9260fcbecc65"; - sha256 = "05ms34by5hxznnpvmvhgp6llvlkz0zw4sq6c4bgwr82lj140lscm"; + rev = "ef01f3c72a195dbce682184c842b81b17d7d7ad1"; + sha256 = "191qa6022b7nww3bicfxpgp4d9x6c8s3sgixi780383ghkxds08c"; }; nativeBuildInputs = [ autoreconfHook ]; From 55bbd626b08000f58330fb3a28891aca79e7c850 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:34:25 +0100 Subject: [PATCH 008/211] mstpd: 0.0.7 -> 0.0.8 --- pkgs/os-specific/linux/mstpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index 492a9321a21..96c235c1498 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mstpd"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "01majib6d1rixngf8c8vcrj1akf8nsqpxhdfdxxi2xwg23vx8f1a"; + sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb"; }; nativeBuildInputs = [ autoreconfHook ]; From 74554ab3b23d8cd7881d49b40cbbca4582d870d6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:35:09 +0100 Subject: [PATCH 009/211] mstpd: fix build with gcc9 --- pkgs/os-specific/linux/mstpd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index 96c235c1498..4a7c6282d4c 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "mstpd"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb"; }; + patches = [ + (fetchpatch { + name = "fix-strncpy-gcc9.patch"; + url = "https://github.com/mstpd/mstpd/commit/d27d7e93485d881d8ff3a7f85309b545edbe1fc6.patch"; + sha256 = "19456daih8l3y6m9kphjr7pj7slrqzbj6yacnlgznpxyd8y4d86y"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ From f60914ac2c01504fdbff4f9139a69bea4b9fa74c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:49:25 +0100 Subject: [PATCH 010/211] archiveopteryx: fix build with gcc9 --- pkgs/servers/mail/archiveopteryx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 5a318c311af..3443a508aea 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings ''; - # fix build on gcc7 + # fix build on gcc7+ NIX_CFLAGS_COMPILE = [ "-Wno-error=builtin-declaration-mismatch" "-Wno-error=implicit-fallthrough" + "-Wno-error=deprecated-copy" ]; buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; From a45f93171b399e12d6d1a7d0f9ee027372b2878c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 18:54:37 +0100 Subject: [PATCH 011/211] bctoolbox: fix build with gcc9 --- pkgs/development/libraries/bctoolbox/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 2730696344e..3f64ca2addf 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -1,9 +1,17 @@ -{stdenv, fetchFromGitHub, cmake, mbedtls, bcunit, srtp}: +{stdenv, fetchpatch, fetchFromGitHub, cmake, mbedtls, bcunit, srtp}: stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bctoolbox"; version = "0.6.0"; - buildInputs = [cmake mbedtls bcunit srtp]; + nativeBuildInputs = [cmake]; + buildInputs = [mbedtls bcunit srtp]; + patches = [ + (fetchpatch { + name = "fix-gcc9.patch"; + url = "https://github.com/BelledonneCommunications/bctoolbox/commit/2425a224634c7a70ae91f809bbab51771f0a30d7.patch"; + sha256 = "0ib859mwwlr6jk6qbwp6x25pp8wgv21lh0qgdsx5hyzwdzqx1b3h"; + }) + ]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = baseName; From 126300372ab95982178c7bc37404a0a31d1ec37a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:35:07 +0100 Subject: [PATCH 012/211] flatbuffers: 1.10.0 -> 1.11.0 --- pkgs/development/libraries/flatbuffers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index d96ceb5d26b..d43c10c8bf9 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1b32kc5jp83l43w2gs1dkw2vqm2j0wi7xfxqa86m18n3l41ca734"; + sha256 = "1gl8pnykzifh7pnnvl80f5prmj5ga60dp44inpv9az2k9zaqx3qr"; }; preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' From 5b4cf07af1e021dd800ee6e3b9744511055abbe3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:41:47 +0100 Subject: [PATCH 013/211] spirv-tools: 2019.3 -> 2019.4 --- pkgs/development/tools/spirv-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 550cd9dce27..f6702229374 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.3"; + version = "2019.4"; in stdenv.mkDerivation rec { @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8"; + sha256 = "17bbvhk4p42x4jlvcr5p9903xiiryw57c8yyfxmqik10s8601an9"; }; enableParallelBuilding = true; - buildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; From 4bf34b872e378a6d21cbe0e38d71330c5940749c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:44:43 +0100 Subject: [PATCH 014/211] leatherman: 1.8.0 -> 1.9.0 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 9e20923c244..bdba8688f9d 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { - sha256 = "0iizy20pdkbnsfj6bzrkkj7faizc85lcpkpandvnxfybiq7j60iw"; + sha256 = "029n16rsvj2abii6d1d4q01fygkicw8n3ja0iaribk4b4h5mc7vc"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From ee1cffd641c13ba0be37bee9aef70d64aa153b7a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:45:08 +0100 Subject: [PATCH 015/211] leatherman: fix build with gcc9 --- pkgs/development/libraries/leatherman/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index bdba8688f9d..7f7d34199be 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=ignored-qualifiers" + "-Wno-error=class-memaccess" + "-Wno-error=catch-value" + "-Wno-error=deprecated-copy" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/leatherman/; + homepage = https://github.com/puppetlabs/leatherman/; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; From 2c3f93fe74a8cb370afa46f0aca165d8133a8c00 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:46:49 +0100 Subject: [PATCH 016/211] libdynd: fix build with gcc9 --- pkgs/development/libraries/libdynd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 249f3f4f21a..bc492815339 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation { "-DDYND_BUILD_BENCHMARKS=OFF" ]; - # added to fix build with gcc7 + # added to fix build with gcc7+ NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" "-Wno-error=tautological-compare" "-Wno-error=class-memaccess" "-Wno-error=parentheses" + "-Wno-error=deprecated-copy" ]; buildInputs = [ cmake ]; From 39b4ad1a81fb2958c32c427c9657ed580d549110 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 23:07:19 +0100 Subject: [PATCH 017/211] bip: fix build with gcc9 --- pkgs/applications/networking/irc/bip/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 249fdc958c8..5a56c0867dd 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -23,9 +23,21 @@ stdenv.mkDerivation rec { url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff"; + sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff"; + sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff"; + sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq"; + }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; meta = { description = "An IRC proxy (bouncer)"; From 74639e47a85233a758b569d18f70b221f29f2cee Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 23:31:29 +0100 Subject: [PATCH 018/211] percona-server: fix build with gcc9 --- pkgs/servers/sql/percona/5.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 7f8f0786e03..860c1f8e94f 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; NIX_LDFLAGS = "-lgcc_s"; prePatch = '' From 35dd9c7dbfc1b599d666bbb941e8828f0885289b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 23:34:37 +0100 Subject: [PATCH 019/211] ksh: 93v -> 2020.0.0 --- pkgs/shells/ksh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 80059e448c9..075c843e684 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,14 +1,14 @@ { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ksh"; - version = "93v"; + version = "2020.0.0"; src = fetchFromGitHub { owner = "att"; repo = "ast"; - rev = "b8d88244ae87857e7bbd6da230ffbbc51165df70"; - sha256 = "12kf14n8vz36hnsy3wp6lnyv1841p7hcq25y1d78w532dil69lx9"; + rev = version; + sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; }; nativeBuildInputs = [ meson ninja which python ]; From 3f4d1a1ea8b5551211f7d4b1cded113693d31763 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 23:41:50 +0100 Subject: [PATCH 020/211] dhcp: fix build with gcc9 --- pkgs/tools/networking/dhcp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index bcf0743b7b9..f6c204d26b7 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" "-Wno-error=format-truncation" + "-Wno-error=stringop-truncation" + "-Wno-error=format-overflow" ]; installFlags = [ "DESTDIR=\${out}" ]; From 9c19da1bac9ec37c409d82740087c346f45c66b8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 00:17:02 +0100 Subject: [PATCH 021/211] arangodb: build with gcc8 instead of gcc9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04392923b12..150786789bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -621,7 +621,9 @@ in arandr = callPackage ../tools/X11/arandr { }; - inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_3 arangodb_3_4 arangodb_3_5; + inherit (callPackages ../servers/nosql/arangodb { + stdenv = gcc8Stdenv; + }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; From 7b83464d0fcb39330ab2a25fca0d98a691ea4878 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 00:57:23 +0100 Subject: [PATCH 022/211] dirac: remove, unmaintained --- pkgs/development/libraries/dirac/default.nix | 31 -- .../libraries/dirac/dirac-1.0.2.patch | 362 ------------------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 395 deletions(-) delete mode 100644 pkgs/development/libraries/dirac/default.nix delete mode 100644 pkgs/development/libraries/dirac/dirac-1.0.2.patch diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix deleted file mode 100644 index 93e5da5b792..00000000000 --- a/pkgs/development/libraries/dirac/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, doxygen }: - -stdenv.mkDerivation rec { - version = "1.0.2"; - pname = "dirac"; - - src = fetchurl { - url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz"; - sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1"; - }; - - buildInputs = [ doxygen ]; - enableParallelBuilding = true; - - patches = [ ./dirac-1.0.2.patch ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - postInstall = '' - # keep only necessary binaries - find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete - ''; - - meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/dirac; - description = "A general-purpose video codec based on wavelets"; - platforms = platforms.linux; - license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = [ maintainers.igsha ]; - }; -} diff --git a/pkgs/development/libraries/dirac/dirac-1.0.2.patch b/pkgs/development/libraries/dirac/dirac-1.0.2.patch deleted file mode 100644 index 3d253b8f6d6..00000000000 --- a/pkgs/development/libraries/dirac/dirac-1.0.2.patch +++ /dev/null @@ -1,362 +0,0 @@ -diff -aur dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp ---- dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp 2008-05-02 09:57:19.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp 2016-02-10 19:39:09.838443767 +0300 -@@ -124,12 +124,9 @@ - - if(prefix==PU_PREFIX) - { -- unsigned char next_parse_code; -- -- next_parse_code = InputUnByte(); -+ (void)InputUnByte(); - // input next unit parse-offsets -- int next_unit_next_parse_offset; -- next_unit_next_parse_offset = ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE); -+ (void)ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE); - - int next_unit_previous_parse_offset; - next_unit_previous_parse_offset = ReadUintLit(PU_PREVIOUS_PARSE_OFFSET_SIZE); -diff -aur dirac-1.0.2/libdirac_common/mot_comp.cpp dirac-1.0.2-modif/libdirac_common/mot_comp.cpp ---- dirac-1.0.2/libdirac_common/mot_comp.cpp 2008-10-01 05:26:47.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/mot_comp.cpp 2016-02-10 19:50:18.453051800 +0300 -@@ -1064,10 +1064,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - - for(int c = 0, uY = ref_start.y,BuY=BChk(uY,trueRefYlen),BuY1=BChk(uY+1,trueRefYlen); -@@ -1116,10 +1116,10 @@ - const ImageCoords ref_start( ( start_pos.x<<1 ) + roundvec.x ,( start_pos.y<<1 ) + roundvec.y ); - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - //An additional stage to make sure the block to be copied does not fall outside - //the reference image. -diff -aur dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp ---- dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp 2008-01-09 13:50:23.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp 2016-02-10 19:59:51.792793538 +0300 -@@ -244,10 +244,10 @@ - // We're 2doing bounds checking because we'll fall off the edge of the reference otherwise. - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - ValueType act_cols1[4], act_cols2[4]; - int uX, uY, c, l; -diff -aur dirac-1.0.2/libdirac_common/mv_codec.cpp dirac-1.0.2-modif/libdirac_common/mv_codec.cpp ---- dirac-1.0.2/libdirac_common/mv_codec.cpp 2008-10-01 05:26:47.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/mv_codec.cpp 2016-02-10 19:51:57.634838245 +0300 -@@ -159,7 +159,7 @@ - // Main code function - void PredModeCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -169,7 +169,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -@@ -334,7 +334,7 @@ - // Main code function - void VectorElementCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -344,7 +344,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -@@ -500,7 +500,7 @@ - // Main code function - void DCCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -510,7 +510,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -diff -aur dirac-1.0.2/libdirac_common/wavelet_utils.cpp dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp ---- dirac-1.0.2/libdirac_common/wavelet_utils.cpp 2008-10-20 08:21:02.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp 2016-02-10 19:58:16.205006445 +0300 -@@ -198,7 +198,6 @@ - const bool field_coding = encparams.FieldCoding(); - const ChromaFormat cformat = pparams.CFormat(); - const float cpd = encparams.CPD()*cpd_scale_factor; -- const PictureSort psort = pparams.PicSort(); - - int xlen, ylen, xl, yl, xp, yp; - float xfreq, yfreq; -diff -aur dirac-1.0.2/libdirac_encoder/picture_compress.cpp dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp ---- dirac-1.0.2/libdirac_encoder/picture_compress.cpp 2009-01-21 08:20:57.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp 2016-02-10 20:08:17.935731263 +0300 -@@ -413,14 +413,12 @@ - - const int depth=m_encparams.TransformDepth(); - -- PicArray* comp_data[3]; - CoeffArray* coeff_data[3]; - OneDArray* est_bits[3]; - float lambda[3]; - - // Construction and definition of objects - for (int c=0;c<3;++c){ -- comp_data[c] = &my_picture.Data((CompSort) c ); - coeff_data[c] = &my_picture.WltData((CompSort) c ); - est_bits[c] = new OneDArray( Range( 1, 3*depth+1 ) ); - }// c -diff -aur dirac-1.0.2/libdirac_encoder/quant_chooser.cpp dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp ---- dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2009-01-21 08:22:05.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp 2016-02-10 20:15:43.792954708 +0300 -@@ -340,7 +340,7 @@ - { - for (int i=cblock.Xstart(); i= u_threshold ) -+ if ( (int(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) - can_skip = false; - } - } -@@ -349,13 +349,13 @@ - - CoeffType QuantChooser::BlockAbsMax( const Subband& node ) - { -- int val( 0 ); -+ CoeffType val( 0 ); - - for (int j=node.Yp() ; j0) - { -@@ -672,7 +671,6 @@ - return 0; - else if ((cnum-1)% m_L1_sep==0) - {//we have L1 or subsequent I pictures -- div=(cnum-1)/m_L1_sep; - return cnum+m_L1_sep-1; - } - else//we have L2 pictures -diff -aur dirac-1.0.2/libdirac_motionest/me_utils.cpp dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp ---- dirac-1.0.2/libdirac_motionest/me_utils.cpp 2008-10-21 08:55:46.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp 2016-02-10 20:04:40.068175649 +0300 -@@ -684,10 +684,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - // weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - const int refXlen( m_ref_data.LengthX() ); - const int refYlen( m_ref_data.LengthY() ); -@@ -848,10 +848,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - // weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - const int refXlen( m_ref_data.LengthX() ); - const int refYlen( m_ref_data.LengthY() ); -@@ -908,10 +908,10 @@ - const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - bool bounds_check( false ); - -@@ -1039,10 +1039,10 @@ - const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - bool bounds_check( false ); - -@@ -1403,10 +1403,10 @@ - } - else - { -- const ValueType linear_wts[4] = { (2 - rmdr1.x) * (2 - rmdr1.y), //tl -- rmdr1.x * (2 - rmdr1.y), //tr -- (2 - rmdr1.x) * rmdr1.y, //bl -- rmdr1.x * rmdr1.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr1.x) * (2 - rmdr1.y)), //tl -+ ValueType(rmdr1.x * (2 - rmdr1.y)), //tr -+ ValueType((2 - rmdr1.x) * rmdr1.y), //bl -+ ValueType(rmdr1.x * rmdr1.y) }; //br - - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - for( int y=dparams.Yl(), ry=ref_start1.y, by=BChk(ry,m_ref_data1.LengthY()), by1=BChk(ry+1,m_ref_data1.LengthY()); -@@ -1513,10 +1513,10 @@ - } - else - { -- const ValueType linear_wts[4] = { (2 - rmdr2.x) * (2 - rmdr2.y), //tl -- rmdr2.x * (2 - rmdr2.y), //tr -- (2 - rmdr2.x) * rmdr2.y, //bl -- rmdr2.x * rmdr2.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr2.x) * (2 - rmdr2.y)), //tl -+ ValueType(rmdr2.x * (2 - rmdr2.y)), //tr -+ ValueType((2 - rmdr2.x) * rmdr2.y), //bl -+ ValueType(rmdr2.x * rmdr2.y) }; //br - - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - for( int y=dparams.Yl(), ry=ref_start2.y, by=BChk(ry,m_ref_data2.LengthY()),by1=BChk(ry+1,m_ref_data2.LengthY()); -@@ -1564,14 +1564,14 @@ - const MVector rmdr2( mv2.x & 3 , mv2.y & 3 ); - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts1[4] = { (4 - rmdr1.x) * (4 - rmdr1.y), //tl -- rmdr1.x * (4 - rmdr1.y), //tr -- (4 - rmdr1.x) * rmdr1.y, //bl -- rmdr1.x * rmdr1.y }; //br -- const ValueType linear_wts2[4] = { (4 - rmdr2.x) * (4 - rmdr2.y), //tl -- rmdr2.x * (4 - rmdr2.y), //tr -- (4 - rmdr2.x) * rmdr2.y, //bl -- rmdr2.x * rmdr2.y }; //br -+ const ValueType linear_wts1[4] = { ValueType((4 - rmdr1.x) * (4 - rmdr1.y)), //tl -+ ValueType(rmdr1.x * (4 - rmdr1.y)), //tr -+ ValueType((4 - rmdr1.x) * rmdr1.y), //bl -+ ValueType(rmdr1.x * rmdr1.y) }; //br -+ const ValueType linear_wts2[4] = { ValueType((4 - rmdr2.x) * (4 - rmdr2.y)), //tl -+ ValueType(rmdr2.x * (4 - rmdr2.y)), //tr -+ ValueType((4 - rmdr2.x) * rmdr2.y), //bl -+ ValueType(rmdr2.x * rmdr2.y) }; //br - - //Where to start in the upconverted images - const ImageCoords ref_start1( ( dparams.Xp()<<1 ) + roundvec1.x ,( dparams.Yp()<<1 ) + roundvec1.y ); -diff -aur dirac-1.0.2/util/conversion/common/bitmap.cpp dirac-1.0.2-modif/util/conversion/common/bitmap.cpp ---- dirac-1.0.2/util/conversion/common/bitmap.cpp 2004-06-30 20:44:52.000000000 +0400 -+++ dirac-1.0.2-modif/util/conversion/common/bitmap.cpp 2016-02-10 20:19:58.355494888 +0300 -@@ -142,14 +142,9 @@ - char signature[2]; - int fileSize; - int dataOffset; -- int size; - int planes; - int bitCount; - int compression; -- int imageSize; -- int xPixelsPerM, yPixelsPerM; -- int coloursUsed; -- int coloursImportant; - //Define buffer to read bytes into. - const int bufferSize = 54; - char buffer[bufferSize]; -@@ -175,7 +170,7 @@ - //Reposition input buffer to skip over extra header data if necessary - //Should check success of operation (see The C++ Stand Lib, Josuttis, p665) - if (dataOffset>54) inbuf.pubseekoff(dataOffset-54, std::ios_base::cur, std::ios_base::in); -- size = read4bytes(buffer+14); -+ (void)read4bytes(buffer+14); // size - w = read4bytes(buffer+18); - h = read4bytes(buffer+22); - if ( fileSize != (dataOffset + height()*lineBufferSize()) ) input.setstate(std::ios::failbit); -@@ -185,11 +180,11 @@ - if ( bitCount != 24 ) input.setstate(std::ios::failbit); - compression = read4bytes(buffer+30); - if ( compression != 0 ) input.setstate(std::ios::failbit); -- imageSize = read4bytes(buffer+34); -- xPixelsPerM = read4bytes(buffer+38); -- yPixelsPerM = read4bytes(buffer+42); -- coloursUsed = read4bytes(buffer+46); -- coloursImportant = read4bytes(buffer+50); -+ (void)read4bytes(buffer+34); // imageSize -+ (void)read4bytes(buffer+38); // xPixelsPerM -+ (void)read4bytes(buffer+42); // yPixelsPerM -+ (void)read4bytes(buffer+46); // coloursUsed -+ (void)read4bytes(buffer+50); // coloursImportant - return input; } - - } // end namespace dirac_vu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 150786789bb..8526f5e00c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10816,8 +10816,6 @@ in fltk = fltk13; }; - dirac = callPackage ../development/libraries/dirac { }; - directfb = callPackage ../development/libraries/directfb { }; discord-rpc = callPackage ../development/libraries/discord-rpc { From cec9a7e93a5ab1b662bf38222e6b017ed25ffadd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 01:05:04 +0100 Subject: [PATCH 023/211] vboot_reference: fix build with gcc9 --- pkgs/tools/system/vboot_reference/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 0bf8a7e85dc..ab78551e4fc 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { patches = [ ./dont_static_link.patch ]; + # fix build with gcc9 + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + postPatch = '' substituteInPlace Makefile \ --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' From d25337d16a58b2f4b4f4132d0190be02b7e48f89 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 01:10:07 +0100 Subject: [PATCH 024/211] spice-vdagent: fix build with gcc9 --- pkgs/applications/virtualization/spice-vdagent/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 70ae09aa6ef..1582bbbb30f 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; From 8b9b91ccbbc29cc73cdedca8f126b2016f0f9658 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 01:10:31 +0100 Subject: [PATCH 025/211] spice-vdagent: 0.18.0 -> 0.19.0 --- .../applications/virtualization/spice-vdagent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 1582bbbb30f..6f5cbeb7ed4 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, - libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, + libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.18.0"; + name = "spice-vdagent-0.19.0"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; + sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice-protocol glib + buildInputs = [ alsaLib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { From 682de1908fa2c38901906eb246fa1813172b3da9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 01:22:41 +0100 Subject: [PATCH 026/211] linuxPackages.usbip: fix build with gcc9 --- pkgs/os-specific/linux/usbip/default.nix | 4 ++ .../linux/usbip/fix-strncpy-truncation.patch | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 61f2c454046..f927b4ffc78 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -8,11 +8,15 @@ stdenv.mkDerivation { patches = [ # fixes build with gcc8 ./fix-snprintf-truncation.patch + # fixes build with gcc9 + ./fix-strncpy-truncation.patch ]; nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + preConfigure = '' cd tools/usb/usbip ./autogen.sh diff --git a/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch b/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch new file mode 100644 index 00000000000..a5c4c97bbc0 --- /dev/null +++ b/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch @@ -0,0 +1,37 @@ +diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c +index bb424638d75b..2fc5837e609a 100644 +--- a/tools/usb/usbip/libsrc/usbip_common.c ++++ b/tools/usb/usbip/libsrc/usbip_common.c +@@ -226,8 +226,8 @@ int read_usb_device(struct udev_device *sdev, struct usbip_usb_device *udev) + path = udev_device_get_syspath(sdev); + name = udev_device_get_sysname(sdev); + +- strncpy(udev->path, path, SYSFS_PATH_MAX); +- strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE); ++ strncpy(udev->path, path, SYSFS_PATH_MAX-1); ++ strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE-1); + + sscanf(name, "%u-%u", &busnum, &devnum); + udev->busnum = busnum; +diff --git a/tools/usb/usbip/libsrc/usbip_device_driver.c b/tools/usb/usbip/libsrc/usbip_device_driver.c +index 5a3726eb44ab..95b416af8b99 100644 +--- a/tools/usb/usbip/libsrc/usbip_device_driver.c ++++ b/tools/usb/usbip/libsrc/usbip_device_driver.c +@@ -91,7 +91,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev) + copy_descr_attr16(dev, &descr, idProduct); + copy_descr_attr16(dev, &descr, bcdDevice); + +- strncpy(dev->path, path, SYSFS_PATH_MAX); ++ strncpy(dev->path, path, SYSFS_PATH_MAX-1); + + dev->speed = USB_SPEED_UNKNOWN; + speed = udev_device_get_sysattr_value(sdev, "current_speed"); +@@ -110,7 +110,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev) + dev->busnum = 0; + + name = udev_device_get_sysname(plat); +- strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE); ++ strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE-1); + return 0; + err: + fclose(fd); From b65ce591dbf73c9ff06df3b94bcfbc15f674069c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:46:18 +0100 Subject: [PATCH 027/211] arachne-pnr: 2018.09.09 -> 2019.07.29 --- pkgs/development/compilers/arachne-pnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 3058e926c3f..0b5ff381730 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,13 +4,13 @@ with builtins; stdenv.mkDerivation rec { pname = "arachne-pnr"; - version = "2018.09.09"; + version = "2019.07.29"; src = fetchFromGitHub { owner = "yosyshq"; repo = "arachne-pnr"; - rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd"; - sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"; + rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc"; + sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc"; }; enableParallelBuilding = true; From a5c1df7b7787a0776dab5c03eadc7e9bd079d9ea Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:49:02 +0100 Subject: [PATCH 028/211] casync: 2-152 -> 2-219 --- pkgs/applications/networking/sync/casync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index cdec695d90f..82a99bf2df1 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "casync"; - version = "2-152-ge4a3c5e"; + version = "2-219-ga8f6c84"; src = fetchFromGitHub { owner = "systemd"; repo = "casync"; - rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; - sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8"; + sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws"; }; buildInputs = [ acl curl xz zstd ] From 938d0a0d6c66a3974ef0bd1d3216edde2ad28220 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:49:28 +0100 Subject: [PATCH 029/211] aeon: 0.12.9.0 -> 0.13.0.0 --- pkgs/applications/blockchains/aeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index d65889be3ac..db9e68ae905 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.12.9.0"; + version = "0.13.0.0"; in stdenv.mkDerivation { pname = "aeon"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "194nxf8c8ihkmdsxyhkhrxc2xiinipifk0ng1rmxiiyr2gjgxzga"; + sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; }; nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; From c72bd9094057dfeef25790018b994484e0d60a02 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:56:21 +0100 Subject: [PATCH 030/211] aerospike: fix build with gcc9 --- pkgs/servers/nosql/aerospike/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index d3b80aa00fe..b7b43edc1cd 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ openssl zlib ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-truncation" + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=stringop-truncation" + ]; preBuild = '' patchShebangs build/gen_version From f8d610c1d94f375e6c1bcd4974455d62f8285976 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:58:01 +0100 Subject: [PATCH 031/211] cjdns: fix build with gcc9 --- pkgs/tools/networking/cjdns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index f9dc3de7735..df94de882be 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # for flock stdenv.lib.optional stdenv.isLinux utillinux; - CFLAGS = "-O2"; + CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; From 6944524756617f8a4a4504f38034936790cacf35 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 12:58:14 +0100 Subject: [PATCH 032/211] clinfo: fix build with gcc9 --- pkgs/tools/system/clinfo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 5653c70d431..dd6e3d4a84b 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocl-icd opencl-headers ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { From 2acbd1bb8ed7a93ae0aa9de61814c55921a586d8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:00:10 +0100 Subject: [PATCH 033/211] citra: 2019-05-25 -> 2019-10-05 --- pkgs/misc/emulators/citra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index d8717b46eef..ca6ad37b5aa 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation { pname = "citra"; - version = "2019-05-25"; + version = "2019-10-05"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; - sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; + rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; + sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; }; enableParallelBuilding = true; From 49a3829704e83b62e356da4ef268e436f9159e62 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:06:19 +0100 Subject: [PATCH 034/211] cups-bjnp: fix build with gcc9 --- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index f38ed7f0309..0c91b782117 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = "-include stdio.h"; + NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; meta = { description = "CUPS back-end for Canon printers"; From dffcb8738384c488bec1878c023db21ce1e6b471 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:11:17 +0100 Subject: [PATCH 035/211] colmap: fix build with gcc9 --- pkgs/applications/science/misc/colmap/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 672569ed100..da118f6bca5 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; let boost_static = boost.override { enableStatic = true; }; -in +in mkDerivation rec { version = "3.5"; pname = "colmap"; @@ -15,7 +15,14 @@ mkDerivation rec { rev = version; sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; }; - + + patches = [ + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; + sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; + }) + ]; + buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase From 65eb7fe785c5c49b2dd57641f00a37ec8908fdac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:18:25 +0100 Subject: [PATCH 036/211] cataclysm-dda: fix build with gcc9 --- pkgs/games/cataclysm-dda/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b1d8a27b5a2..9f34c60e16c 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (common // rec { substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" ]; + makeFlags = common.makeFlags ++ [ "LUA=1" ]; From 1be138caa4e4c089ef91e25f5b2c69cae9f8c07d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:20:38 +0100 Subject: [PATCH 037/211] hexcurse: fix build with gcc9 --- pkgs/applications/editors/hexcurse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index a6437f070b9..c87694321f3 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; patches = [ # gcc7 compat (fetchpatch { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) ]; - + meta = with lib; { description = "ncurses-based console hexeditor written in C"; homepage = https://github.com/LonnyGomes/hexcurse; From 90452593fb14f26aefee6ca037c266d9d4af07f3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:27:43 +0100 Subject: [PATCH 038/211] intel-gpu-tools: fix build with gcc9 --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 12197c2de40..a56ab127235 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; + preConfigure = '' ./autogen.sh ''; From e8a0029dbf13f73ce4ae887c2bca3652885ed9fb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:28:02 +0100 Subject: [PATCH 039/211] getxbook: fix build with gcc9 --- pkgs/applications/misc/getxbook/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index b2a992b850e..56f1ec747ca 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-truncation" + "-Wno-error=deprecated-declarations" + "-Wno-error=stringop-overflow" + ]; buildInputs = [ openssl ]; From bd1ea14e442c23bffea37501dec6a2d7cfd2794e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:32:09 +0100 Subject: [PATCH 040/211] libreswan: fix build with gcc9 --- pkgs/tools/networking/libreswan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 9a0b8c9ebf5..dd0137a1463 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { "-Wno-error=implicit-fallthrough" "-Wno-error=format-truncation" "-Wno-error=pointer-compare" + "-Wno-error=stringop-truncation" ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; From 2e83bd66f613a675f5d49a364a745b75c3906df9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:32:21 +0100 Subject: [PATCH 041/211] itk: build with gcc8, unsupported with gcc9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8526f5e00c7..1babd42803b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11631,7 +11631,9 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { }; - itk = callPackage ../development/libraries/itk { }; + itk = callPackage ../development/libraries/itk { + stdenv = gcc8Stdenv; + }; jasper = callPackage ../development/libraries/jasper { }; From 4f411338d71d122611e9133254b1c5eb7ab10a03 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:32:45 +0100 Subject: [PATCH 042/211] glibc_memusage: fix build with gcc9 --- pkgs/development/libraries/glibc/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 50b359da96c..6115611b42e 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -5,6 +5,14 @@ , buildPackages }: +let + gdCflags = [ + "-Wno-error=stringop-truncation" + "-Wno-error=missing-attributes" + "-Wno-error=array-bounds" + ]; +in + callPackage ./common.nix { inherit stdenv; } { name = "glibc" + stdenv.lib.optionalString withGd "-gd"; @@ -47,10 +55,10 @@ callPackage ./common.nix { inherit stdenv; } { # musl-specific flags below. # At next change to non-musl glibc builds, remove this `then` # and the above condition, instead keeping only the `else` below. - then (if withGd then "-Wno-error=stringop-truncation" else null) + then (if withGd then gdCflags else null) else builtins.concatLists [ - (stdenv.lib.optional withGd "-Wno-error=stringop-truncation") + (stdenv.lib.optionals withGd gdCflags) # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") From e1d4b37f49ee3686235c33af38f8379ce0aeaf77 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:34:06 +0100 Subject: [PATCH 043/211] monero-gui: fix build with gcc9 --- pkgs/applications/blockchains/monero-gui/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 92f6f008021..14fc7782c53 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -33,6 +33,8 @@ mkDerivation rec { cppzmq hidapi ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; + patches = [ ./move-log-file.patch ]; postPatch = '' From 8e63a6cd13b1915578c1fc28f3797ca516316bf5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:36:25 +0100 Subject: [PATCH 044/211] niftyreg: fix build with gcc9 --- pkgs/applications/science/biology/niftyreg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index 6379f2c3282..48bd1b21ecd 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; enableParallelBuilding = true; From d2ad88faf9247b4dc5e5266b76db214fe1bc24c0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:39:35 +0100 Subject: [PATCH 045/211] opae: fix build with gcc9 --- pkgs/development/libraries/opae/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 32b13115957..46b03720d16 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { doCheck = false; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-truncation" + "-Wno-error=address-of-packed-member" + ]; + nativeBuildInputs = [ cmake doxygen perl python2Packages.sphinx ]; buildInputs = [ libuuid json_c python2 ]; From 9398fbe97b7974f652a82f893906d730d2285190 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:43:38 +0100 Subject: [PATCH 046/211] openocd: fix build with gcc9 --- pkgs/development/tools/misc/openocd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 80203dd0df9..eea27b3e51f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "-Wno-format-truncation" "-Wno-format-overflow" "-Wno-error=tautological-compare" + "-Wno-error=array-bounds" ]; postInstall = lib.optionalString stdenv.isLinux '' From cb08ffe4c51b5e7f5aba1ddd73d029aa538abddf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:44:26 +0100 Subject: [PATCH 047/211] packetdrill: fix build with gcc9 --- pkgs/tools/networking/packetdrill/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 2041d935c94..623645efc0c 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" + "-Wno-error=stringop-truncation" + "-Wno-error=address-of-packed-member" + ]; nativeBuildInputs = [ bison flex ]; patches = [ ./nix.patch ]; enableParallelBuilding = true; From c124d44e49ba43216fec31b072896635ba639622 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:47:41 +0100 Subject: [PATCH 048/211] open-vm-tools: fix build with gcc9 --- .../virtualization/open-vm-tools/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 49e77a5ec9d..e4db7ea5994 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -46,9 +46,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # igrone glib-2.62 deprecations - # Drop in next stable release. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = [ + # igrone glib-2.62 deprecations + # Drop in next stable release. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + + # fix build with gcc9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + ]; postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ From d15f63bfadad8d0e8d65e734ea4cc180081fe8be Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:48:58 +0100 Subject: [PATCH 049/211] osrm-backend: fix build with gcc9 --- pkgs/servers/osrm-backend/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index c0018529ea8..b744c58d4fb 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1m4hf26mgfvvx9z37qww8v8w4mhzyfl554ymdnzl99pr5ild093s"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; From baa5a73ba1f5eeacfdb52b623bcc2030dd7c1ca8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:59:10 +0100 Subject: [PATCH 050/211] xorg.xf86videoomap: fix build with gcc9 --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e6a94daee10..9dd3425fcc4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -382,6 +382,10 @@ self: super: xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: { + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + }); + xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: { configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; }); From 9c3d1afc03979458b7f73d08f2084bf47e91fcc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:07:16 +0100 Subject: [PATCH 051/211] ponyc: fix build with gcc9 --- pkgs/development/compilers/ponyc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f20a32acedd..7e525648691 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation ( rec { checkTarget = "test-ci"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" ]; + preCheck = '' export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}" ''; From 5957b4a8d9d49e5c9ffb553bdbc89f7ebb2b0b58 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:08:54 +0100 Subject: [PATCH 052/211] cockroachdb: 19.1.4 -> 19.1.5 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index ba395c5e7f6..e9f41b4c9f5 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.4"; + version = "19.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1bqzs844ildvyh4332vapsqhfkwcvjmgkkmn3i8ndd89q5yic6fq"; + sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; }; inherit nativeBuildInputs buildInputs; From 55a30b39f5d3966c302f68b1a185839f1ff14c23 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:09:10 +0100 Subject: [PATCH 053/211] cockroachdb: fix build with gcc9 --- pkgs/servers/sql/cockroachdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index e9f41b4c9f5..94acc7ab7bf 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -22,6 +22,8 @@ buildGoPackage rec { sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + inherit nativeBuildInputs buildInputs; buildPhase = '' From 2706e7a96191233de17ded718b9679ccf43c4d1a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:09:30 +0100 Subject: [PATCH 054/211] zeroc-ice: fix build with gcc9 --- pkgs/development/libraries/zeroc-ice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index e4d0c0fde17..945ba59cf3d 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" "-Wno-error=deprecated-copy" ]; prePatch = lib.optional stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ From a0d2774f618895f0a1f8ae7966d28ef2292e9818 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:10:23 +0100 Subject: [PATCH 055/211] tvheadend: fix build with gcc9 --- pkgs/servers/tvheadend/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 7fad204a018..9a01bf3eed6 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; # disable dvbscan, as having it enabled causes a network download which # cannot happen during build. From 071601843f1f357037088c89173e7d3fbb151012 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:11:40 +0100 Subject: [PATCH 056/211] tboot: fix build with gcc9 --- pkgs/tools/security/tboot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index f5184b98562..f52060b5c60 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "stackprotector" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + configurePhase = '' for a in lcptools utils tb_polgen; do substituteInPlace $a/Makefile --replace /usr/sbin /sbin From c095ce86082f6baf0acfc052fc5506d2b261b6b7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:11:53 +0100 Subject: [PATCH 057/211] gnome3.gnome-screensaver: fix build with gcc9 --- pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix index b1e9cde906c..4a530e54de7 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { systemd ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + configureFlags = [ "--enable-locking" "--with-systemd=yes" ]; enableParallelBuilding = true; From 77cdd72c65097c64df8a4be7e7462b1563d222d9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:14:32 +0100 Subject: [PATCH 058/211] simavr: fix build with gcc9 --- pkgs/development/tools/simavr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 71f488c760a..368419c07f5 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "AVR=avr-" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + nativeBuildInputs = [ which pkgconfig avrgcc ]; buildInputs = [ libelf freeglut libGLU_combined ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; From f8869ff69f0faeabaffa585388832818f056cd5b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:16:43 +0100 Subject: [PATCH 059/211] snabb: fix build with gcc9 --- pkgs/tools/networking/snabb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index ba05ee8e8b5..9471efa92d7 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + patchPhase = '' patchShebangs . From d954e8a2239284f0779d78a00a4904149b41df0d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:25:33 +0100 Subject: [PATCH 060/211] frostwire-bin: fix download url --- .../applications/networking/p2p/frostwire/frostwire-bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index ae20414a065..982acb44b5e 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { pname = "frostwire"; src = fetchurl { - url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "00r7rxzk9a7a1sc0shdx7fq9p9dzg5pwfdf8day0kr1844a5arc2"; + url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; + sha256 = "144qmvpnfmlq1xrkbhsjh4ib79gchdcr9pcasmdy1n9hqbk6y4bq"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; - platforms = platforms.all; + platforms = [ "x86_64-linux"]; }; } From 6d772e0dfbeee181d719252ced002f2c477a55f2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:25:50 +0100 Subject: [PATCH 061/211] redis-desktop-manager: fix build with gcc9 --- pkgs/applications/misc/redis-desktop-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 25f9c6ed4c7..bee7058293d 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; + # Disable annoying update reminder postPatch = '' sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp From ddfe60ab55da88967d1679898e45620721c713f8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 14:26:19 +0100 Subject: [PATCH 062/211] rawtherapee: 5.5 -> 5.7 --- pkgs/applications/graphics/rawtherapee/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 74e8c0e6b43..12dc066dec3 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook -, lensfun +, lensfun, librsvg }: stdenv.mkDerivation rec { - version = "5.5"; + version = "5.7"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "13clnx7rwkfa7wxgsim1xdx2pd7gwmmdad1m8a3fvywr20ml8xzk"; + sha256 = "0j3887a3683fqpvp66kaw6x81ai3gf5nvrbmb4cc8rb0lgj2xv2g"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ - pixman libpthreadstubs gtkmm3 libXau libXdmcp + pixman libpthreadstubs gtkmm3 libXau libXdmcp librsvg lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun ]; From 688199745deb36e6f1c7c6b8369adb2f13a528b8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 14:08:49 +0100 Subject: [PATCH 063/211] qt4: fix build with gcc9 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7c7f8f51de7..632b5fc1fd5 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -93,6 +93,12 @@ stdenv.mkDerivation rec { #}) ./qt4-gcc6.patch ./qt4-openssl-1.1.patch + (fetchpatch { + name = "gcc9-foreach.patch"; + url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/" + + "0d4a3dd61ccb156dee556c214dbe91c04d44a717/debian/patches/gcc9-qforeach.patch"; + sha256 = "0dzn6qxrgxb75rvck9kmy5gspawdn970wsjw56026dhkih8cp3pg"; + }) ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; From 5ba6f78efa1cf8398eeca6127236c332c91a029b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Nov 2019 13:10:28 +0100 Subject: [PATCH 064/211] firefox-esr-68: fix build with gcc9 --- pkgs/applications/networking/browsers/firefox/common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1c6ddfc99eb..93dd5e527e3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -160,7 +160,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!isTorBrowserLike) [ "-I${nss.dev}/include/nss" - ]; + ] + ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68" + && lib.versionOlder ffversion "69") + "-Wno-error=format-security"; postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' From 3f7a17dee1be1a62e1023a55fa8e21ac13fbc372 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Nov 2019 19:18:06 +0100 Subject: [PATCH 065/211] czmqpp, czmq3: remove, outdated --- .../video/openshot-qt/libopenshot.nix | 4 +-- pkgs/development/libraries/czmq/3.x.nix | 26 ----------------- .../libraries/czmq/czmq3-gcc7.patch | 26 ----------------- .../libraries/czmq/{4.x.nix => default.nix} | 0 pkgs/development/libraries/czmqpp/default.nix | 28 ------------------- .../development/libraries/czmqpp/socket.patch | 17 ----------- pkgs/tools/system/rsyslog/default.nix | 4 --- pkgs/top-level/all-packages.nix | 9 +----- 8 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 pkgs/development/libraries/czmq/3.x.nix delete mode 100644 pkgs/development/libraries/czmq/czmq3-gcc7.patch rename pkgs/development/libraries/czmq/{4.x.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/czmqpp/default.nix delete mode 100644 pkgs/development/libraries/czmqpp/socket.patch diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 95f89e0eda5..2ed4b8ce3e3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3 -, unittest-cpp, cppzmq, czmqpp +, unittest-cpp, cppzmq, zeromq , qtbase, qtmultimedia }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagick ffmpeg swig python3 unittest-cpp - cppzmq czmqpp qtbase qtmultimedia ]; + cppzmq zeromq qtbase qtmultimedia ]; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix deleted file mode 100644 index 73a51cd2731..00000000000 --- a/pkgs/development/libraries/czmq/3.x.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, zeromq }: - -stdenv.mkDerivation rec { - version = "3.0.2"; - pname = "czmq"; - - src = fetchurl { - url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; - sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; - }; - - patches = [ ./czmq3-gcc7.patch ]; - - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - # Needs to be propagated for the .pc file to work - propagatedBuildInputs = [ zeromq ]; - - meta = with stdenv.lib; { - homepage = http://czmq.zeromq.org/; - description = "High-level C Binding for ZeroMQ"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/czmq/czmq3-gcc7.patch b/pkgs/development/libraries/czmq/czmq3-gcc7.patch deleted file mode 100644 index 4ab14685a6c..00000000000 --- a/pkgs/development/libraries/czmq/czmq3-gcc7.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/zgossip_engine.inc b/src/zgossip_engine.inc -index 37dbb4eb..727aaa9b 100644 ---- a/src/zgossip_engine.inc -+++ b/src/zgossip_engine.inc -@@ -258,7 +258,7 @@ engine_set_log_prefix (client_t *client, const char *string) - { - if (client) { - s_client_t *self = (s_client_t *) client; -- snprintf (self->log_prefix, sizeof (self->log_prefix) - 1, -+ snprintf (self->log_prefix, sizeof (self->log_prefix), - "%6d:%-33s", self->unique_id, string); - } - } -diff --git a/src/zsys.c b/src/zsys.c -index 4d0bb8a1..f07db9c8 100644 ---- a/src/zsys.c -+++ b/src/zsys.c -@@ -1071,7 +1071,7 @@ zsys_run_as (const char *lockfile, const char *group, const char *user) - } - } - // We record the current process id in the lock file -- char pid_buffer [10]; -+ char pid_buffer [32]; - snprintf (pid_buffer, sizeof (pid_buffer), "%6d\n", getpid ()); - if (write (handle, pid_buffer, strlen (pid_buffer)) != strlen (pid_buffer)) { - zsys_error ("cannot write to lockfile: %s", strerror (errno)); diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/default.nix similarity index 100% rename from pkgs/development/libraries/czmq/4.x.nix rename to pkgs/development/libraries/czmq/default.nix diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix deleted file mode 100644 index 079eb0806d2..00000000000 --- a/pkgs/development/libraries/czmqpp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: - -stdenv.mkDerivation rec { - pname = "czmqpp"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "czmqpp"; - rev = "v${version}"; - sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - propagatedBuildInputs = [ czmq ]; - - # https://github.com/zeromq/czmqpp/issues/42 - patches = [ ./socket.patch ]; - - meta = with stdenv.lib; { - inherit (src.meta) homepage; - description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; - license = licenses.lgpl3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; - }; -} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch deleted file mode 100644 index 0464bcf7797..00000000000 --- a/pkgs/development/libraries/czmqpp/socket.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- /src/socket.cpp -+++ /src/socket.cpp -@@ -60,12 +60,12 @@ - int socket::bind(const std::string& address) - { - // format-security: format not a string literal and no format arguments. -- return zsocket_bind(self_, address.c_str()); -+ return zsocket_bind(self_, "%s", address.c_str()); - } - int socket::connect(const std::string& address) - { - // format-security: format not a string literal and no format arguments. -- return zsocket_connect(self_, address.c_str()); -+ return zsocket_connect(self_, "%s", address.c_str()); - } - - bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 5617ed9dc93..02164e3581a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; - hardeningDisable = [ "format" ]; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -95,9 +93,7 @@ stdenv.mkDerivation rec { (mkFlag (hadoop != null) "omhdfs") (mkFlag (rdkafka != null) "omkafka") (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imzmq3") (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omzmq3") (mkFlag (czmq != null) "omczmq") (mkFlag (rabbitmq-c != null) "omrabbitmq") (mkFlag (hiredis != null) "omhiredis") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 414e1ce5100..e9109d5da2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2020,7 +2020,6 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken - czmq = czmq3; }; rsyslog-light = rsyslog.override { @@ -14448,13 +14447,7 @@ in cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq3 = callPackage ../development/libraries/czmq/3.x.nix {}; - czmq4 = callPackage ../development/libraries/czmq/4.x.nix {}; - czmq = czmq4; - - czmqpp = callPackage ../development/libraries/czmqpp { - czmq = czmq3; - }; + czmq = callPackage ../development/libraries/czmq/default.nix {}; zmqpp = callPackage ../development/libraries/zmqpp { }; From bdce0b36b28f3750a8993316850ccaadf428a068 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 21:37:50 +0100 Subject: [PATCH 066/211] apt: remove, broken with gcc9 --- pkgs/tools/package-management/apt/default.nix | 55 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 60 deletions(-) delete mode 100644 pkgs/tools/package-management/apt/default.nix diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix deleted file mode 100644 index cbb4ad4591e..00000000000 --- a/pkgs/tools/package-management/apt/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, lib, fetchzip, pkgconfig, cmake, perlPackages, curl, gtest, lzma, bzip2, lz4 -, db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 - -# used when WITH_DOC=ON -, w3m -, doxygen - -# used when WITH_NLS=ON -, gettext - -# opts -, withDocs ? true -, withNLS ? true -}: - -stdenv.mkDerivation rec { - pname = "apt"; - - version = "1.4.6"; - - src = fetchzip { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/apt_${version}.tar.xz"; - sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ - cmake perlPackages.perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin - ] ++ lib.optionals withDocs [ - doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 - ] ++ lib.optionals withNLS [ - gettext - ]; - - preConfigure = '' - cmakeFlagsArray+=( - -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include - -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl - -DROOT_GROUP=root - -DWITH_DOC=${if withDocs then "ON" else "OFF"} - -DUSE_NLS=${if withNLS then "ON" else "OFF"} - ) - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = ""; - homepage = https://launchpad.net/ubuntu/+source/apt; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9109d5da2b..3a7414094fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -744,11 +744,6 @@ in apg = callPackage ../tools/security/apg { }; - apt = callPackage ../tools/package-management/apt { - # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - stdenv = gcc5Stdenv; - }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; autorevision = callPackage ../tools/misc/autorevision { }; From 7b42597a5970d74f6266a5c39769e30e0daabd8a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 22:47:18 +0100 Subject: [PATCH 067/211] ddd: fix build with gcc9 --- pkgs/development/tools/misc/ddd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index c51a5f50474..1ff96918766 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc44.patch ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + meta = { homepage = https://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; From bb8ee954bedc94f237d67e8c7e14302a471eb165 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 22:52:17 +0100 Subject: [PATCH 068/211] facter: fix build with gcc9 --- pkgs/tools/system/facter/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ad90a52a5bd..bd58dbf6e12 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -14,11 +14,13 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; - cmakeFlags = [ + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; From 0b6bb60f62a4f103d07faea7d83ea293730db195 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 23:06:05 +0100 Subject: [PATCH 069/211] ortp: fix build with gcc9 --- pkgs/development/libraries/ortp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 58f355b27fe..8510e897332 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; From 6c3f824540ce27903617be3c81dea8d4b2df5b3e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 23:07:58 +0100 Subject: [PATCH 070/211] minisat: fix build with gcc9 --- pkgs/applications/science/logic/minisat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 34051a1da40..0c4a8a156ed 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { [ ./darwin.patch ] ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + buildInputs = [ zlib ]; preBuild = "cd simp"; From 00ba80161c618f2185a4a5ba1b3286bb34596c48 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 Nov 2019 23:10:57 +0100 Subject: [PATCH 071/211] qmediathekview: fix build with gcc9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a7414094fb..850af6d96ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20503,7 +20503,9 @@ in qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { + boost = boost17x; + }; qmetro = callPackage ../applications/misc/qmetro { }; From 7dc03548d1d614c329622c4a7c644f1a44cc6d98 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 00:24:59 +0100 Subject: [PATCH 072/211] gfortran: bump to 9 --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 850af6d96ac..9bb3cfd2300 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7852,7 +7852,7 @@ in })); # Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8. - gfortran = if stdenv.isDarwin then gfortran7 else gfortran8; + gfortran = if stdenv.isDarwin then gfortran7 else gfortran9; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -7902,6 +7902,14 @@ in profiledCompiler = false; }); + gfortran9 = wrapCC (gcc9.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; From f1015975274282ee2636a459b0b8672ce89c37b4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 00:49:05 +0100 Subject: [PATCH 073/211] openimageio: 1.8.16 -> 1.8.17 --- pkgs/applications/graphics/openimageio/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 7225efadebd..c743f8bd653 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "1.8.16"; + version = "1.8.17"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps"; + sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bb3cfd2300..0f482a1e9f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20194,9 +20194,7 @@ in openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { - stdenv = gcc6Stdenv; - }; + openimageio = callPackage ../applications/graphics/openimageio { }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; From 1b6e97e82b25d9c120cecac98e9034764b70e36b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 00:49:42 +0100 Subject: [PATCH 074/211] qt511.qtbase: fix build with gcc9 --- pkgs/development/libraries/qt-5/5.11/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index e22dc4dbae3..a10c50c9946 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -53,6 +53,10 @@ let qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=a52d7861edfb5956"; + sha256 = "0as047qybh6w9xz2wd569kixwsibj3qid5nkd3l5w5v3lk80af3v"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ From 65debce6004c3f1d60a85289d49d695fbcc1dada Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 00:59:23 +0100 Subject: [PATCH 075/211] rocksdb: fix build with gcc9 --- pkgs/development/libraries/rocksdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index ab2d7778051..60b02a13cb7 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " ''; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; + cmakeFlags = [ "-DPORTABLE=1" "-DWITH_JEMALLOC=0" From 50dad9e873d5ee60f008ab0d415afde7b4f3acdd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:01:15 +0100 Subject: [PATCH 076/211] xen_4_10: fix build with gcc9 --- pkgs/applications/virtualization/xen/4.10.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index d3c2ed9060c..92df54d6e83 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -156,6 +156,10 @@ callPackage (import ./generic.nix (rec { "-Wno-error=stringop-truncation" "-Wno-error=format-truncation" "-Wno-error=array-bounds" + # Fix build with GCC 9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=absolute-value" ]; postPatch = '' From 1ba64dad7c7b29a03ace672b2ff1a01343e853fe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:01:30 +0100 Subject: [PATCH 077/211] xen_4_8: fix build with gcc9 --- pkgs/applications/virtualization/xen/4.8.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index c7568d99062..822575d85b9 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -175,6 +175,10 @@ callPackage (import ./generic.nix (rec { "-Wno-error=stringop-truncation" "-Wno-error=format-truncation" "-Wno-error=array-bounds" + # Fix build with GCC9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=absolute-value" ]; postPatch = '' From cdccbcdf532ec776562fa81e1c791637775a34b5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:14:00 +0100 Subject: [PATCH 078/211] thunderbird: fix build with gcc9 --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index cdf2769c27e..0f4679a4223 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -108,6 +108,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + hardeningDisable = [ "format" ]; + preConfigure = '' cxxLib=$( echo -n ${gcc}/include/c++/* ) From 771257c95d9bb692cc9ca855b7ab83ff415cb633 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:36:53 +0100 Subject: [PATCH 079/211] shogun: build with gcc8 since it fails with gcc9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32433442739..3047cde885b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20031,7 +20031,9 @@ in libmlt = mlt; }; - shogun = callPackage ../applications/science/machine-learning/shogun { }; + shogun = callPackage ../applications/science/machine-learning/shogun { + stdenv = gcc8Stdenv; + }; sky = callPackage ../applications/networking/instant-messengers/sky {}; From a2ab758457c4433d91ef98177f1a5f2e9b3b1cd2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:55:18 +0100 Subject: [PATCH 080/211] dpdk: fix build with gcc9 --- pkgs/os-specific/linux/dpdk/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 9a74b0bb4a8..0c7e2566f00 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -21,8 +21,12 @@ in stdenv.mkDerivation rec { RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; - # we need sse3 instructions to build - NIX_CFLAGS_COMPILE = [ "-msse3" ]; + NIX_CFLAGS_COMPILE = [ + # we need sse3 instructions to build + "-msse3" + # gcc9 compatibility + "-Wno-error=address-of-packed-member" + ]; hardeningDisable = [ "pic" ]; postPatch = '' From d98aee819fd2a7593f26ec7a65deff379c0f4554 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 01:55:45 +0100 Subject: [PATCH 081/211] linuxPackages.perf: fix build with gcc9 --- pkgs/os-specific/linux/kernel/perf.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 1e5c987d508..21615f62a3d 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -50,10 +50,7 @@ stdenv.mkDerivation { "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" - ] - # gcc before 6 doesn't know these options - ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ - "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" + "-Wno-error=stringop-truncation" ]; doCheck = false; # requires "sparse" From 18ab125e83b690cd154b3255d7ee5b9494e8f771 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 02:01:18 +0100 Subject: [PATCH 082/211] minisatUnstable: fix build with gcc9 --- pkgs/applications/science/logic/minisat/unstable.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix index ef46c694acb..99df32c9363 100644 --- a/pkgs/applications/science/logic/minisat/unstable.nix +++ b/pkgs/applications/science/logic/minisat/unstable.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq"; }; + NIX_CFLAGS_COMPILE = "-fpermissive"; + buildInputs = [ zlib ]; nativeBuildInputs = [ cmake ]; From ebe223f81695505272e69d8c4ac520ffdd34414c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 08:59:28 +0100 Subject: [PATCH 083/211] audiofile: fix build with gcc9 --- pkgs/development/libraries/audiofile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 2ae0782941d..680b585643b 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; # fix build with gcc9 - NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc_s"; + NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc"; patches = [ ./gcc-6.patch From abec42e8ebdaca6ec116935d42dc6d6cdbb1ad59 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 09:26:09 +0100 Subject: [PATCH 084/211] rubyPackages.grpc: fix build with gcc9 --- pkgs/development/ruby-modules/gem-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d8c3d484f43..0e4260b6e2d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -249,6 +249,7 @@ in "-Wno-error=class-memaccess" "-Wno-error=ignored-qualifiers" "-Wno-error=tautological-compare" + "-Wno-error=stringop-truncation" ]; dontBuild = false; postPatch = '' From f7ba4a807fefbcdc61f3fb8f44aed0c1689cf2ff Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 09:29:10 +0100 Subject: [PATCH 085/211] fwupdate: fix build with gcc9 --- pkgs/os-specific/linux/firmware/fwupdate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 70a0bdbe240..60b87d2dd9a 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { ./do-not-create-sharedstatedir.patch ]; - NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ]; + NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" "-Wno-error=address-of-packed-member" ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "stackprotector" ]; From efeae34a348d3cf84ada704f61bcb564e50238cb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 19:08:18 +0100 Subject: [PATCH 086/211] llvm_5: fix build with gcc9 --- .../compilers/llvm/5/fix-gcc9.patch | 33 +++++++++++++++++++ pkgs/development/compilers/llvm/5/llvm.nix | 7 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/compilers/llvm/5/fix-gcc9.patch diff --git a/pkgs/development/compilers/llvm/5/fix-gcc9.patch b/pkgs/development/compilers/llvm/5/fix-gcc9.patch new file mode 100644 index 00000000000..eaf71f1468d --- /dev/null +++ b/pkgs/development/compilers/llvm/5/fix-gcc9.patch @@ -0,0 +1,33 @@ +diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp +index f79cb0e6..c6279046 100644 +--- a/lib/Target/Mips/MipsFastISel.cpp ++++ b/lib/Target/Mips/MipsFastISel.cpp +@@ -70,6 +70,7 @@ + #include + #include + #include ++#include + + #define DEBUG_TYPE "mips-fastisel" + +@@ -1309,13 +1310,13 @@ bool MipsFastISel::fastLowerArguments() { + return false; + } + +- const ArrayRef GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, +- Mips::A3}; +- const ArrayRef FGR32ArgRegs = {Mips::F12, Mips::F14}; +- const ArrayRef AFGR64ArgRegs = {Mips::D6, Mips::D7}; +- ArrayRef::iterator NextGPR32 = GPR32ArgRegs.begin(); +- ArrayRef::iterator NextFGR32 = FGR32ArgRegs.begin(); +- ArrayRef::iterator NextAFGR64 = AFGR64ArgRegs.begin(); ++ std::array GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, ++ Mips::A3}}; ++ std::array FGR32ArgRegs = {{Mips::F12, Mips::F14}}; ++ std::array AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; ++ auto NextGPR32 = GPR32ArgRegs.begin(); ++ auto NextFGR32 = FGR32ArgRegs.begin(); ++ auto NextAFGR64 = AFGR64ArgRegs.begin(); + + struct AllocatedReg { + const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2fe7df7695b..a99b3fa96ae 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -49,6 +49,13 @@ stdenv.mkDerivation ({ name = "llvm-gcc8-type-mismatch.patch"; sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; }) + ./fix-gcc9.patch + #(fetchpatch { + # name = "llvm-fix-gcc9.patch"; + # url = "https://reviews.llvm.org/file/data/zs3ck5ryvc5n672fd2kw/PHID-FILE-byoqefzwmkd7qnlip4v2/file"; + # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; + # stripLen = 1; + #}) ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ From 4cbe75c067a4413cc3c396d88721b6ad02210899 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Nov 2019 19:08:32 +0100 Subject: [PATCH 087/211] llvm_4: fix build with gcc9 --- .../compilers/llvm/4/fix-gcc9.patch | 33 +++++++++++++++++++ pkgs/development/compilers/llvm/4/llvm.nix | 7 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/compilers/llvm/4/fix-gcc9.patch diff --git a/pkgs/development/compilers/llvm/4/fix-gcc9.patch b/pkgs/development/compilers/llvm/4/fix-gcc9.patch new file mode 100644 index 00000000000..8ea5ca97085 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/fix-gcc9.patch @@ -0,0 +1,33 @@ +diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp +index f79cb0e6..c6279046 100644 +--- a/lib/Target/Mips/MipsFastISel.cpp ++++ b/lib/Target/Mips/MipsFastISel.cpp +@@ -32,6 +32,7 @@ + #include "llvm/MC/MCSymbol.h" + #include "llvm/Target/TargetInstrInfo.h" + #include "llvm/Support/Debug.h" ++#include + + #define DEBUG_TYPE "mips-fastisel" + +@@ -1268,13 +1269,13 @@ bool MipsFastISel::fastLowerArguments() { + return false; + } + +- const ArrayRef GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, +- Mips::A3}; +- const ArrayRef FGR32ArgRegs = {Mips::F12, Mips::F14}; +- const ArrayRef AFGR64ArgRegs = {Mips::D6, Mips::D7}; +- ArrayRef::iterator NextGPR32 = GPR32ArgRegs.begin(); +- ArrayRef::iterator NextFGR32 = FGR32ArgRegs.begin(); +- ArrayRef::iterator NextAFGR64 = AFGR64ArgRegs.begin(); ++ std::array GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, ++ Mips::A3}}; ++ std::array FGR32ArgRegs = {{Mips::F12, Mips::F14}}; ++ std::array AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; ++ auto NextGPR32 = GPR32ArgRegs.begin(); ++ auto NextFGR32 = FGR32ArgRegs.begin(); ++ auto NextAFGR64 = AFGR64ArgRegs.begin(); + + struct AllocatedReg { + const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index ac5dcbe6b94..c443303f373 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -52,6 +52,13 @@ stdenv.mkDerivation ({ url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; }) + ./fix-gcc9.patch + (fetchpatch { + name = "llvm4-avoid-undefined-behavior-in-unittest.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/D32089-Avoid-undefined-behavior-in-unittest.patch?h=llvm40&id=f459b0bad8aa3b94bc2733d79d176071a32846a6"; + sha256 = "0x5q6a8lk6xg4ns4qh75fxvvmfnifwvyrq17ck85q8c0753i1irf"; + extraPrefix = ""; + }) ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks From 34a69b9aec30af79b67a29ba80c065c0b3b63669 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 6 Nov 2019 16:39:47 +0100 Subject: [PATCH 088/211] mediastreamer: fix build with gcc9 --- pkgs/development/libraries/mediastreamer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 93e73a44bc9..b482176ff29 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { "-DGIT_VERSION=\"v2.14.0\"" "-Wno-error=deprecated-declarations" "-Wno-error=cast-function-type" + "-Wno-error=stringop-truncation" + "-Wno-error=stringop-overflow" ]; NIX_LDFLAGS = "-lXext -lssl"; From 00c0eb0026ad5db1fe70cff119509c728a489dc5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 00:01:53 +0100 Subject: [PATCH 089/211] hybridreverb2: build with gcc8 The bundled JUCE library fails to build with gcc9. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3047cde885b..470d794dd94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3961,7 +3961,9 @@ in hwinfo = callPackage ../tools/system/hwinfo { }; - hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { + stdenv = gcc8Stdenv; + }; hylafaxplus = callPackage ../servers/hylafaxplus { }; From cf824d6096467e98d46ad1fe6945518802bfe9cf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 00:50:01 +0100 Subject: [PATCH 090/211] adlplug: fix build with gcc9 --- pkgs/applications/audio/adlplug/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 631e0c9cca5..bc626cbad11 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, fetchpatch , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch"; + sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy"; + extraPrefix = "thirdparty/JUCE/"; + stripLen = 1; + }) + ]; + cmakeFlags = [ adlplugChip ]; buildInputs = [ From f25479114f3750a8deeac3745d3b9f354b575f36 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 01:04:17 +0100 Subject: [PATCH 091/211] pythonPackages.numcodecs: build with gcc8 --- pkgs/development/python-modules/numcodecs/default.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 775cfeded8b..f2ce5248b55 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -7,6 +7,7 @@ , msgpack , pytest , python +, gcc8 }: buildPythonPackage rec { @@ -21,6 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm cython + gcc8 ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c38b47576a..1c782e8f94b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4075,7 +4075,9 @@ in { numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { }; + numcodecs = callPackage ../development/python-modules/numcodecs { + inherit (pkgs) gcc8; + }; numexpr = callPackage ../development/python-modules/numexpr { }; From e9eb9ebad3849e56201446fcbf9e6fa0105d5dc3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 01:09:08 +0100 Subject: [PATCH 092/211] appleseed: fix build with gcc9 --- pkgs/tools/graphics/appleseed/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index d7603c42fca..d45c28528e7 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { "-Wno-error=class-memaccess" "-Wno-error=maybe-uninitialized" "-Wno-error=catch-value" + "-Wno-error=stringop-truncation" ]; cmakeFlags = [ From 095f2b9805552b166bdd3d84a9b066efdfdb94c7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 01:54:33 +0100 Subject: [PATCH 093/211] helm: build with gcc8 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470d794dd94..3c19b98c28d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24306,7 +24306,9 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { }; + helm = callPackage ../applications/audio/helm { + stdenv = gcc8Stdenv; + }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; From ef4c3a352b4e513cd33ca195e158ea79d318a00f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 02:02:12 +0100 Subject: [PATCH 094/211] zookeeper_mt: fix build with gcc9 --- pkgs/development/libraries/zookeeper_mt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 4f69c1c8079..e016bf95339 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ]; buildInputs = [ zookeeper bash ]; From 8162d6c037ff6439903a6027669f5ad01309dc38 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 15:03:59 +0100 Subject: [PATCH 095/211] bibletime: 2.10.1 -> 2.11.2 --- pkgs/applications/misc/bibletime/default.nix | 25 +++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index a3f0a3b84f2..a467a7eff9b 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,28 +1,25 @@ -{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}: +{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +, qtbase, qttools, qtsvg, qtwebkit +}: stdenv.mkDerivation rec { - version = "2.10.1"; + version = "2.11.2"; pname = "bibletime"; src = fetchurl { url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; - sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; + sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - prePatch = '' - patchShebangs .; - ''; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + sword boost clucene_core + qtbase qttools qtsvg qtwebkit + ]; - preConfigure = '' - export CLUCENE_HOME=${clucene_core}; - export SWORD_HOME=${sword}; - ''; - - buildInputs = [ cmake sword qt4 boost clucene_core ]; - - cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" ]; meta = { description = "A Qt4 Bible study tool"; From 602bccd1a8262d4e6bd787838d21fc3c2c1c50ba Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 7 Nov 2019 15:09:08 +0100 Subject: [PATCH 096/211] qpid-cpp: 1.37.0 -> 1.39.0, fix build with gcc9 --- pkgs/servers/amqp/qpid-cpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index c63b234031b..d799b3292c5 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -2,11 +2,11 @@ let name = "qpid-cpp-${version}"; - version = "1.37.0"; + version = "1.39.0"; src = fetchurl { url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz"; - sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb"; + sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r"; }; meta = with stdenv.lib; { @@ -40,6 +40,7 @@ let "-Wno-error=unused-function" "-Wno-error=ignored-qualifiers" "-Wno-error=catch-value" + "-Wno-error=deprecated-copy" ]; }; From a03e68d593e691666906a4243cf1e43e001480ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 29 Nov 2019 04:20:00 -0500 Subject: [PATCH 097/211] giflib: fix dylib names on Darwin --- pkgs/development/libraries/giflib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 5d7b95136dd..e2ff96d366a 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: +{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' ''; + nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { From edc19bae635dbae5646bb0f0d1c4988c78cb17b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Nov 2019 07:53:56 -0800 Subject: [PATCH 098/211] sord: 0.16.2 -> 0.16.4 --- pkgs/development/libraries/sord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index c1c22cb910d..18b9fe0f280 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.2"; + version = "0.16.4"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; + sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi"; }; nativeBuildInputs = [ pkgconfig wafHook ]; From 910feb39aa93988ae34f86bd22663b4ad112e2fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Dec 2019 18:26:55 -0800 Subject: [PATCH 099/211] bubblewrap: 0.3.3 -> 0.4.0 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index e4b27d98dff..8e2ef7c87e1 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.3.3"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; + sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; From 19dd3f947638fd67a18eed4b774a1e695f4aab34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Dec 2019 14:07:29 -0800 Subject: [PATCH 100/211] oniguruma: 6.9.3 -> 6.9.4 --- pkgs/development/libraries/oniguruma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index e9041993657..e4cbfc7f0b4 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.3"; + version = "6.9.4"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "0wzmqpjmxpryk83acbyhl9gwgm43ixbwraga2g5li9kx88mv4k0n"; + sha256 = "11imbhj4p5w8lvrmcczccm1zq014h9j85r51z2ibb8jhf5p3lslh"; }; nativeBuildInputs = [ cmake ]; From eb7e9f0a5b56dfe21c04b9b921562ac40f109904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 16 Dec 2019 03:51:49 +0100 Subject: [PATCH 101/211] srt: 1.4.0 -> 1.4.1 --- pkgs/development/libraries/srt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index cf8bffe0736..953ba9484fa 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1rmswx4x3p9pdgnd7vvl3vwgh9rynakjhv1mipy2yid5rb61ajlj"; + sha256 = "01xaq44j95kbgqfl41pnybvqy0yq6wd4wdw88ckylzf0nzp977xz"; }; nativeBuildInputs = [ cmake ]; From 832cf092c721a4f4d42c22398fd78ae07eb80c29 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 18 Dec 2019 16:08:23 +0100 Subject: [PATCH 102/211] scons: 3.1.1 -> 3.1.2 Announcement: https://scons.org/scons-312-is-available.html Changelog: https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 1655c154d4e..0afe2fbe928 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.1.1"; - sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc"; + version = "3.1.2"; + sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }; } From 41a48b589512c4527bd6a033c777831bfdff4cc5 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Thu, 19 Dec 2019 09:41:45 -0500 Subject: [PATCH 103/211] tcl: fix dangling symlink --- pkgs/development/interpreters/tcl/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 3c585c3f07f..fd84d93ba75 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -31,10 +31,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; - postInstall = '' + postInstall = let + dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + in '' make install-private-headers ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}.so $out/lib/libtcl.so + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} ''; meta = with stdenv.lib; { From ad733b55050f236b110bbcdf28fc206db7d50558 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 17:37:02 +0100 Subject: [PATCH 104/211] python37: 3.7.5 -> 3.7.6 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ae0ecbf08e7..396ec696042 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -92,10 +92,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "5"; + patch = "6"; suffix = ""; }; - sha256 = "154xc6dxww21qkmphg66pfks8987a17cl3vqq5g4hv1xkzm7cnp8"; + sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; inherit (darwin) CF configd; inherit passthruFun; }; From 6dadfaa1973bfbfc9291cf98d50a92e6769880b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 19:30:56 +0100 Subject: [PATCH 105/211] pythonPackages.pybind11: cleanup recipe --- pkgs/development/python-modules/pybind11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 0f386a7c42f..442e6e70018 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cmakeFlags = [ "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - ] ++ lib.optionals (!python.isPy2) [ + ] ++ lib.optionals (python.isPy3k) [ # Enable some tests only on Python 3. The "test_string_view" test # 'testTypeError: string_view16_chars(): incompatible function arguments' # fails on Python 2. @@ -50,8 +50,8 @@ buildPythonPackage rec { popd ''; - installCheckTarget = "pytest"; - doInstallCheck = true; + doCheck = true; + checkInputs = [ pytest numpy From 9b0b85345ce982426d6d16f086c06eb174d9a024 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 19:57:42 +0100 Subject: [PATCH 106/211] pythonPackages.pybind11: hardcode include directory --- .../0001-Find-include-directory.patch | 53 +++++++++++++++++++ .../python-modules/pybind11/default.nix | 10 +++- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch diff --git a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch new file mode 100644 index 00000000000..d5b669dab7a --- /dev/null +++ b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch @@ -0,0 +1,53 @@ +From a027e2590d5d2d384d23568a8d47b7095054b6b7 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Thu, 19 Dec 2019 19:51:07 +0100 +Subject: [PATCH] Find include directory + +--- + pybind11/__init__.py | 33 +-------------------------------- + 1 file changed, 1 insertion(+), 32 deletions(-) + +diff --git a/pybind11/__init__.py b/pybind11/__init__.py +index c625e8c..c8a707b 100644 +--- a/pybind11/__init__.py ++++ b/pybind11/__init__.py +@@ -2,35 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse + + + def get_include(user=False): +- from distutils.dist import Distribution +- import os +- import sys +- +- # Are we running in a virtual environment? +- virtualenv = hasattr(sys, 'real_prefix') or \ +- sys.prefix != getattr(sys, "base_prefix", sys.prefix) +- +- # Are we running in a conda environment? +- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) +- +- if virtualenv: +- return os.path.join(sys.prefix, 'include', 'site', +- 'python' + sys.version[:3]) +- elif conda: +- if os.name == 'nt': +- return os.path.join(sys.prefix, 'Library', 'include') +- else: +- return os.path.join(sys.prefix, 'include') +- else: +- dist = Distribution({'name': 'pybind11'}) +- dist.parse_config_files() +- +- dist_cobj = dist.get_command_obj('install', create=True) +- +- # Search for packages in user's home directory? +- if user: +- dist_cobj.user = user +- dist_cobj.prefix = "" +- dist_cobj.finalize_options() +- +- return os.path.dirname(dist_cobj.install_headers) ++ return "@include@" +-- +2.23.0 + diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 442e6e70018..76e60fda86a 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -39,6 +39,14 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; + patches = [ + ./0001-Find-include-directory.patch + ]; + + postPatch = '' + substituteInPlace pybind11/__init__.py --subst-var-by include "$out/include" + ''; + preFixup = '' pushd .. export PYBIND11_USE_CMAKE=1 @@ -50,8 +58,6 @@ buildPythonPackage rec { popd ''; - doCheck = true; - checkInputs = [ pytest numpy From 9099c7e45698f43f22289096a6d50bce81c6ecb8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 19:31:15 +0100 Subject: [PATCH 107/211] pythonPackages.scipy: 1.3.3 -> 1.4.1 --- .../python-modules/scipy/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 682d70df393..6c62adb7821 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,17 +1,24 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, pybind11}: -buildPythonPackage rec { +let + pybind = pybind11.overridePythonAttrs(oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + }); +in buildPythonPackage rec { pname = "scipy"; - version = "1.3.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "64bf4e8ae0db2d42b58477817f648d81e77f0b381d0ea4427385bba3f959380a"; + sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"; }; checkInputs = [ nose pytest ]; nativeBuildInputs = [ gfortran ]; - buildInputs = [ numpy.blas ]; + buildInputs = [ numpy.blas pybind ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper @@ -19,9 +26,7 @@ buildPythonPackage rec { rm scipy/linalg/tests/test_lapack.py ''; - # INTERNALERROR, solved with https://github.com/scipy/scipy/pull/8871 - # however, it does not apply cleanly. - doCheck = false; + doCheck = true; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py From dfee92cd2e8a904dec4e50bef20dd1159f323511 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 26 Nov 2019 21:45:58 +0100 Subject: [PATCH 108/211] cmake: 3.15.4 -> 3.16.2 --- .../build-managers/cmake/application-services.patch | 4 ++-- .../tools/build-managers/cmake/default.nix | 12 +++--------- .../cmake/libuv-application-services.patch | 4 ++-- .../tools/build-managers/cmake/setup-hook.sh | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 0373ca2d67c..e0399d0a6c6 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -23,12 +23,12 @@ index e353a37..b06f842 100644 struct cmLinkImplementation; --#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__) +-#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) -# define HAVE_APPLICATION_SERVICES -# include -#endif - - #if defined(CMAKE_BUILD_WITH_CMAKE) + #if !defined(CMAKE_BOOTSTRAP) # include "cmXMLParser.h" diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 37a44f15e9c..93e75a855d3 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.15.5"; + version = "3.16.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"; + sha256 = "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc"; }; patches = [ @@ -37,12 +37,6 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - # Fix for harfbuzz with pango versions > 1.43. - # Should be removed with cmake >= 3.16 - (fetchpatch { - url = "https://gitlab.kitware.com/cmake/cmake/commit/effafca77eacbb4988006b1f3f4d9154df6c33f8.diff"; - sha256 = "0vxam5kka1dffygp1nd0g21ib9qk8kds8iprbfga2gimzyrlfmfr"; - }) ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch index c5b9cdff1d0..eb3df1e4ff6 100644 --- a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch @@ -31,8 +31,8 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched #include "uv.h" #include "internal.h" --#if TARGET_OS_IPHONE -+#if !HAVE_CORESERVICES_CORESERVICES_H +-#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 ++#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 52b9c3ab5f5..6f3d33bcaa7 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -96,8 +96,8 @@ cmakeConfigurePhase() { # and unecessary attempts to access non-existent home folder # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags" if [ "${buildPhase-}" = ninjaBuildPhase ]; then cmakeFlags="-GNinja $cmakeFlags" From 5e56f4e19c1d29d3954aa5bd5b450f99406ac59e Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 20 Dec 2019 16:11:05 +0100 Subject: [PATCH 109/211] quickder: cleanup expression --- pkgs/development/libraries/quickder/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 14bfd40a593..529d361f206 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python2Packages, hexio -, which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: +, cmake, bash, arpa2cm, git, asn2quickder }: stdenv.mkDerivation rec { pname = "quickder"; @@ -12,20 +12,17 @@ stdenv.mkDerivation rec { repo = "quick-der"; }; + nativeBuildInputs = [ cmake ]; + buildInputs = with python2Packages; [ arpa2cm asn1ate - bash - cmake - git hexio pyparsing python six - which asn1ate asn2quickder - pkgconfig ]; postPatch = '' @@ -39,9 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNO_TESTING=ON" "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" - "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" - "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" - "-DPACKAGE_NO_PACKAGE_REGISTRY=ON" ]; preConfigure = '' From e0aee503b674b63999a7245a5dfe6e14d81fed3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 04:08:52 -0800 Subject: [PATCH 110/211] glib-networking: 2.62.1 -> 2.62.2 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 802a18dfda5..63a773522a0 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.62.1"; + version = "2.62.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "043imcynl3rwdz79wvpdfhkmqmgdhr34z0vac3x7jymdf5kswm9w"; + sha256 = "0i2mw75297ql72h47vyvff3hqa0kcmqybblj52fqrarb0kfbhi06"; }; patches = [ From 5a2c8eb61c9872f4545ebcb0140837748e0e8c94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 06:08:55 -0800 Subject: [PATCH 111/211] glib: 2.62.3 -> 2.62.4 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 706e99179f5..67d3c35609e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.3"; + version = "2.62.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i2mlrd351dnmpfi465qmx9rhgyff01j29a2x3lczzyky34ss024"; + sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c"; }; patches = optionals stdenv.isDarwin [ From b0633406cb70e0e4ae3470a6b49e32b38d99ac16 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Dec 2019 17:16:16 +0100 Subject: [PATCH 112/211] python.pkgs.wrapPython: fix makeWrapperArgs When `makeWrapperArgs` is a Bash array, we only passed the first item to `wrapProgram`. We need to use `"${makeWrapperArgs[@]}"` to extract all the items. But that breaks the common string case so we need to handle that case separately. --- pkgs/development/interpreters/python/wrap.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index b2d65422db4..4def461c938 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -78,7 +78,16 @@ wrapPythonProgramsIn() { # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" + local -a user_args + # We need to support both the case when makeWrapperArgs + # is an array and a IFS-separated string. + # TODO: remove the string branch when __structuredAttrs are used. + if [[ "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then + user_args=("${makeWrapperArgs[@]}") + else + user_args="($makeWrapperArgs)" + fi + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") wrapProgram "${wrapProgramArgs[@]}" fi From 674520d607c2166ad2810d062b9ae6f6c267df58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 09:52:44 -0800 Subject: [PATCH 113/211] libical: 3.0.6 -> 3.0.7 --- pkgs/development/libraries/libical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 903a1a26eb7..69c4b3aeb74 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.6"; + version = "3.0.7"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "181lf07fj36fp0rbcjjmb53yzdvv9i4qxpnbpax8hayjhha8pjh3"; + sha256 = "1ppf8jlpiclq3jprhx889y5lgf6lc2q4d8wy2zavzsxgnsqf67il"; }; nativeBuildInputs = [ From 9e7c0922fdbc38175e4d7f3d126d5ece59dc2a5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 10:02:41 -0800 Subject: [PATCH 114/211] libheif: 1.6.0 -> 1.6.1 --- pkgs/development/libraries/libheif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 85174e9c3e6..a6e072ef76f 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0im9k2pqghlsppj165kh3nc26c4wx1brckmncdmpy0mcj56jjmba"; + sha256 = "0l3mj11lp4974kaym3aidm4wriqzls13gz22s67l6341yhsc42n6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From b1f493f5880e8e4da12ad9a7f737aa357408df2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 10:19:48 -0800 Subject: [PATCH 115/211] libde265: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/libde265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 3c31ba805d8..918f7675389 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "049g77f6c5sbk1h534zi9akj3y5h8zwnca5c9kqqjkn7f17irk10"; + sha256 = "0svxrhh1pv7xpj75svz0iw1sq5i6z2grj7sc3q11hl63666hzh7d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From b0d4ce6c900a200bbbae75fb68c39d527848f3b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 10:23:20 -0800 Subject: [PATCH 116/211] libev: 4.27 -> 4.31 --- pkgs/development/libraries/libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 56710945ecb..42d3b943569 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libev"; - version="4.27"; + version="4.31"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; - sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; + sha256 = "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd"; }; meta = { From 753c6417a92525168dcd667ec0f48d354d04cf37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 13:35:21 -0800 Subject: [PATCH 117/211] libmbim: 1.20.2 -> 1.20.4 --- pkgs/development/libraries/libmbim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 46255e276f5..a49e0eaaac6 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.20.2"; + version = "1.20.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm"; + sha256 = "1s6k6vm4hyma7nafm1gjssl9lq9nkkiska462xpiz7xh16j0h9xc"; }; outputs = [ "out" "dev" "man" ]; From 3923fbd34b96acfa0ae32a06f111224e0a1ff618 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Dec 2019 07:34:36 -0800 Subject: [PATCH 118/211] rdma-core: 26.1 -> 27.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 2162db25c86..b16b230ce27 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "26.1"; + version = "27.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1zb1y70ff8yy7rdl4gh2jx1gpja5hrbsh8gfi9fsxkz2rv1234r0"; + sha256 = "04mhcrcmbwxcjhswlkhnr6m5nl2389jgjv6aqhd4v0x555cwnfvw"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; From e82fae1a39a808fd541f556f9ff12ad314c18e44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Dec 2019 14:09:09 +0100 Subject: [PATCH 119/211] rustc: 1.39 -> 1.40 --- pkgs/development/compilers/rust/1_39_0.nix | 21 ---------------- pkgs/development/compilers/rust/1_40_0.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++--- 3 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/compilers/rust/1_39_0.nix create mode 100644 pkgs/development/compilers/rust/1_40_0.nix diff --git a/pkgs/development/compilers/rust/1_39_0.nix b/pkgs/development/compilers/rust/1_39_0.nix deleted file mode 100644 index cc07590dedc..00000000000 --- a/pkgs/development/compilers/rust/1_39_0.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./default.nix { - rustcVersion = "1.39.0"; - rustcSha256 = "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.38.0"; - - # fetch hashes by running `print-hashes.sh 1.38.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af"; - x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221"; - arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a"; - armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4"; - aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda"; - i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8"; - x86_64-apple-darwin = "bd301b78ddcd5d4553962b115e1dca5436dd3755ed323f86f4485769286a8a5a"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_39_0; -} diff --git a/pkgs/development/compilers/rust/1_40_0.nix b/pkgs/development/compilers/rust/1_40_0.nix new file mode 100644 index 00000000000..2280605439f --- /dev/null +++ b/pkgs/development/compilers/rust/1_40_0.nix @@ -0,0 +1,29 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# 3. Firefox and Thunderbird should still build on x86_64-linux. +import ./default.nix { + rustcVersion = "1.40.0"; + rustcSha256 = "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.39.0"; + + # fetch hashes by running `print-hashes.sh 1.39.0` + bootstrapHashes = { + i686-unknown-linux-gnu = "36e31b3069c5be4b1fe3c8f7588ca787f13f91ab7170d2b24c6b07285816d0e5"; + x86_64-unknown-linux-gnu = "b10a73e5ba90034fe51f0f02cb78f297ed3880deb7d3738aa09dc5a4d9704a25"; + arm-unknown-linux-gnueabihf = "ea08d78a718cd34e67733526c70f3be460605dec8284bdeda36e0c6dd6222eca"; + armv7-unknown-linux-gnueabihf = "41186745a97e6b76fb7a3a049882fb4869b526e98a66c05a133518515037f0d7"; + aarch64-unknown-linux-gnu = "e27dc8112fe577012bd88f30e7c92dffd8c796478ce386c49465c03b6db8209f"; + i686-apple-darwin = "0ada2ed87cc449ed470dce3b57b15bfd5c8c52b01d6116e6b1edc9a3e97836aa"; + x86_64-apple-darwin = "3736d49c5e9592844e1a5d5452883aeaf8f1e25d671c1bc8f01e81c1766603b5"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_40_0; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d05944a568f..3df651afce8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8637,17 +8637,17 @@ in inherit (darwin) apple_sdk; }; - rust_1_39_0 = callPackage ../development/compilers/rust/1_39_0.nix { + rust_1_40_0 = callPackage ../development/compilers/rust/1_40_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_39_0; + rust = rust_1_40_0; - rustPackages_1_39_0 = rust_1_39_0.packages.stable; + rustPackages_1_40_0 = rust_1_40_0.packages.stable; rustPackages_1_38_0 = rust_1_38_0.packages.stable; - rustPackages = rustPackages_1_39_0; + rustPackages = rustPackages_1_40_0; inherit (rustPackages) cargo rustc rustPlatform; inherit (rust) makeRustPlatform; From 0c64a9ad5b5dc6b0f1b0a2bf8f6e1d78408c5ba2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 16:24:39 +0100 Subject: [PATCH 120/211] ccrtp_1_8: remove, unmaintained and unused --- pkgs/development/libraries/ccrtp/1.8.nix | 24 ------------------- .../libraries/ccrtp/gcc-4.6-fix.patch | 20 ---------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 46 deletions(-) delete mode 100644 pkgs/development/libraries/ccrtp/1.8.nix delete mode 100644 pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix deleted file mode 100644 index db2d177b710..00000000000 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }: - -stdenv.mkDerivation { - name = "ccrtp-1.8.0"; - - src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-1.8.0.tar.gz; - sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libgcrypt commoncpp2 ]; - - patches = [ ./gcc-4.6-fix.patch ]; - - meta = { - description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; - homepage = https://www.gnu.org/software/ccrtp/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # fails to compile with libgcrypt >= 1.6 - }; -} diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch deleted file mode 100644 index 49d07a89e52..00000000000 --- a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ubr ccrtp-1.8.0-orig/src/ccrtp/sources.h ccrtp-1.8.0/src/ccrtp/sources.h ---- ccrtp-1.8.0-orig/src/ccrtp/sources.h 2010-04-18 20:51:49.000000000 +0200 -+++ ccrtp-1.8.0/src/ccrtp/sources.h 2012-07-07 11:42:50.961179016 +0200 -@@ -45,6 +45,7 @@ - #define CCXX_RTP_SOURCES_H_ - - #include -+#include - #include - - #ifdef CCXX_NAMESPACES -@@ -406,7 +407,7 @@ - public: - typedef std::forward_iterator_tag iterator_category; - typedef Participant value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef const Participant* pointer; - typedef const Participant& reference; - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cdce402c6e..2e71ccc529a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10924,8 +10924,6 @@ in ccrtp = callPackage ../development/libraries/ccrtp { }; - ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; - cctz = callPackage ../development/libraries/cctz { }; celt = callPackage ../development/libraries/celt {}; From c601d7835ff4c3d772d14ac6a46194c3de880483 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 16:25:50 +0100 Subject: [PATCH 121/211] commoncpp2: remove, obsoleted by ucommon --- .../libraries/commoncpp2/default.nix | 38 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/development/libraries/commoncpp2/default.nix diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix deleted file mode 100644 index 0c5ab758583..00000000000 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv }: - -stdenv.mkDerivation rec { - name = "commoncpp2-1.8.1"; - - src = fetchurl { - url = "mirror://gnu/commoncpp/${name}.tar.gz"; - sha256 = "0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk"; - }; - - doCheck = true; - - preBuild = '' - echo '#include ' >> inc/cc++/config.h - ''; - - meta = { - description = "GNU Common C++, a portable, highly optimized C++ class framework"; - - longDescription = - '' GNU Common C++ and GNU uCommon are very portable and highly - optimized class framework for writing C++ applications that need to - use threads and support concurrent sychronization, and that use - sockets, XML parsing, object serialization, thread-optimized String - and data structure classes, etc. This framework offers a class - foundation that hides platform differences from your C++ application - so that you need not write platform specific code. GNU Common C++ - has been ported to compile nativily on most platforms which support - either posix threads, or on maybe be used with Debian hosted mingw32 - to build native threading applications for Microsoft Windows. - ''; - - homepage = https://www.gnu.org/software/commoncpp/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e71ccc529a..4a8f1cbae2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11002,8 +11002,6 @@ in cointop = callPackage ../applications/misc/cointop { }; - commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; - ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; From 9ce51b64bf113132f131008b8e513292348219c3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 16:48:11 +0100 Subject: [PATCH 122/211] sipp: 3.5.1 -> 3.6.0 --- pkgs/development/tools/misc/sipp/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 004975f10d8..eec1f32b4df 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,21 +1,17 @@ -{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }: +{stdenv, fetchurl, ncurses, libpcap }: stdenv.mkDerivation rec { - version = "3.5.1"; + version = "3.6.0"; pname = "sipp"; - src = fetchFromGitHub { - owner = "SIPp"; - repo = "sipp"; - rev = "v${version}"; - sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k"; + src = fetchurl { + url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; }; - patchPhase = '' + postPatch = '' sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp - sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac - echo "#define SIPP_VERSION \"v${version}\"" > include/version.h ''; configureFlags = [ @@ -29,8 +25,6 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { homepage = http://sipp.sf.net; description = "The SIPp testing tool"; From fac07ceb2adb9d336fd5bce1e83dcdb855466df5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 16:52:02 +0100 Subject: [PATCH 123/211] pbis-open: fix build with gcc9 --- pkgs/tools/security/pbis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index ee1282e9a13..176ef7f7616 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir release cd release if [ $CC = gcc ]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member" fi NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" ''; From 5e35713702b326a4a570d2b4f1a0363f2550e4a8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 Dec 2019 17:29:16 +0100 Subject: [PATCH 124/211] bctoolbox: fix build w/gcc9 --- pkgs/development/libraries/bctoolbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index a9d21a1f5a9..1c81dd608cb 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + meta = { inherit version; description = "Utilities library for Linphone"; From d1fa6eae3f2401f21c0fac692dd064b9233308d1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 17:44:13 +0100 Subject: [PATCH 125/211] frostwire-bin: fix src hash --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index c34d766a7e9..d4fbb2ceb59 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "144qmvpnfmlq1xrkbhsjh4ib79gchdcr9pcasmdy1n9hqbk6y4bq"; + sha256 = "0pd9akfq8cx9qkfkzravvrb8pjaxa4b0vgjdwqc1zvkng4wl8848"; }; nativeBuildInputs = [ makeWrapper ]; From 28116453281679c2f896d8521d9bdc9c42ed0f9a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 26 Dec 2019 19:28:06 +0100 Subject: [PATCH 126/211] linuxPackages.usbip: gcc warnings fixed in linux>=5.4 --- pkgs/os-specific/linux/usbip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index f927b4ffc78..f927eaefb4e 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,11 +1,11 @@ -{ stdenv, kernel, udev, autoconf, automake, libtool }: +{ lib, stdenv, kernel, udev, autoconf, automake, libtool }: stdenv.mkDerivation { name = "usbip-${kernel.name}"; src = kernel.src; - patches = [ + patches = lib.optionals (lib.versionAtLeast "5.4" kernel.version) [ # fixes build with gcc8 ./fix-snprintf-truncation.patch # fixes build with gcc9 From 3c00902c71b497c4a52ec3e0c4c47bb20f487bac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 02:56:41 +0100 Subject: [PATCH 127/211] qcdnum: 17-01-13 -> 17-01-15 --- pkgs/development/libraries/physics/qcdnum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 8b002ce8195..e962303f5f0 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "QCDNUM"; - version = "17-01-13"; + version = "17-01-15"; src = fetchurl { url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; + sha256 = "0ibk1sppss45qh0g8i2c99alkx82xdbss3p55f5367bxjx4iqvvg"; }; nativeBuildInputs = [ gfortran ]; From 81248e703c3957da8715d11cf8c8874371955ebd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 02:59:34 +0100 Subject: [PATCH 128/211] xfitter: 2.0.0 -> 2.0.1, fix build w/ gcc9 --- pkgs/applications/science/physics/xfitter/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 2af93961e02..818bea7d0ff 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "xfitter"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { name = "${pname}-${version}.tgz"; url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; - sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515"; + sha256 = "0kmgc67nw5flp92yw5x6l2vsnhwsfi5z2a20404anisdgdjs8zc6"; }; patches = [ ./undefined_behavior.patch ]; - CXXFLAGS = "-Werror=return-type"; + # patch needs to updated due to version bump + #CXXFLAGS = "-Werror=return-type"; preConfigure = # Fix F77LD to workaround for a following build error: From 6d50498b287064bb41dce4f7d1b73c1759963437 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 03:50:41 +0100 Subject: [PATCH 129/211] trx: 2018-01-23 -> 0.4 --- pkgs/tools/audio/trx/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 5d31193ee8d..1d052adbba9 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: +{ stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: -stdenv.mkDerivation { - pname = "trx-unstable"; - version = "2018-01-23"; +stdenv.mkDerivation rec { + pname = "trx"; + version = "0.4"; - src = fetchgit { - url = "http://www.pogo.org.uk/~mark/trx.git"; - rev = "66b4707a24172751a131e24d2a800496c699137f"; - sha256 = "0w0960p25944b30lkc8n4lj14xgsf0fjpmxqwlz2r8wl642bqnfm"; + src = fetchurl { + url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz"; + sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl"; }; buildInputs = [ alsaLib libopus ortp bctoolbox ]; From d80e177a4d5f73529dca6e2d93a8896e7c72e98a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 03:54:09 +0100 Subject: [PATCH 130/211] root5: doesn't build with gcc9 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a8f1cbae2b..5e1db1289bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24325,7 +24325,7 @@ in root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); rink = callPackage ../applications/science/misc/rink { }; From b931ea7e52b2d6b19d4ae45f50cf4b8086015cc2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 03:54:33 +0100 Subject: [PATCH 131/211] belle-sip: doesn't build with gcc9 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e1db1289bb..9841ed47675 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10839,7 +10839,9 @@ in inherit (llvmPackages_6) llvm clang-unwrapped; }; - belle-sip = callPackage ../development/libraries/belle-sip { }; + belle-sip = callPackage ../development/libraries/belle-sip { + stdenv = gcc8Stdenv; + }; libbfd = callPackage ../development/libraries/libbfd { }; From 8e7b127b9503b3fca5055848cb6bfc70b6b7c082 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 03:55:40 +0100 Subject: [PATCH 132/211] go_1_13: doesn't build with gcc9 on aarch64 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9841ed47675..de9046ec266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8231,6 +8231,7 @@ in go_1_13 = callPackage ../development/compilers/go/1.13.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; + stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; }; go = go_1_13; From 9cc67f39f8c7907b57bdf83c5f86d2b011b687a8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:00:24 +0100 Subject: [PATCH 133/211] go_1_12: does't build with gcc9 on aarch64 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de9046ec266..e349fe74426 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8227,6 +8227,7 @@ in go_1_12 = callPackage ../development/compilers/go/1.12.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; + stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; }; go_1_13 = callPackage ../development/compilers/go/1.13.nix { From d9d9d3196f53a07309e5fc21f4e50722909d1e12 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 04:57:58 +0100 Subject: [PATCH 134/211] rocksdb: fix darwin build --- pkgs/development/libraries/rocksdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 3f3b50ea8fe..2d3d1e8d722 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " ''; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" From 66237e1bcadd96a0fc17030798bc5df0067f077b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:08:03 +0100 Subject: [PATCH 135/211] cockroachdb: fix build on darwin --- pkgs/servers/sql/cockroachdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 94acc7ab7bf..6637a75ea2f 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; inherit nativeBuildInputs buildInputs; From 43442880cf6c48fae6e65bb8fdab3717c080a7fb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:12:49 +0100 Subject: [PATCH 136/211] cataclysm-dda: fix build on darwin --- pkgs/games/cataclysm-dda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 9f34c60e16c..ced19bffb31 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (common // rec { substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-copy" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy"; makeFlags = common.makeFlags ++ [ "LUA=1" From ee8cc1c7bacad7975bbdd5fb5fe2fa08fea3524d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:20:36 +0100 Subject: [PATCH 137/211] qpid-cpp: fix build on darwin --- pkgs/servers/amqp/qpid-cpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index d799b3292c5..7d145354b30 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -40,6 +40,7 @@ let "-Wno-error=unused-function" "-Wno-error=ignored-qualifiers" "-Wno-error=catch-value" + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" ]; }; From 6df8e0fa48d4f473e7558adaa9b3a0d53b7a7cdb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Dec 2019 13:42:48 +0100 Subject: [PATCH 138/211] itk4: 4.13.1 -> 4.13.2, doesn't build w/gcc9 --- pkgs/development/libraries/itk/4.x.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index df016d9fcac..7e24ba901e5 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.13.1"; + name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz; - sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e349fe74426..f96e31ed0b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11935,7 +11935,7 @@ in isso = callPackage ../servers/isso { }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { stdenv = gcc8Stdenv; From 8cebd2f6b7a3ca33e5a49ab5b039f0a18050162e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 27 Dec 2019 21:54:57 +0100 Subject: [PATCH 139/211] bees: 0.6.1 -> 0.6.2 fixes build with gcc9 --- pkgs/tools/filesystems/bees/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 94573bcd201..c6bb07e7b87 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -2,8 +2,8 @@ let - version = "0.6.1"; - sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; + version = "0.6.2"; + sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib"; bees = stdenv.mkDerivation { pname = "bees"; From a6bb2ede232940a96150da7207a3ecd15eb6328c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 28 Dec 2019 22:10:28 +0100 Subject: [PATCH 140/211] python.pkgs.wrapPython: fix string makeWrapperArgs Bash takes an assignment of a string to an array variable: local -a user_args user_args="(foo bar)" to mean appending the string to the array, not parsing the string into an array as is the case when on the same line as the declaration: local -a user_args="(foo bar)" b0633406cb70e0e4ae3470a6b49e32b38d99ac16 extracted the declaration before the newly branched code block, causing string makeWrapperArgs being added to the array verbatim. Since local is function scoped, it does not matter if we move it inside each of the branches so we fix it this way. --- pkgs/development/interpreters/python/wrap.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 6beb55f055b..030b3d2b6d8 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -81,14 +81,13 @@ wrapPythonProgramsIn() { # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - local -a user_args # We need to support both the case when makeWrapperArgs # is an array and a IFS-separated string. # TODO: remove the string branch when __structuredAttrs are used. if [[ "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then - user_args=("${makeWrapperArgs[@]}") + local -a user_args=("${makeWrapperArgs[@]}") else - user_args="($makeWrapperArgs)" + local -a user_args="($makeWrapperArgs)" fi local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") From d8562600a5830ce73c83659942a34dae2f71838d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Dec 2019 05:47:50 +0100 Subject: [PATCH 141/211] {ants,vtk}: won't build with gcc9 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f96e31ed0b0..212224f18df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14479,6 +14479,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { + stdenv = gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -23600,7 +23601,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + stdenv = gcc8Stdenv; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; From 6d602ea2e5889f0bcc0270a98b0f570fd76ed12c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 01:53:33 +0100 Subject: [PATCH 142/211] qt48: fix webkit module build --- pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch index 000e345cf13..dfd1d8b893b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -5,7 +5,7 @@ # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 5*|4*|3.4*) -+ 8*|7*|6*|5*|4*|3.4*) ++ 9*|8*|7*|6*|5*|4*|3.4*) ;; 3.3*) canBuildWebKit="no" @@ -14,7 +14,7 @@ COMPILER_VERSION="3.*" ;; - 5*|4.*) -+ 8*|7*|6*|5*|4.*) ++ 9*|8*|7*|6*|5*|4.*) COMPILER_VERSION="4" ;; *) From 2b4e0459d856b7e25d97981658414b4e3c6cf3fe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 01:54:08 +0100 Subject: [PATCH 143/211] ensemble-chorus: doesn't build with gcc9 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212224f18df..2e7121c4b6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3055,7 +3055,7 @@ in enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; entr = callPackage ../tools/misc/entr { }; From 3ff62fe45bf5d99afd25bdd3d70b6fb46e9e795e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 02:15:10 +0100 Subject: [PATCH 144/211] {opal,ptlib,ekiga,sipcmd}: remove unmaintained Were also removed from Debian and Arch and don't build on recent GCC versions anymore. Needed lots of patching anyway. Last release was 2013. --- .../instant-messengers/ekiga/default.nix | 73 --- .../networking/sipcmd/default.nix | 34 -- pkgs/development/libraries/opal/default.nix | 43 -- .../libraries/opal/disable-samples-ftbfs.diff | 14 - pkgs/development/libraries/opal/libav10.patch | 208 ------- pkgs/development/libraries/opal/libav9.patch | 543 ------------------ pkgs/development/libraries/ptlib/default.nix | 59 -- .../ptlib/ptlib-2.10.11-glibc-2.26.patch | 13 - pkgs/top-level/all-packages.nix | 11 - 9 files changed, 998 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ekiga/default.nix delete mode 100644 pkgs/applications/networking/sipcmd/default.nix delete mode 100644 pkgs/development/libraries/opal/default.nix delete mode 100644 pkgs/development/libraries/opal/disable-samples-ftbfs.diff delete mode 100644 pkgs/development/libraries/opal/libav10.patch delete mode 100644 pkgs/development/libraries/opal/libav9.patch delete mode 100644 pkgs/development/libraries/ptlib/default.nix delete mode 100644 pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix deleted file mode 100644 index 9886c2fa2ed..00000000000 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook -, libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret -, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib -, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "ekiga"; - version = "4.0.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b"; - }; - - buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - evolution-data-server gnome-doc-utils avahi - libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.adwaita-icon-theme boost - autoreconfHook pkgconfig libxml2 unixODBC db nspr - nss zlib libsecret libXrandr which libxslt libtasn1 - gmp nettle makeWrapper ] - ++ (with perlPackages; [ perl XMLParser ]); - - preAutoreconf = '' - substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 "" - substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme - ''; - - configureFlags = [ - "--with-ldap-dir=${openldap.dev}" - "--with-libsasl2-dir=${cyrus_sasl.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--disable-gconf" - ]; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch; - sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4"; - }) - (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch; - sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s"; - }) - (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch; - sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz"; - }) - ]; - - postInstall = '' - wrapProgram "$out"/bin/ekiga \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - passthru = { - updateInfo = { - downloadPage = "mirror://gnome/sources/ekiga"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with stdenv.lib; { - description = "VOIP/Videoconferencing app with full SIP and H.323 support"; - homepage = "https://www.ekiga.org/"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} - diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix deleted file mode 100644 index a36c2286956..00000000000 --- a/pkgs/applications/networking/sipcmd/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, opal, ptlib }: - -stdenv.mkDerivation rec { - - rev = "3090e9f"; - - name = "sipcmd-${rev}"; - - src = fetchFromGitHub { - repo = "sipcmd"; - owner = "tmakkonen"; - inherit rev; - sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c"; - }; - - buildInputs = [ opal ptlib ]; - - buildPhase = '' - make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib" - ''; - - installPhase = '' - mkdir -pv $out/bin - cp sipcmd $out/bin/sipcmd - ''; - - meta = { - homepage = https://github.com/tmakkonen/sipcmd; - description = "The command line SIP/H.323/RTP softphone"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; -} - diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix deleted file mode 100644 index dd19fccd822..00000000000 --- a/pkgs/development/libraries/opal/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex, gnome3 -, ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC }: - -stdenv.mkDerivation rec { - pname = "opal"; - version = "3.10.10"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ptlib srtp libtheora speex - ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; - - configureFlags = [ "--enable-h323" ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; - - patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - - meta = with stdenv.lib; { - description = "VoIP library"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - homepage = "http://www.opalvoip.org/"; - license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; -} - diff --git a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff b/pkgs/development/libraries/opal/disable-samples-ftbfs.diff deleted file mode 100644 index 1b073821607..00000000000 --- a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: opal-3.10.4~dfsg/Makefile.in -=================================================================== ---- opal-3.10.4~dfsg.orig/Makefile.in 2012-02-22 10:08:36.000000000 +1100 -+++ opal-3.10.4~dfsg/Makefile.in 2012-03-08 08:32:44.000000000 +1100 -@@ -45,8 +45,7 @@ - samples/codectest \ - samples/callgen \ - samples/opalecho \ -- samples/faxopal \ -- samples/c_api -+ samples/faxopal - ifeq ($(OPAL_IVR),yes) - SUBDIRS += samples/opalmcu \ - samples/ivropal \ diff --git a/pkgs/development/libraries/opal/libav10.patch b/pkgs/development/libraries/opal/libav10.patch deleted file mode 100644 index 3e02704f899..00000000000 --- a/pkgs/development/libraries/opal/libav10.patch +++ /dev/null @@ -1,208 +0,0 @@ -Description: Fix compilation against libav10 -Author: Reinhard Tartler -Bug-Debian: http://bugs.debian.org/739439 - ---- a/plugins/video/H.263-1998/h263-1998.cxx -+++ b/plugins/video/H.263-1998/h263-1998.cxx -@@ -94,7 +94,7 @@ static struct StdSizes { - { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI }, - }; - --static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P); -+static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P); - - - ///////////////////////////////////////////////////////////////////////////// -@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc - PTRACE(4, m_prefix, "Encoder closed"); - } - --bool H263_Base_EncoderContext::Init(CodecID codecId) -+bool H263_Base_EncoderContext::Init(AVCodecID codecId) - { - PTRACE(5, m_prefix, "Opening encoder"); - -@@ -589,7 +589,7 @@ void H263_RFC2190_EncoderContext::RTPCal - - bool H263_RFC2190_EncoderContext::Init() - { -- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263)) -+ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263)) - return false; - - #if LIBAVCODEC_RTP_MODE -@@ -632,7 +632,7 @@ H263_RFC2429_EncoderContext::~H263_RFC24 - - bool H263_RFC2429_EncoderContext::Init() - { -- return H263_Base_EncoderContext::Init(CODEC_ID_H263P); -+ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P); - } - - -@@ -656,7 +656,7 @@ H263_Base_DecoderContext::H263_Base_Deco - if (!FFMPEGLibraryInstance.Load()) - return; - -- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) { -+ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) { - PTRACE(1, m_prefix, "Codec not found for decoder"); - return; - } ---- a/plugins/video/H.264/h264-x264.cxx -+++ b/plugins/video/H.264/h264-x264.cxx -@@ -105,7 +105,7 @@ static struct PluginCodec_information Li - - /////////////////////////////////////////////////////////////////////////////// - --FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264); -+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264); - - PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF - -@@ -1065,17 +1065,17 @@ class MyDecoder : public PluginCodecworkaround_bugs = FF_BUG_AUTODETECT; -- m_context->idct_algo = FF_IDCT_H264; -+ m_context->idct_algo = FF_IDCT_AUTO; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_SKIP_RD | -+ m_context->flags2 = - #ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE - CODEC_FLAG2_DROP_FRAME_TIMECODE | - #endif ---- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -+++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -@@ -205,7 +205,7 @@ const static struct mpeg4_resolution { - { 0 } - }; - --FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4); -+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4); - - - static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen ) -@@ -688,7 +688,7 @@ void MPEG4EncoderContext::ResizeEncoding - - bool MPEG4EncoderContext::OpenCodec() - { -- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -+ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){ - PTRACE(1, "MPEG4", "Encoder not found"); - return false; - } -@@ -1390,7 +1390,7 @@ void MPEG4DecoderContext::ResizeDecoding - - bool MPEG4DecoderContext::OpenCodec() - { -- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) { -+ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) { - PTRACE(1, "MPEG4", "Decoder not found for encoder"); - return false; - } ---- a/plugins/video/H.263-1998/h263-1998.h -+++ b/plugins/video/H.263-1998/h263-1998.h -@@ -115,7 +115,7 @@ class H263_Base_EncoderContext - virtual ~H263_Base_EncoderContext(); - - virtual bool Init() = 0; -- virtual bool Init(CodecID codecId); -+ virtual bool Init(AVCodecID codecId); - - virtual bool SetOptions(const char * const * options); - virtual void SetOption(const char * option, const char * value); ---- a/plugins/video/common/dyna.cxx -+++ b/plugins/video/common/dyna.cxx -@@ -217,14 +217,14 @@ static void logCallbackFFMPEG(void * avc - #endif - - --FFMPEGLibrary::FFMPEGLibrary(CodecID codec) -+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) - { - m_codec = codec; -- if (m_codec==CODEC_ID_H264) -+ if (m_codec==AV_CODEC_ID_H264) - snprintf( m_codecString, sizeof(m_codecString), "H264"); -- if (m_codec==CODEC_ID_H263P) -+ if (m_codec==AV_CODEC_ID_H263P) - snprintf( m_codecString, sizeof(m_codecString), "H263+"); -- if (m_codec==CODEC_ID_MPEG4) -+ if (m_codec==AV_CODEC_ID_MPEG4) - snprintf( m_codecString, sizeof(m_codecString), "MPEG4"); - m_isLoadedOK = false; - } -@@ -268,12 +268,12 @@ bool FFMPEGLibrary::Load() - return true; - } - --AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) -+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) - { - return avcodec_find_encoder(id); - } - --AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) -+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) - { - WaitAndSignal m(processLock); - -@@ -308,13 +308,18 @@ int FFMPEGLibrary::AvcodecClose(AVCodecC - return avcodec_close(ctx); - } - -+#undef FFMAX -+#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) - int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) - { -+ AVPacket pkt = { 0 }; -+ int ret, got_output; - int res; - -- res = avcodec_encode_video(ctx, buf, buf_size, pict); -+ ret = avcodec_encode_video2(ctx, &pkt, pict, &got_output); - -- PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); -+ PTRACE(6, m_codecString, "DYNA\tEncoded into " << ret << " bytes, max " << buf_size); -+ memcpy(buf, pkt.data, FFMAX(pkt.size, buf_size)); - return res; - } - ---- a/plugins/video/common/dyna.h -+++ b/plugins/video/common/dyna.h -@@ -88,13 +88,13 @@ class DynaLink - class FFMPEGLibrary - { - public: -- FFMPEGLibrary(CodecID codec); -+ FFMPEGLibrary(AVCodecID codec); - ~FFMPEGLibrary(); - - bool Load(); - -- AVCodec *AvcodecFindEncoder(enum CodecID id); -- AVCodec *AvcodecFindDecoder(enum CodecID id); -+ AVCodec *AvcodecFindEncoder(enum AVCodecID id); -+ AVCodec *AvcodecFindDecoder(enum AVCodecID id); - AVCodecContext *AvcodecAllocContext(AVCodec*); - AVFrame *AvcodecAllocFrame(void); - int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); -@@ -117,7 +117,7 @@ class FFMPEGLibrary - DynaLink m_libAvcodec; - DynaLink m_libAvutil; - -- CodecID m_codec; -+ AVCodecID m_codec; - char m_codecString[32]; - - bool m_isLoadedOK; diff --git a/pkgs/development/libraries/opal/libav9.patch b/pkgs/development/libraries/opal/libav9.patch deleted file mode 100644 index f91a8c033fe..00000000000 --- a/pkgs/development/libraries/opal/libav9.patch +++ /dev/null @@ -1,543 +0,0 @@ -Description: Backport changes for the libav 9 API - Also replace loading of libavcodec and libavutil via dlopen by linking against - it. -Author: Sebastian Ramacher -Bug-Debian: http://bugs.debian.org/720824 -Last-Update: 2013-09-12 - ---- a/plugins/video/H.263-1998/h263-1998.cxx -+++ b/plugins/video/H.263-1998/h263-1998.cxx -@@ -216,7 +216,7 @@ - return false; - } - -- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); - if (m_context == NULL) { - PTRACE(1, m_prefix, "Failed to allocate context for encoder"); - return false; -@@ -312,6 +312,7 @@ - return; - } - -+#ifdef CODEC_FLAG_H263P_UMV - if (STRCMPI(option, H263_ANNEX_D) == 0) { - // Annex D: Unrestructed Motion Vectors - // Level 2+ -@@ -322,6 +323,7 @@ - m_context->flags &= ~CODEC_FLAG_H263P_UMV; - return; - } -+#endif - - #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET - if (STRCMPI(option, H263_ANNEX_F) == 0) { -@@ -356,6 +358,7 @@ - return; - } - -+#ifdef CODEC_FLAG_H263P_SLICE_STRUCT - if (STRCMPI(option, H263_ANNEX_K) == 0) { - // Annex K: Slice Structure - // does not work with eyeBeam -@@ -365,7 +368,9 @@ - m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; - return; - } -+#endif - -+#ifdef CODEC_FLAG_H263P_AIV - if (STRCMPI(option, H263_ANNEX_S) == 0) { - // Annex S: Alternative INTER VLC mode - // does not work with eyeBeam -@@ -375,6 +380,7 @@ - m_context->flags &= ~CODEC_FLAG_H263P_AIV; - return; - } -+#endif - - if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 || - STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) { -@@ -450,15 +456,6 @@ - PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); - PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); - -- #define CODEC_TRACER_FLAG(tracer, flag) \ -- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); -- - return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; - } - -@@ -521,7 +518,7 @@ - - // Need to copy to local buffer to guarantee 16 byte alignment - memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); -- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; -+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; - - /* - m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -603,13 +600,19 @@ - m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; - m_context->opaque = this; // used to separate out packets from different encode threads - -+#ifdef CODEC_FLAG_H263P_UMV - m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+#endif - m_context->flags &= ~CODEC_FLAG_4MV; - #if LIBAVCODEC_RTP_MODE - m_context->flags &= ~CODEC_FLAG_H263P_AIC; - #endif -+#ifdef CODEC_FLAG_H263P_AIV - m_context->flags &= ~CODEC_FLAG_H263P_AIV; -+#endif -+#ifdef CODEC_FLAG_H263P_SLICE_STRUCT - m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - - return true; - } -@@ -658,7 +661,7 @@ - return; - } - -- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); - if (m_context == NULL) { - PTRACE(1, m_prefix, "Failed to allocate context for decoder"); - return; ---- a/plugins/video/H.264/h264-x264.cxx -+++ b/plugins/video/H.264/h264-x264.cxx -@@ -48,6 +48,7 @@ - #include "shared/h264frame.h" - #include "shared/x264wrap.h" - -+#include - - #define MY_CODEC x264 // Name of codec (use C variable characters) - #define MY_CODEC_LOG "x264" -@@ -1067,18 +1068,17 @@ - if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL) - return false; - -- if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL) -+ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL) - return false; - - m_context->workaround_bugs = FF_BUG_AUTODETECT; -- m_context->error_recognition = FF_ER_AGGRESSIVE; - m_context->idct_algo = FF_IDCT_H264; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_BRDO | -- CODEC_FLAG2_MEMC_ONLY | -+ m_context->flags2 = CODEC_FLAG2_SKIP_RD | -+#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE - CODEC_FLAG2_DROP_FRAME_TIMECODE | -- CODEC_FLAG2_SKIP_RD | -+#endif - CODEC_FLAG2_CHUNKS; - - if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL) ---- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -+++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -@@ -589,17 +589,14 @@ - m_avpicture->quality = m_videoQMin; - - #ifdef USE_ORIG -- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning - m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors - #else - m_avcontext->max_b_frames=0; /*don't use b frames*/ - m_avcontext->flags|=CODEC_FLAG_AC_PRED; -- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; - /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ - m_avcontext->flags|=CODEC_FLAG_4MV; - m_avcontext->flags|=CODEC_FLAG_GMC; - m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; -- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; - #endif - m_avcontext->opaque = this; // for use in RTP callback - } -@@ -691,7 +688,12 @@ - - bool MPEG4EncoderContext::OpenCodec() - { -- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -+ PTRACE(1, "MPEG4", "Encoder not found"); -+ return false; -+ } -+ -+ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); - if (m_avcontext == NULL) { - PTRACE(1, "MPEG4", "Encoder failed to allocate context for encoder"); - return false; -@@ -703,11 +705,6 @@ - return false; - } - -- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -- PTRACE(1, "MPEG4", "Encoder not found"); -- return false; -- } -- - #if PLUGINCODEC_TRACING - // debugging flags - if (PTRACE_CHECK(4)) { -@@ -804,7 +801,7 @@ - // Should the next frame be an I-Frame? - if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) - { -- m_avpicture->pict_type = FF_I_TYPE; -+ m_avpicture->pict_type = AV_PICTURE_TYPE_I; - } - else // No IFrame requested, let avcodec decide what to do - { -@@ -1325,7 +1322,6 @@ - - void MPEG4DecoderContext::SetStaticDecodingParams() { - m_avcontext->flags |= CODEC_FLAG_4MV; -- m_avcontext->flags |= CODEC_FLAG_PART; - m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations - } - -@@ -1399,7 +1395,7 @@ - return false; - } - -- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); - if (m_avcontext == NULL) { - PTRACE(1, "MPEG4", "Decoder failed to allocate context"); - return false; ---- a/plugins/video/common/dyna.cxx -+++ b/plugins/video/common/dyna.cxx -@@ -38,6 +38,13 @@ - * Matthias Schneider (ma30002000@yahoo.de) - */ - #include "dyna.h" -+#include -+#include -+ -+extern "C" { -+#include -+#include -+} - - bool DynaLink::Open(const char *name) - { -@@ -228,101 +235,15 @@ - m_libAvutil.Close(); - } - --#define CHECK_AVUTIL(name, func) \ -- (seperateLibAvutil ? \ -- m_libAvutil.GetFunction(name, (DynaLink::Function &)func) : \ -- m_libAvcodec.GetFunction(name, (DynaLink::Function &)func) \ -- ) \ -- -- - bool FFMPEGLibrary::Load() - { - WaitAndSignal m(processLock); - if (IsLoaded()) - return true; - -- bool seperateLibAvutil = false; -- --#ifdef LIBAVCODEC_LIB_NAME -- if (m_libAvcodec.Open(LIBAVCODEC_LIB_NAME)) -- seperateLibAvutil = true; -- else --#endif -- if (m_libAvcodec.Open("libavcodec")) -- seperateLibAvutil = false; -- else if (m_libAvcodec.Open("avcodec-" AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR))) -- seperateLibAvutil = true; -- else { -- PTRACE(1, m_codecString, "Failed to load FFMPEG libavcodec library"); -- return false; -- } -- -- if (seperateLibAvutil && -- !( --#ifdef LIBAVUTIL_LIB_NAME -- m_libAvutil.Open(LIBAVUTIL_LIB_NAME) || --#endif -- m_libAvutil.Open("libavutil") || -- m_libAvutil.Open("avutil-" AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) -- ) ) { -- PTRACE(1, m_codecString, "Failed to load FFMPEG libavutil library"); -- return false; -- } -- -- strcpy(m_libAvcodec.m_codecString, m_codecString); -- strcpy(m_libAvutil.m_codecString, m_codecString); -- -- if (!m_libAvcodec.GetFunction("avcodec_init", (DynaLink::Function &)Favcodec_init)) -- return false; -- -- if (!m_libAvcodec.GetFunction("av_init_packet", (DynaLink::Function &)Fav_init_packet)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_register_all", (DynaLink::Function &)Favcodec_register_all)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_find_encoder", (DynaLink::Function &)Favcodec_find_encoder)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_find_decoder", (DynaLink::Function &)Favcodec_find_decoder)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_alloc_context", (DynaLink::Function &)Favcodec_alloc_context)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_alloc_frame", (DynaLink::Function &)Favcodec_alloc_frame)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_open", (DynaLink::Function &)Favcodec_open)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_close", (DynaLink::Function &)Favcodec_close)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_encode_video", (DynaLink::Function &)Favcodec_encode_video)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_decode_video2", (DynaLink::Function &)Favcodec_decode_video)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_set_dimensions", (DynaLink::Function &)Favcodec_set_dimensions)) -- return false; -- -- if (!CHECK_AVUTIL("av_free", Favcodec_free)) -- return false; -- -- if(!m_libAvcodec.GetFunction("avcodec_version", (DynaLink::Function &)Favcodec_version)) -- return false; -- -- if (!CHECK_AVUTIL("av_log_set_level", FAv_log_set_level)) -- return false; -- -- if (!CHECK_AVUTIL("av_log_set_callback", FAv_log_set_callback)) -- return false; -- - // must be called before using avcodec lib - -- unsigned libVer = Favcodec_version(); -+ unsigned libVer = avcodec_version(); - if (libVer != LIBAVCODEC_VERSION_INT) { - PTRACE(2, m_codecString, "Warning: compiled against libavcodec headers from version " - << LIBAVCODEC_VERSION_MAJOR << '.' << LIBAVCODEC_VERSION_MINOR << '.' << LIBAVCODEC_VERSION_MICRO -@@ -334,8 +255,7 @@ - << (libVer >> 16) << ((libVer>>8) & 0xff) << (libVer & 0xff)); - } - -- Favcodec_init(); -- Favcodec_register_all (); -+ avcodec_register_all(); - - #if PLUGINCODEC_TRACING - AvLogSetLevel(AV_LOG_DEBUG); -@@ -350,49 +270,49 @@ - - AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) - { -- return Favcodec_find_encoder(id); -+ return avcodec_find_encoder(id); - } - - AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) - { - WaitAndSignal m(processLock); - -- return Favcodec_find_decoder(id); -+ return avcodec_find_decoder(id); - } - --AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(void) -+AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(AVCodec *codec) - { - WaitAndSignal m(processLock); - -- return Favcodec_alloc_context(); -+ return avcodec_alloc_context3(codec); - } - - AVFrame *FFMPEGLibrary::AvcodecAllocFrame(void) - { - WaitAndSignal m(processLock); - -- return Favcodec_alloc_frame(); -+ return avcodec_alloc_frame(); - } - - int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec) - { - WaitAndSignal m(processLock); - -- return Favcodec_open(ctx, codec); -+ return avcodec_open2(ctx, codec, NULL); - } - - int FFMPEGLibrary::AvcodecClose(AVCodecContext *ctx) - { - WaitAndSignal m(processLock); - -- return Favcodec_close(ctx); -+ return avcodec_close(ctx); - } - - int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) - { - int res; - -- res = Favcodec_encode_video(ctx, buf, buf_size, pict); -+ res = avcodec_encode_video(ctx, buf, buf_size, pict); - - PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); - return res; -@@ -401,35 +321,35 @@ - int FFMPEGLibrary::AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, BYTE *buf, int buf_size) - { - AVPacket avpkt; -- Fav_init_packet(&avpkt); -+ av_init_packet(&avpkt); - avpkt.data = buf; - avpkt.size = buf_size; - -- return Favcodec_decode_video(ctx, pict, got_picture_ptr, &avpkt); -+ return avcodec_decode_video2(ctx, pict, got_picture_ptr, &avpkt); - } - - void FFMPEGLibrary::AvcodecFree(void * ptr) - { - WaitAndSignal m(processLock); - -- Favcodec_free(ptr); -+ av_free(ptr); - } - - void FFMPEGLibrary::AvSetDimensions(AVCodecContext *s, int width, int height) - { - WaitAndSignal m(processLock); - -- Favcodec_set_dimensions(s, width, height); -+ avcodec_set_dimensions(s, width, height); - } - - void FFMPEGLibrary::AvLogSetLevel(int level) - { -- FAv_log_set_level(level); -+ av_log_set_level(level); - } - - void FFMPEGLibrary::AvLogSetCallback(void (*callback)(void*, int, const char*, va_list)) - { -- FAv_log_set_callback(callback); -+ av_log_set_callback(callback); - } - - bool FFMPEGLibrary::IsLoaded() ---- a/plugins/video/common/dyna.h -+++ b/plugins/video/common/dyna.h -@@ -95,7 +95,7 @@ - - AVCodec *AvcodecFindEncoder(enum CodecID id); - AVCodec *AvcodecFindDecoder(enum CodecID id); -- AVCodecContext *AvcodecAllocContext(void); -+ AVCodecContext *AvcodecAllocContext(AVCodec*); - AVFrame *AvcodecAllocFrame(void); - int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); - int AvcodecClose(AVCodecContext *ctx); -@@ -120,26 +120,6 @@ - CodecID m_codec; - char m_codecString[32]; - -- void (*Favcodec_init)(void); -- void (*Fav_init_packet)(AVPacket *pkt); -- -- void (*Favcodec_register_all)(void); -- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); -- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); -- AVCodecContext *(*Favcodec_alloc_context)(void); -- AVFrame *(*Favcodec_alloc_frame)(void); -- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); -- int (*Favcodec_close)(AVCodecContext *ctx); -- int (*Favcodec_encode_video)(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict); -- int (*Favcodec_decode_video)(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, AVPacket *avpkt); -- unsigned (*Favcodec_version)(void); -- void (*Favcodec_set_dimensions)(AVCodecContext *ctx, int width, int height); -- -- void (*Favcodec_free)(void *); -- -- void (*FAv_log_set_level)(int level); -- void (*FAv_log_set_callback)(void (*callback)(void*, int, const char*, va_list)); -- - bool m_isLoadedOK; - }; - ---- a/plugins/video/common/ffmpeg.h -+++ b/plugins/video/common/ffmpeg.h -@@ -45,11 +45,13 @@ - - #include "platform.h" - --#include "libavcodec/avcodec.h" -+extern "C" { -+#include - // AVPacket was declared in avformat.h before April 2009 - #if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52, 25, 0) --#include "libavformat/avformat.h" -+#include - #endif -+} - - #ifndef LIBAVCODEC_VERSION_INT - #error Libavcodec include is not correct ---- a/plugins/video/H.263-1998/Makefile.in -+++ b/plugins/video/H.263-1998/Makefile.in -@@ -34,8 +34,8 @@ - $(COMMONDIR)/mpi.cxx \ - $(COMMONDIR)/dyna.cxx - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@ - ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes) ---- a/plugins/video/H.264/Makefile.in -+++ b/plugins/video/H.264/Makefile.in -@@ -34,8 +34,8 @@ - $(SHAREDDIR)/x264wrap.cxx \ - $(COMMONDIR)/dyna.cxx \ - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - IS_H264_LICENSED:=@IS_H264_LICENSED@ - ifeq ($(IS_H264_LICENSED),yes) ---- a/plugins/video/MPEG4-ffmpeg/Makefile.in -+++ b/plugins/video/MPEG4-ffmpeg/Makefile.in -@@ -30,8 +30,8 @@ - SRCDIR := . - SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include - # Also add libavutil, so ffmpeg headers can #include "log.h". diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix deleted file mode 100644 index e7abedf3121..00000000000 --- a/pkgs/development/libraries/ptlib/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC, gnome3 -, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: - -stdenv.mkDerivation rec { - pname = "ptlib"; - version = "2.10.11"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs"; - }; - - NIX_CFLAGS_COMPILE = "-std=gnu++98"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bison flex unixODBC openssl openldap - cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/bison-fix; - sha256 = "0vzv9kyn9s628z8wy2gva380gi1rmhxilwlg5pikl5a0wn8p46nw"; - }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; - sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; - }) - (fetchpatch { - name = "openssl-1.1.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.patch?h=packages/ptlib&id=1dfa9f55e7e030d261228fca27dda82979ca7f30"; - sha256 = "11hdgyyibycg0wf5ls0wk9hksa4jd434i86xqiccbyg17n4l6lc1"; - }) - ./ptlib-2.10.11-glibc-2.26.patch - ]; - - # fix typedef clashes with unixODBC>=2.3.5 - postPatch = '' - substituteInPlace include/ptlib/unix/ptlib/contain.h \ - --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ - --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" - ''; - - meta = with stdenv.lib; { - description = "Portable Tools from OPAL VoIP"; - maintainers = [ maintainers.raskin ]; - homepage = "http://www.opalvoip.org/"; - platforms = platforms.linux; - license = with licenses; [ beerware bsdOriginal mpl10 ]; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/sources/ptlib/"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; -} diff --git a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch b/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch deleted file mode 100644 index 300c3736abf..00000000000 --- a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ptlib/unix/channel.cxx b/src/ptlib/unix/channel.cxx -index 3b17dda..2dcaa18 100644 ---- a/src/ptlib/unix/channel.cxx -+++ b/src/ptlib/unix/channel.cxx -@@ -36,7 +36,7 @@ - - #include - #include -- -+#include - - #include "../common/pchannel.cxx" - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e7121c4b6a..54455e3607e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13449,11 +13449,6 @@ in ois = callPackage ../development/libraries/ois {}; - opal = callPackage ../development/libraries/opal { - ffmpeg = ffmpeg_2; - stdenv = gcc6Stdenv; - }; - openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; @@ -13629,8 +13624,6 @@ in pstreams = callPackage ../development/libraries/pstreams {}; - ptlib = callPackage ../development/libraries/ptlib {}; - pugixml = callPackage ../development/libraries/pugixml { }; pybind11 = pythonPackages.pybind11; @@ -15687,8 +15680,6 @@ in sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; - sipcmd = callPackage ../applications/networking/sipcmd { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -24533,8 +24524,6 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; - dumb = callPackage ../misc/dumb { }; emulationstation = callPackage ../misc/emulators/emulationstation { From 2e5fd9f03ec17349b73760f1735013481604f20c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 02:08:44 +0100 Subject: [PATCH 145/211] clang_39: fix build w/gcc9 --- .../clang/0001-Fix-compilation-w-gcc9.patch | 63 +++++++++++++++++++ .../compilers/llvm/3.9/clang/default.nix | 5 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch diff --git a/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch new file mode 100644 index 00000000000..1058cd03176 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch @@ -0,0 +1,63 @@ +From 7225c7754cc3431d05df367c60f309f27586f188 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 30 Dec 2019 01:42:52 +0100 +Subject: [PATCH] Fix compilation w/gcc9 + +Build broken with the following errors: + +``` +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6078:55: error: lambda parameter 'CGF' previously declared as a capture +clang> 6078 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6126:53: error: lambda parameter 'CGF' previously declared as a capture +clang> 6126 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6191:56: error: lambda parameter 'CGF' previously declared as a capture +clang> 6191 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +``` + +This was due to a bug about name-collisions fixed in GCC 9.0[1]. + +[1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2211 +--- + lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp +index 6a0edbe..96c281c 100644 +--- a/lib/CodeGen/CGOpenMPRuntime.cpp ++++ b/lib/CodeGen/CGOpenMPRuntime.cpp +@@ -6073,7 +6073,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, + // Generate the code for the opening of the data environment. Capture all the + // arguments of the runtime call by reference because they are used in the + // closing of the region. +- auto &&BeginThenGen = [&D, &CGF, &BasePointersArray, &PointersArray, ++ auto &&BeginThenGen = [&D, &BasePointersArray, &PointersArray, + &SizesArray, &MapTypesArray, Device, + &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. +@@ -6121,7 +6121,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, + }; + + // Generate code for the closing of the data region. +- auto &&EndThenGen = [&CGF, &BasePointersArray, &PointersArray, &SizesArray, ++ auto &&EndThenGen = [&BasePointersArray, &PointersArray, &SizesArray, + &MapTypesArray, Device, + &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { + assert(BasePointersArray && PointersArray && SizesArray && MapTypesArray && +@@ -6188,7 +6188,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( + "Expecting either target enter, exit data, or update directives."); + + // Generate the code for the opening of the data environment. +- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { ++ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapValuesArrayTy BasePointers; + MappableExprsHandler::MapValuesArrayTy Pointers; +-- +2.23.1 + diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 3d09277ad4c..1666b3d842d 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -27,7 +27,10 @@ let (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./0001-Fix-compilation-w-gcc9.patch + ]; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp From 129fbd75501785f4e3308d6160590ba465964c5f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 02:18:24 +0100 Subject: [PATCH 146/211] clang_4: fix build w/gcc9 As noted in the incorporated patch, name collisions between lambda arguments and lambda captures cause compilation failures in GCC9[1]. The issue has been fixed in a later version of CLang, unfortunately the relevant patches weren't backported to the versions 3.9 and 4.0[2]. [1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2211 [2] https://github.com/llvm-mirror/clang/commit/bb177a9307360a211ca0111b49b160698395074c#diff-d63bede6ed85300ad2aaf4eaee571456L6278 --- .../4/clang/0001-Fix-compilation-w-gcc9.patch | 59 +++++++++++++++++++ .../compilers/llvm/4/clang/default.nix | 5 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch diff --git a/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch new file mode 100644 index 00000000000..ea934257408 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch @@ -0,0 +1,59 @@ +From a2af0b02eba35d0670e3e442ff7c61b3e2304edd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 30 Dec 2019 02:11:35 +0100 +Subject: [PATCH] Fix compilation w/gcc9 + +Build broken with the following errors: + +``` +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6275:24: error: lambda parameter 'CGF' previously declared as a capture +clang> 6275 | CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6321:62: error: lambda parameter 'CGF' previously declared as a capture +clang> 6321 | auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6400:56: error: lambda parameter 'CGF' previously declared as a capture +clang> 6400 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +``` +--- + lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp +index 4025217..40a73ef 100644 +--- a/lib/CodeGen/CGOpenMPRuntime.cpp ++++ b/lib/CodeGen/CGOpenMPRuntime.cpp +@@ -6271,7 +6271,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( + // Generate the code for the opening of the data environment. Capture all the + // arguments of the runtime call by reference because they are used in the + // closing of the region. +- auto &&BeginThenGen = [&D, &CGF, Device, &Info, &CodeGen, &NoPrivAction]( ++ auto &&BeginThenGen = [&D, Device, &Info, &CodeGen, &NoPrivAction]( + CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapBaseValuesArrayTy BasePointers; +@@ -6318,7 +6318,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( + }; + + // Generate code for the closing of the data region. +- auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, ++ auto &&EndThenGen = [Device, &Info](CodeGenFunction &CGF, + PrePostActionTy &) { + assert(Info.isValid() && "Invalid data environment closing arguments."); + +@@ -6397,7 +6397,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( + "Expecting either target enter, exit data, or update directives."); + + // Generate the code for the opening of the data environment. +- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { ++ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapBaseValuesArrayTy BasePointers; + MappableExprsHandler::MapValuesArrayTy Pointers; +-- +2.23.1 + diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 6b67e2cc856..a90fbe6ae83 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -38,7 +38,10 @@ let ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./0001-Fix-compilation-w-gcc9.patch + ]; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp From 7cf1d11a3e3ddac39b008eb4f838a9466859f576 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 03:06:54 +0100 Subject: [PATCH 147/211] emulationstation: fix build w/ recent versions of gcc --- .../misc/emulators/emulationstation/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 668d1804544..722f6b25429 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, fetchpatch }: stdenv.mkDerivation { pname = "emulationstation"; @@ -12,14 +13,22 @@ stdenv.mkDerivation { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch"; + sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p"; + }) + ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; - buildPhase = "cmake . && make"; installPhase = '' install -D ../emulationstation $out/bin/emulationstation ''; + enableParallelBuilding = true; + meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = https://emulationstation.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54455e3607e..ac7ac83ec7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24526,9 +24526,7 @@ in dumb = callPackage ../misc/dumb { }; - emulationstation = callPackage ../misc/emulators/emulationstation { - stdenv = gcc5Stdenv; - }; + emulationstation = callPackage ../misc/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; From a88fc6be6df50f4cbc0273dd31baea6ffc51da27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 03:18:19 +0100 Subject: [PATCH 148/211] strelka: fix build w/ gcc9 --- pkgs/applications/science/biology/strelka/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index cb83b19269b..184dcb48a0d 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python2 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=maybe-uninitialized" + "-Wno-error=pessimizing-move" + ]; preConfigure = '' sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py From 1a871b43824b79432fe06b9c15029961c4b0efb6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 03:31:33 +0100 Subject: [PATCH 149/211] minisat: 2.2.0 -> 2.2.1 --- .../science/logic/minisat/clang.diff | 45 ------------------- .../science/logic/minisat/darwin.patch | 26 ----------- .../science/logic/minisat/default.nix | 26 ++++------- .../science/logic/minisat/unstable.nix | 25 ----------- .../science/logic/stp/default.nix | 5 ++- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 11 insertions(+), 117 deletions(-) delete mode 100644 pkgs/applications/science/logic/minisat/clang.diff delete mode 100644 pkgs/applications/science/logic/minisat/darwin.patch delete mode 100644 pkgs/applications/science/logic/minisat/unstable.nix diff --git a/pkgs/applications/science/logic/minisat/clang.diff b/pkgs/applications/science/logic/minisat/clang.diff deleted file mode 100644 index 5b5072c71f3..00000000000 --- a/pkgs/applications/science/logic/minisat/clang.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur minisat/core/SolverTypes.h minisat.clang/core/SolverTypes.h ---- minisat/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 -+++ minisat.clang/core/SolverTypes.h 2016-05-13 12:14:50.759671959 +0200 -@@ -47,7 +47,7 @@ - int x; - - // Use this as a constructor: -- friend Lit mkLit(Var var, bool sign = false); -+ //friend Lit mkLit(Var var, bool sign = false); - - bool operator == (Lit p) const { return x == p.x; } - bool operator != (Lit p) const { return x != p.x; } -@@ -55,7 +55,7 @@ - }; - - --inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } -+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } - inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } - inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } - inline bool sign (Lit p) { return p.x & 1; } -diff -aur minisat/utils/Options.h minisat.clang/utils/Options.h ---- minisat/utils/Options.h 2010-07-10 18:07:36.000000000 +0200 -+++ minisat.clang/utils/Options.h 2016-05-13 12:14:50.759671959 +0200 -@@ -282,15 +282,15 @@ - if (range.begin == INT64_MIN) - fprintf(stderr, "imin"); - else -- fprintf(stderr, "%4"PRIi64, range.begin); -+ fprintf(stderr, "%4" PRIi64, range.begin); - - fprintf(stderr, " .. "); - if (range.end == INT64_MAX) - fprintf(stderr, "imax"); - else -- fprintf(stderr, "%4"PRIi64, range.end); -+ fprintf(stderr, "%4" PRIi64, range.end); - -- fprintf(stderr, "] (default: %"PRIi64")\n", value); -+ fprintf(stderr, "] (default: %" PRIi64 ")\n", value); - if (verbose){ - fprintf(stderr, "\n %s\n", description); - fprintf(stderr, "\n"); -Only in minisat.clang/utils: Options.o -Only in minisat.clang/utils: System.o diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/pkgs/applications/science/logic/minisat/darwin.patch deleted file mode 100644 index f2b618d6bb3..00000000000 --- a/pkgs/applications/science/logic/minisat/darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb - -diff --git a/utils/System.cc b/utils/System.cc -index a7cf53f..feeaf3c 100644 ---- a/utils/System.cc -+++ b/utils/System.cc -@@ -78,16 +78,17 @@ double Minisat::memUsed(void) { - struct rusage ru; - getrusage(RUSAGE_SELF, &ru); - return (double)ru.ru_maxrss / 1024; } --double MiniSat::memUsedPeak(void) { return memUsed(); } -+double Minisat::memUsedPeak(void) { return memUsed(); } - - - #elif defined(__APPLE__) - #include - --double Minisat::memUsed(void) { -+double Minisat::memUsed() { - malloc_statistics_t t; - malloc_zone_statistics(NULL, &t); - return (double)t.max_size_in_use / (1024*1024); } -+double Minisat::memUsedPeak() { return memUsed(); } - - #else - double Minisat::memUsed() { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 0c4a8a156ed..6b642832b83 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -1,29 +1,19 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "minisat"; - version = "2.2.0"; + version = "2.2.1"; - src = fetchurl { - url = "http://minisat.se/downloads/${pname}-${version}.tar.gz"; - sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; + src = fetchFromGitHub { + owner = "stp"; + repo = pname; + rev = "releases/${version}"; + sha256 = "14vcbjnlia00lpyv2fhbmw3wbc9bk9h7bln9zpyc3nwiz5cbjz4a"; }; - patches = - [ ./darwin.patch ] - ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; - - NIX_CFLAGS_COMPILE = "-fpermissive"; - + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - preBuild = "cd simp"; - makeFlags = [ "r" "MROOT=.." ]; - installPhase = '' - mkdir -p $out/bin - cp minisat_release $out/bin/minisat - ''; - meta = with stdenv.lib; { description = "Compact and readable SAT solver"; maintainers = with maintainers; [ gebner raskin ]; diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix deleted file mode 100644 index 99df32c9363..00000000000 --- a/pkgs/applications/science/logic/minisat/unstable.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, zlib, cmake }: - -stdenv.mkDerivation { - name = "minisat-unstable-2013-09-25"; - - src = fetchFromGitHub { - owner = "niklasso"; - repo = "minisat"; - rev = "37dc6c67e2af26379d88ce349eb9c4c6160e8543"; - sha256 = "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq"; - }; - - NIX_CFLAGS_COMPILE = "-fpermissive"; - - buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "Compact and readable SAT solver"; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; - license = licenses.mit; - homepage = http://minisat.se/; - }; -} diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 0ea659d1927..dd00eda1b57 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }: +{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl +, python3, python3Packages, zlib, minisat, cryptominisat }: stdenv.mkDerivation rec { pname = "stp"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; - buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ]; + buildInputs = [ boost zlib minisat cryptominisat python3 ]; nativeBuildInputs = [ cmake bison flex perl ]; preConfigure = '' python_install_dir=$out/${python3Packages.python.sitePackages} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7ac83ec7c..7513834a25b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24059,7 +24059,6 @@ in mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; minisat = callPackage ../applications/science/logic/minisat {}; - minisatUnstable = callPackage ../applications/science/logic/minisat/unstable.nix {}; monosat = callPackage ../applications/science/logic/monosat {}; From 0852b7d5bb4191f46c966eb7c12a9ebf0b1f3015 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2019 03:47:14 +0100 Subject: [PATCH 150/211] ksh: add patch to fix darwin build --- pkgs/shells/ksh/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 075c843e684..108d1a58758 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,4 +1,5 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch +, libiconv }: stdenv.mkDerivation rec { pname = "ksh"; @@ -11,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; }; + patches = [ + (fetchpatch { + url = "https://github.com/att/ast/commit/11983a71f5e29df578b7e2184400728b4e3f451d.patch"; + sha256 = "1n9558c4v2qpgpjb1vafs29n3qn3z0770wr1ayc0xjf5z5j4g3kv"; + }) + ]; + nativeBuildInputs = [ meson ninja which python ]; buildInputs = [ libiconv ]; From 3b50d0462a4174bb155b258a32ab1ab4176ba2fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 8 May 2019 00:42:47 +0200 Subject: [PATCH 151/211] perl: fuse configureFlags --- pkgs/development/interpreters/perl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 89979e18bdc..49a5c38846a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -91,7 +91,13 @@ let ] ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ optional stdenv.isSunOS "-Dcc=gcc" - ++ optional enableThreading "-Dusethreads"; + ++ optional enableThreading "-Dusethreads" + ++ optionals (!crossCompiling) [ + "-Dprefix=${placeholder "out"}" + "-Dman1dir=${placeholder "out"}/share/man/man1" + "-Dman3dir=${placeholder "out"}/share/man/man3" + ] + ++ optional (stdenv.isAarch32 || stdenv.isMips) "-Dldflags=\"-lm -lrt\""; configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; @@ -102,10 +108,6 @@ let preConfigure = '' substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970' substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system' - '' + optionalString (!crossCompiling) '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' - configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' From 74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 19 Aug 2019 16:28:28 +0200 Subject: [PATCH 152/211] libxml2: fix further structuredAttrs issues --- pkgs/development/libraries/libxml2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index f5dcb3357f7..57a7294c887 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; - propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; + propagatedBuildOutputs = [ "out" "bin" ] ++ lib.optional pythonSupport "py"; buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString pythonSupport - ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + installFlags = lib.optional pythonSupport + "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\""; postFixup = '' moveToOutput bin/xml2-config "$dev" From 9da5420213841bc6ed052a4568061e83b0377335 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 15:35:48 +0200 Subject: [PATCH 153/211] zeromq: *Flags are lists --- pkgs/development/libraries/zeromq/4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index db5d90e2f02..1a8f07a3ae0 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - cmakeFlags = if enableDrafts then [ "-DENABLE_DRAFTS=ON" ] else null; + cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; meta = with stdenv.lib; { branch = "4"; From ecff7d3a56abb41d4349e48418d9c582db92b0f1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 15:35:48 +0200 Subject: [PATCH 154/211] file: *Flags are lists --- pkgs/tools/misc/file/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index a06b38c0ec7..9dd3970bbb2 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file" - else null; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with stdenv.lib; { homepage = https://darwinsys.com/file; From 083d3550a596f5c0a970df2705b294fa04292314 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 15:35:48 +0200 Subject: [PATCH 155/211] gawk: *Flags are lists --- pkgs/tools/text/gawk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 7a5f6c8dd81..0d5a50570f5 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; - makeFlags = "AR=${stdenv.cc.targetPrefix}ar"; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; inherit doCheck; From 04c2b2f52ea8d10d7b669cb26ddebbb45ac47eff Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 15:35:48 +0200 Subject: [PATCH 156/211] asciidoc: *Flags are lists --- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 83aa667f58f..44c5f6d1f24 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -259,7 +259,7 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/etc/vim"; - makeFlags = if stdenv.isCygwin then "DESTDIR=/." else null; + makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/."; meta = with stdenv.lib; { description = "Text-based document generation system"; From 49f40b2e3d23a2de8290a6c5ce9915564cc1678b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 157/211] dejavu-fonts: *Flags are lists --- pkgs/data/fonts/dejavu-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 38a2d8fe56c..b14ba6479d9 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -35,7 +35,7 @@ let sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; - buildFlags = "full-ttf"; + buildFlags = [ "full-ttf" ]; preBuild = "patchShebangs scripts"; From e298629fec0fe6ffbd6e30dcb1fc4718bc807cb4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 158/211] boost: *Flags are lists --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 2d0a5a63d6f..82bcd49592d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation { inherit src version; - patchFlags = ""; + patchFlags = []; patches = patches ++ optional stdenv.isDarwin ( From fb129117d20b247846398648a63d5dcb5d84cf7d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 159/211] fontconfig: *Flags are lists --- pkgs/development/libraries/fontconfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 5c9a0ecc71b..617e058bd8f 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { doCheck = true; # Don't try to write to /var/cache/fontconfig at install time. - installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + installFlags = [ "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; postInstall = '' cd "$out/etc/fonts" From feacf867fb1f70981a92819be334d44b5eb27310 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 160/211] http-parser: *Flags are lists --- pkgs/development/libraries/http-parser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 76173bc5b99..4b1a695ca55 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error"; patches = [ ./build-shared.patch ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - buildFlags = "library"; + buildFlags = [ "library" ]; doCheck = true; checkTarget = "test"; From ab797ee344a124f4b4996c2ff53c25279ceb58b7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 161/211] icu58: *Flags are lists --- pkgs/development/libraries/icu/58.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index f7763ba49da..e53e4e3737e 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -10,5 +10,5 @@ import ./base.nix { version = "58.2"; sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; - patchFlags = "-p4"; + patchFlags = [ "-p4" ]; } From d03933805bbe1461f58f36e2460ef1d3cbc2fdda Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 162/211] icubase: *Flags are lists --- pkgs/development/libraries/icu/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 47ca63fca99..e51224433e8 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,4 +1,4 @@ -{ version, sha256, patches ? [], patchFlags ? "" }: +{ version, sha256, patches ? [], patchFlags ? [] }: { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot From b7cfaf5519bd275ace3f0f7268638522da9fdfc8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 163/211] libmpeg2: *Flags are lists --- pkgs/development/libraries/libmpeg2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 321204a0c4f..2351ce2b554 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = http://libmpeg2.sourceforge.net/; From a085e9c06194b513a0190450734d25b95d9bc06c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 164/211] nss: *Flags are lists --- pkgs/development/libraries/nss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 7499750c1f0..df9c3260878 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ./ckpem.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" From 6aea513498831ad34f7f2263f761e67be1a39c15 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 165/211] readline: *Flags are lists --- pkgs/development/libraries/readline/6.3.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 73ed823d2be..1e5d9a0a664 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -12,13 +12,11 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; - configureFlags = - stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - [ # This test requires running host code - "bash_cv_wcwidth_broken=no" - ]; + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + # This test requires running host code + "bash_cv_wcwidth_broken=no"; patches = [ ./link-against-ncurses.patch From 9bce99fccc9f176155ab9bef400e4ce0e1ce4d2b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 166/211] readline70: *Flags are lists --- pkgs/development/libraries/readline/7.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 11d5c378015..065d6544986 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; upstreamPatches = (let From 1e3c1c9feab5cf46ddab0be86ee754a776f7cd95 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 167/211] schroedinger: *Flags are lists --- pkgs/development/libraries/schroedinger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index f78ed0f7925..1831161979d 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = (!stdenv.isDarwin); - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/schroedinger/files/patch-testsuite-Makefile.am.diff"; From a8822b6ec206792c077b520528e6a7f0565d2b49 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 168/211] gnumake: *Flags are lists --- pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index b543565758c..37467f225ea 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ # Purity: don't look for library dependencies (of the form `-lfoo') in /lib # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for From aa4d33951045378711064f0cb86c40078ed4cbea Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 169/211] libaio: *Flags are lists --- pkgs/os-specific/linux/libaio/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 090bf6a566a..792568e8b57 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { --replace "-Werror" "" ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ + "prefix=${placeholder ''out''}" + ]; hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; From 7def878f1e56340418efbad563c2a0b402b99a2a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 170/211] xorg.*: *Flags are lists --- pkgs/servers/x11/xorg/overrides.nix | 44 +++++++++++++++++------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1e891092f7c..f6285c364e7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -63,10 +63,10 @@ self: super: x11BuildHook = ./imake.sh; patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = ./imake-setup-hook.sh; - CFLAGS = [ ''-DIMAKE_COMPILETIME_CPP='"${if stdenv.isDarwin + CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.isDarwin then "${tradcpp}/bin/cpp" - else "gcc"}"' '' - ]; + else "gcc"}\"'"; + inherit tradcpp; }); @@ -123,9 +123,7 @@ self: super: outputs = [ "out" "dev" ]; propagatedBuildInputs = [ freetype ]; # propagate link reqs. like bzip2 # prevents "misaligned_stack_error_entering_dyld_stub_binder" - configureFlags = lib.optionals isDarwin [ - "CFLAGS=-O0" - ]; + configureFlags = lib.optional isDarwin "CFLAGS=-O0"; }); libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: { @@ -207,9 +205,8 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ self.libXfixes ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "xorg_cv_malloc0_returns_null=no" - ]; + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "xorg_cv_malloc0_returns_null=no"; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -220,7 +217,7 @@ self: super: libXmu = super.libXmu.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; - buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"''; + buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; }); libXrandr = super.libXrandr.overrideAttrs (attrs: { @@ -342,32 +339,43 @@ self: super: xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - installFlags = "sdkdir=\${dev}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''dev''}/include/xorg" + ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + "configdir=${placeholder ''out''}/share/X11/xorg.conf.d" + ]; }); xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: { configureFlags = [ - "--sysconfdir=$(out)/etc" - "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" - "--with-udev-rules-dir=$(out)/lib/udev/rules.d" + "--sysconfdir=${placeholder ''out''}/etc" + "--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d" + "--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d" ]; meta = attrs.meta // { From 53cbd1b7bf398581a90d6db6521cb50fe55e8e40 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 171/211] bash: *Flags are lists --- pkgs/shells/bash/4.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index e5e33c76d20..121368abf4c 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = upstreamPatches ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch From e49f0d4985142ba0c4e54808d550bbdb824d5eae Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 172/211] unzip: *Flags are lists --- pkgs/tools/archivers/unzip/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 7bbcc906292..b8f649fbdcb 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchFlags = "-p1 -F3"; + patchFlags = [ "-p1" "-F3" ]; patches = [ ./CVE-2014-8139.diff @@ -53,15 +53,21 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; - buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; + buildFlags = [ + "generic" + "D_USE_BZ2=-DUSE_BZIP2" + "L_BZ2=-lbz2" + ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile ''; - installFlags = "prefix=$(out)"; + installFlags = [ + "prefix=${placeholder ''out''}" + ]; setupHook = ./setup-hook.sh; From 76b774e89a48901e87b93d9799d54dd087340627 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 173/211] zip: *Flags are lists --- pkgs/tools/archivers/zip/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 20d85405bba..09ba6510707 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -19,8 +19,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; makefile = "unix/Makefile"; - buildFlags = if stdenv.isCygwin then "cygwin" else "generic"; - installFlags = "prefix=$(out) INSTALL=cp"; + buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; + installFlags = [ + "prefix=${placeholder ''out''}" + "INSTALL=cp" + ]; patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; From 6c40a45b8801337ddd3111bc1e432dad74d278ae Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 26 Oct 2019 17:39:27 +0200 Subject: [PATCH 174/211] argyllcms: *Flags are lists --- pkgs/tools/graphics/argyllcms/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 160b77229b3..1326d045459 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -94,9 +94,11 @@ stdenv.mkDerivation rec { libXrender libXScrnSaver libXdmcp libXau openssl ]; - buildFlags = "PREFIX=$(out) all"; + buildFlags = [ "all" ]; - installFlags = "PREFIX=$(out)"; + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; # Install udev rules, but remove lines that set up the udev-acl # stuff, since that is handled by udev's own rules (70-udev-acl.rules) From 43e91d6f07cc91c5fb214937273a9de791e48881 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 175/211] pianobar: *Flags are lists --- pkgs/applications/audio/pianobar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 26b94f306bc..811952f845f 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libao json_c libgcrypt ffmpeg curl ]; - makeFlags="PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; CC = "gcc"; CFLAGS = "-std=c99"; From 78cf5eda69e9a0e86037ba29fa2fd228ba6066fb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 176/211] nedit: *Flags are lists --- pkgs/applications/editors/nedit/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 4ff8c759a26..e1d1fa3070a 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "nedit"; version = "5.7"; - + src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz"; sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xlibsWrapper ]; buildInputs = [ motif libXpm ]; - buildFlags = if stdenv.isLinux then "linux" else - # the linux config works fine on darwin too! - if stdenv.isDarwin then "linux" else ""; + # the linux config works fine on darwin too! + buildFlags = stdenv.lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; From 269849de0675de20a632ff660ab0f71525f39b8d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 177/211] pdfpc: *Flags are lists --- pkgs/applications/misc/pdfpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 1adab6b70a3..a44cccf9a9d 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs librsvg pcre ]; - cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; patches = [ # Fix build vala 0.46 From e25e1bf6f7e0feb3482928f22a8e71ada7081fcf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 178/211] slmenu: *Flags are lists --- pkgs/applications/misc/slmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 193bcf205f5..55025621fc7 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchhg}: let - s = + s = rec { baseName = "slmenu"; version = "hg-${date}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchhg { inherit (s) url sha256; }; - makeFlags = ''PREFIX=$(out)''; + makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; description = ''A console dmenu-like tool''; From 4f3895b635053beda1d3ae524e63ac0647bc5293 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 179/211] pond: *Flags are lists --- .../applications/networking/instant-messengers/pond/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 1ddc603dc62..1d70c9641f8 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { buildInputs = [ trousers gtk3 gtkspell3 ] ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; - buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; + buildFlags = stdenv.lib.optionals (!gui) [ "-tags" "nogui" ]; excludedPackages = "\\(appengine\\|bn256cgo\\)"; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ From 371d3fb9b357adcb17f3bb1f44dbf9812ca884db Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 180/211] notes-up: *Flags are lists --- pkgs/applications/office/notes-up/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 6b8694a91d4..1d2e581f3c9 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; # Whether to build with contractor support (Pantheon specific) - cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes"; passthru = { updateScript = pantheon.updateScript { From 1065d80dd3e6001d8a5f9438777dcf48c20dbf16 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 181/211] simgrid: *Flags are lists --- .../science/misc/simgrid/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 58f464575b0..44b0f5d84b6 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -54,28 +54,28 @@ stdenv.mkDerivation rec { # # For more information see: # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) - cmakeFlags= '' - -Denable_documentation=${optionOnOff buildDocumentation} - -Denable_java=${optionOnOff buildJavaBindings} - -Denable_fortran=${optionOnOff fortranSupport} - -Denable_model-checking=${optionOnOff modelCheckingSupport} - -Denable_ns3=off - -Denable_lua=off - -Denable_lib_in_jar=off - -Denable_maintainer_mode=off - -Denable_mallocators=on - -Denable_debug=on - -Denable_smpi=on - -Denable_smpi_ISP_testsuite=${optionOnOff moreTests} - -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} - -Denable_compile_warnings=${optionOnOff debug} - -Denable_compile_optimizations=${optionOnOff (!debug)} - -Denable_lto=${optionOnOff (!debug)} - ''; - # -Denable_lua=${optionOnOff luaSupport} - # -Denable_smpi_papi=${optionOnOff moreTests} + cmakeFlags = [ + "-Denable_documentation=${optionOnOff buildDocumentation}" + "-Denable_java=${optionOnOff buildJavaBindings}" + "-Denable_fortran=${optionOnOff fortranSupport}" + "-Denable_model-checking=${optionOnOff modelCheckingSupport}" + "-Denable_ns3=off" + "-Denable_lua=off" + "-Denable_lib_in_jar=off" + "-Denable_maintainer_mode=off" + "-Denable_mallocators=on" + "-Denable_debug=on" + "-Denable_smpi=on" + "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" + "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" + "-Denable_compile_warnings=${optionOnOff debug}" + "-Denable_compile_optimizations=${optionOnOff (!debug)}" + "-Denable_lto=${optionOnOff (!debug)}" + # "-Denable_lua=${optionOnOff luaSupport}" + # "-Denable_smpi_papi=${optionOnOff moreTests}" + ]; - makeFlags = optionalString debug "VERBOSE=1"; + makeFlags = optional debug "VERBOSE=1"; # Some Perl scripts are called to generate test during build which # is before the fixupPhase, so do this manualy here: From 5117f772468259cc9bd1051c744db563f509baaa Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 182/211] spectrwm: *Flags are lists --- pkgs/applications/window-managers/spectrwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index ba43403d9bb..1eb19e2de6f 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { subdir = if stdenv.isDarwin then "osx" else "linux"; in "spectrwm-SPECTRWM_2_7_2/${subdir}"; - makeFlags="PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; installPhase = "PREFIX=$out make install"; meta = with stdenv.lib; { From 81548bf7da236e213733f1a151a4351ae80e6b93 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 183/211] olm: *Flags are lists --- pkgs/development/libraries/olm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 224c01e2c50..8fbdf28965b 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; - makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc"; - installFlags = "PREFIX=$(out)"; + installFlags = [ + "PREFIX=${placeholder ''out''}" + ]; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; From 5572288ec2d7f23013053e55d6154933dd5029d0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 184/211] openvdb: *Flags are lists --- .../development/libraries/openvdb/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 483b3d788e2..840da046170 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -20,21 +20,22 @@ stdenv.mkDerivation rec sourceRoot=$(echo */openvdb) ''; - installTargets = "install_lib"; + installTargets = [ "install_lib" ]; enableParallelBuilding = true; - buildFlags = ''lib - DESTDIR=$(out) - HALF_LIB=-lHalf - TBB_LIB=-ltbb - BLOSC_LIB=-lblosc - LOG4CPLUS_LIB= - BLOSC_INCLUDE_DIR=${c-blosc}/include/ - BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + buildFlags = [ + "lib" + "DESTDIR=$(out)" + "HALF_LIB=-lHalf" + "TBB_LIB=-ltbb" + "BLOSC_LIB=-lblosc" + "LOG4CPLUS_LIB=" + "BLOSC_INCLUDE_DIR=${c-blosc}/include/" + "BLOSC_LIB_DIR=${c-blosc}/lib/" + ]; - installFlags = ''DESTDIR=$(out)''; + installFlags = [ "DESTDIR=$(out)" ]; NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; NIX_LDFLAGS="-lboost_iostreams"; From c739183eeff32949ea44692919f6d09c0e59718e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 185/211] tachyon: *Flags are lists --- pkgs/development/libraries/tachyon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 5e0f37bbb52..d1d4ee806b8 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x86_64-freebsd" then "bsd" else if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; - makeFlags = arch; + makeFlags = [ arch ]; patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch From 7139d2c8815121bb4d028d8749985f3105d1e272 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 186/211] vxl: *Flags are lists --- pkgs/development/libraries/vxl/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 9651e9a5f80..17d11d4fb74 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -11,14 +11,17 @@ stdenv.mkDerivation { buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; - # BUILD_OUL wants old linux headers for videodev.h, not available - # in stdenv linux headers - # BUILD_BRL fails to find open() - cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " - + (if stdenv.hostPlatform.system == "x86_64-linux" then - "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" - else - ""); + cmakeFlags = [ + # BUILD_OUL wants old linux headers for videodev.h, not available + # in stdenv linux headers + "-DBUILD_OUL=OFF" + # BUILD_BRL fails to find open() + "-DBUILD_BRL=OFF" + "-DBUILD_CONTRIB=OFF" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DCMAKE_C_FLAGS=-fPIC" + ]; enableParallelBuilding = true; From 8df63ca72f391f78d7e9ec23fa1fe461d19d41c8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 187/211] fontconfig: *Flags are lists --- pkgs/development/ocaml-modules/fontconfig/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 4f586f2f99e..ce17cc60ebf 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml fontconfig ]; - makeFlags = "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/ OCAML_HAVE_OCAMLOPT=yes"; + makeFlags = [ + "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/" + "OCAML_HAVE_OCAMLOPT=yes" + ]; meta = { description = "Fontconfig bindings for OCaml"; From 9052e1c5b7ec74a2902c072e3259c68f7a2694e9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 188/211] pingus: *Flags are lists --- pkgs/games/pingus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 640a4d761f4..628493a34b1 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; }) ]; - makeFlags = "PREFIX=${placeholder "out"}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; dontUseSconsInstall = true; meta = { inherit (s) version; From 12df4ccf7cbde6e9ad999d5cc3bd4a74c5061b9d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 189/211] rtl8723bs: *Flags are lists --- pkgs/os-specific/linux/rtl8723bs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index b1e01f705dc..f468196dc73 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; - makeFlags = concatStringsSep " " [ + makeFlags = [ "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; From 8fb0e1613397d43ddd70549a646d18fd6938a577 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 190/211] munin: *Flags are lists --- pkgs/servers/monitoring/munin/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index d978cb003c7..46e1460d795 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -92,16 +92,16 @@ stdenv.mkDerivation rec { # 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. - makeFlags = '' - PREFIX=$(out) - DESTDIR=$(out) - PERLLIB=$(out)/${perlPackages.perl.libPrefix} - PERL=${perlPackages.perl.outPath}/bin/perl - PYTHON=${python.outPath}/bin/python - RUBY=${ruby.outPath}/bin/ruby - JAVARUN=${jre.outPath}/bin/java - PLUGINUSER=munin - ''; + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" + "PERL=${perlPackages.perl.outPath}/bin/perl" + "PYTHON=${python.outPath}/bin/python" + "RUBY=${ruby.outPath}/bin/ruby" + "JAVARUN=${jre.outPath}/bin/java" + "PLUGINUSER=munin" + ]; postFixup = '' echo "Removing references to /usr/{bin,sbin}/ from munin plugins..." From f85cfd274d25989f365f835ac95fb2664e29352e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 191/211] uhub: *Flags are lists --- pkgs/servers/uhub/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 6483973546c..11dd5449b4b 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = '' - -DSYSTEMD_SUPPORT=ON - ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"} - ''; + cmakeFlags = [ + "-DSYSTEMD_SUPPORT=ON" + (if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF") + ]; meta = with stdenv.lib; { description = "High performance peer-to-peer hub for the ADC network"; From 0a82a093d7049e16305704da58022d224750a624 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 192/211] vobcopy: *Flags are lists --- pkgs/tools/cd-dvd/vobcopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index f181ab71edf..48a58c0c7d1 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [libdvdread libdvdcss]; - makeFlags = "DESTDIR=$(out) PREFIX=/"; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; From 96fc34a8cd416df3fdb9631a53625b0a506e516f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 193/211] pfstools: *Flags are lists --- pkgs/tools/graphics/pfstools/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 6dafbfe2f9f..6a0385614e8 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man"]; - cmakeFlags = '' - -DWITH_MATLAB=false - ''; + cmakeFlags = [ "-DWITH_MATLAB=false" ]; preConfigure = '' rm cmake/FindNETPBM.cmake From 0f45b9174684a10648c8400610ea09e9e6fc4ebc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 194/211] mktorrent: *Flags are lists --- pkgs/tools/misc/mktorrent/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index b2f7fdf2a90..c88f12c74d1 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr"; }; - makeFlags = "USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" - + stdenv.lib.optionalString stdenv.isi686 " USE_LARGE_FILES=1" - + stdenv.lib.optionalString stdenv.isLinux "CFLAGS=-lgcc_s"; + makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] + ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1" + ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; - preInstall = '' - installFlags=PREFIX=$out - ''; + installFlags = [ "PREFIX=${placeholder "out"}" ]; buildInputs = [ openssl ]; From e41bead685629c4d545943bc76e074913bf5f611 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 195/211] multitail: *Flags are lists --- pkgs/tools/misc/multitail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 92945004cb0..6ca0c6e8e08 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin "-f makefile.macosx"; + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; installPhase = '' mkdir -p $out/bin From 4d4a2b4724de90b231d46f9eb3fe665beaeb1c8c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 196/211] tmpwatch: *Flags are lists --- pkgs/tools/misc/tmpwatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 59aa3861510..006cef6f102 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; - configureFlags="--with-fuser=${psmisc}/bin/fuser"; + configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; From 08d5fc393457121b531417ee6c922e3ebee0187c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH 197/211] monkeysphere: *Flags are lists --- pkgs/tools/security/monkeysphere/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 97d032045b3..1e585136d88 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -36,10 +36,10 @@ in stdenv.mkDerivation rec { ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); - makeFlags = '' - PREFIX=/ - DESTDIR=$(out) - ''; + makeFlags = [ + "PREFIX=/" + "DESTDIR=$(out)" + ]; # The tests should be run (and succeed) when making changes to this package # but they aren't enabled by default because they "drain" entropy (GnuPG From 7acacddfa5339da9296ecd0ff806e904ad074e06 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 12:32:16 +0100 Subject: [PATCH 198/211] go*: fix aarch64 build Some tests don't work well with gcc9 atm, those tests use CC from `buildPackages.stdenv.cc` which had to be modified for Aarch64 as well. --- pkgs/top-level/all-packages.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7513834a25b..879c6562707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8225,15 +8225,19 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix { + go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); - go_1_13 = callPackage ../development/compilers/go/1.13.nix { + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); go = go_1_13; From 133103d7094c148bdc9152562b16c8872c44f345 Mon Sep 17 00:00:00 2001 From: Merijn Broeren Date: Sun, 27 Oct 2019 13:03:25 +0000 Subject: [PATCH 199/211] treewide: replace make/build/configure/patchFlags with nix lists --- nixos/modules/services/x11/extra-layouts.nix | 2 +- pkgs/applications/audio/aeolus/default.nix | 2 +- pkgs/applications/audio/airwave/default.nix | 2 +- pkgs/applications/audio/distrho/default.nix | 2 +- pkgs/applications/audio/foo-yc20/default.nix | 2 +- pkgs/applications/audio/sndpeek/default.nix | 2 +- pkgs/applications/audio/vcv-rack/default.nix | 2 +- pkgs/applications/editors/bviplus/default.nix | 2 +- .../applications/editors/edbrowse/default.nix | 4 +- pkgs/applications/editors/fte/default.nix | 4 +- pkgs/applications/editors/jucipp/default.nix | 2 +- .../graphics/smartdeblur/default.nix | 2 +- pkgs/applications/graphics/zgv/default.nix | 2 +- pkgs/applications/misc/bibletime/default.nix | 2 +- pkgs/applications/misc/cbatticon/default.nix | 2 +- pkgs/applications/misc/ddgr/default.nix | 2 +- pkgs/applications/misc/fbreader/default.nix | 4 +- pkgs/applications/misc/googler/default.nix | 2 +- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/jp2a/default.nix | 2 +- .../misc/notify-osd-customizable/default.nix | 2 +- pkgs/applications/misc/stupidterm/default.nix | 2 +- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- .../purple-vk-plugin/default.nix | 2 +- .../networking/irc/sic/default.nix | 2 +- .../networking/mailreaders/mblaze/default.nix | 2 +- .../office/libreoffice/default.nix | 4 +- pkgs/applications/radio/dmrconfig/default.nix | 2 +- .../science/biology/sumatools/default.nix | 2 +- .../science/logic/coq/default.nix | 2 +- .../science/logic/prover9/default.nix | 2 +- .../science/math/msieve/default.nix | 2 +- .../science/math/ries/default.nix | 2 +- .../science/math/scilab/default.nix | 2 +- .../science/misc/megam/default.nix | 2 +- .../git-and-tools/git-imerge/default.nix | 2 +- .../git-and-tools/stgit/default.nix | 2 +- .../version-management/gogs/default.nix | 2 +- .../version-management/mr/default.nix | 2 +- .../virtualization/containerd/default.nix | 2 +- .../virtualization/xen/generic.nix | 4 +- .../window-managers/i3/blocks-gaps.nix | 4 +- .../window-managers/i3/lock-color.nix | 4 +- pkgs/applications/window-managers/i3/lock.nix | 4 +- .../window-managers/ion-3/default.nix | 4 +- .../window-managers/notion/default.nix | 4 +- .../window-managers/wmii-hg/default.nix | 2 +- .../desktop/mail-notification/default.nix | 2 +- .../mate/mate-screensaver/default.nix | 2 +- pkgs/desktops/rox/rox-filer/default.nix | 4 +- .../xfce/core/xfce4-panel/default.nix | 2 +- .../compilers/chicken/4/chicken.nix | 4 +- .../compilers/chicken/5/chicken.nix | 4 +- .../development/compilers/cmdstan/default.nix | 2 +- pkgs/development/compilers/dev86/default.nix | 2 +- pkgs/development/compilers/eli/default.nix | 2 +- pkgs/development/compilers/fpc/default.nix | 4 +- pkgs/development/compilers/fstar/default.nix | 4 +- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/compilers/iasl/default.nix | 6 +-- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 6 +-- pkgs/development/compilers/ocaml/3.12.1.nix | 6 +-- pkgs/development/compilers/ocaml/4.00.1.nix | 10 ++--- pkgs/development/compilers/ocaml/generic.nix | 4 +- .../compilers/ocaml/metaocaml-3.09.nix | 2 +- .../haskell-modules/configuration-common.nix | 2 +- .../development/interpreters/kona/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 2 +- pkgs/development/libraries/blitz/default.nix | 2 +- .../development/libraries/cfitsio/default.nix | 2 +- pkgs/development/libraries/cutee/default.nix | 2 +- .../libraries/filter-audio/default.nix | 2 +- .../development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/hspell/dicts.nix | 19 ++++----- pkgs/development/libraries/libav/default.nix | 2 +- pkgs/development/libraries/libcef/default.nix | 2 +- .../libraries/libcouchbase/default.nix | 2 +- .../libraries/libexecinfo/default.nix | 2 +- pkgs/development/libraries/libf2c/default.nix | 2 +- .../libraries/libowfat/default.nix | 2 +- .../libraries/libyaml-cpp/default.nix | 2 +- pkgs/development/libraries/lmdb/default.nix | 2 +- pkgs/development/libraries/ois/default.nix | 2 +- pkgs/development/libraries/readline/6.2.nix | 2 +- pkgs/development/libraries/readline/8.0.nix | 2 +- .../science/biology/mirtk/default.nix | 2 +- .../libraries/science/math/fenics/default.nix | 41 ++++++++++--------- pkgs/development/libraries/t1lib/default.nix | 2 +- pkgs/development/lua-modules/overrides.nix | 5 ++- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- .../development/misc/qmk_firmware/default.nix | 2 +- pkgs/development/ocaml-modules/biniou/1.0.nix | 2 +- .../ocaml-modules/bolt/default.nix | 2 +- .../ocaml-modules/camlzip/default.nix | 6 +-- .../ocaml-modules/cohttp/0.19.3.nix | 2 +- .../ocaml-modules/cryptokit/default.nix | 2 +- .../ocaml-modules/dolmen/default.nix | 2 +- .../ocaml-modules/dypgen/default.nix | 2 +- .../ocaml-modules/frontc/default.nix | 2 +- .../ocaml-modules/lablgl/default.nix | 2 +- .../ocaml-modules/lablgtk/2.14.0.nix | 2 +- .../ocaml-modules/lablgtk/default.nix | 2 +- .../ocaml-modules/llvm/default.nix | 4 +- .../ocaml-modules/ocaml-cairo/default.nix | 2 +- .../ocaml-modules/ulex/default.nix | 2 +- .../ocaml-modules/yojson/default.nix | 2 +- .../pure-modules/audio/default.nix | 2 +- .../pure-modules/avahi/default.nix | 2 +- pkgs/development/pure-modules/csv/default.nix | 2 +- pkgs/development/pure-modules/doc/default.nix | 2 +- .../pure-modules/fastcgi/default.nix | 2 +- .../pure-modules/faust/default.nix | 2 +- pkgs/development/pure-modules/ffi/default.nix | 2 +- pkgs/development/pure-modules/gen/default.nix | 2 +- pkgs/development/pure-modules/gl/default.nix | 5 ++- .../development/pure-modules/glpk/default.nix | 2 +- .../pure-modules/gplot/default.nix | 2 +- pkgs/development/pure-modules/gsl/default.nix | 2 +- pkgs/development/pure-modules/gtk/default.nix | 2 +- .../pure-modules/liblo/default.nix | 2 +- .../development/pure-modules/lilv/default.nix | 2 +- pkgs/development/pure-modules/lv2/default.nix | 2 +- .../development/pure-modules/midi/default.nix | 2 +- .../development/pure-modules/mpfr/default.nix | 2 +- .../pure-modules/octave/default.nix | 2 +- .../development/pure-modules/odbc/default.nix | 2 +- .../pure-modules/pandoc/default.nix | 2 +- .../pure-modules/rational/default.nix | 2 +- .../pure-modules/readline/default.nix | 2 +- .../pure-modules/sockets/default.nix | 2 +- .../development/pure-modules/sql3/default.nix | 2 +- .../pure-modules/stldict/default.nix | 2 +- .../pure-modules/stllib/default.nix | 2 +- pkgs/development/pure-modules/tk/default.nix | 2 +- pkgs/development/pure-modules/xml/default.nix | 2 +- .../python-modules/ephem/default.nix | 2 +- .../python-modules/koji/default.nix | 2 +- .../python-modules/m2crypto/default.nix | 2 +- .../python-modules/purepng/default.nix | 2 +- .../python-modules/pyside/default.nix | 2 +- .../python-modules/pythonirclib/default.nix | 2 +- .../ruby-modules/gem-config/default.nix | 23 +++++------ .../tools/analysis/ikos/default.nix | 2 +- .../tools/erlang/cuter/default.nix | 2 +- .../tools/misc/doclifter/default.nix | 2 +- .../tools/misc/sloccount/default.nix | 2 +- .../tools/ocaml/camlp4/default.nix | 4 +- .../tools/ocaml/camlp5/default.nix | 2 +- pkgs/development/tools/ocaml/cppo/default.nix | 2 +- pkgs/development/tools/ocaml/dune/default.nix | 2 +- .../tools/ocaml/ocamlscript/default.nix | 4 +- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 4 +- pkgs/development/tools/sslmate/default.nix | 2 +- pkgs/development/tools/stagit/default.nix | 2 +- pkgs/development/tools/tychus/default.nix | 2 +- pkgs/games/gmad/default.nix | 2 +- pkgs/games/openra/common.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/games/stockfish/default.nix | 2 +- pkgs/games/tremulous/default.nix | 2 +- pkgs/games/vitetris/default.nix | 2 +- pkgs/misc/beep/default.nix | 2 +- pkgs/misc/drivers/epkowa/default.nix | 2 +- pkgs/misc/drivers/xboxdrv/default.nix | 2 +- pkgs/misc/emulators/blastem/default.nix | 2 +- pkgs/misc/emulators/dlx/default.nix | 2 +- pkgs/misc/emulators/hatari/default.nix | 2 +- pkgs/misc/uboot/default.nix | 2 +- .../PowerManagement/default.nix | 2 +- .../Security/default.nix | 2 +- .../apple-source-releases/dtrace/default.nix | 2 +- .../apple-source-releases/libutil/default.nix | 2 +- pkgs/os-specific/darwin/libtapi/default.nix | 2 +- .../reattach-to-user-namespace/default.nix | 2 +- .../linux/broadcom-sta/default.nix | 2 +- pkgs/os-specific/linux/cifs-utils/default.nix | 2 +- pkgs/os-specific/linux/dmidecode/default.nix | 2 +- pkgs/os-specific/linux/drbd/default.nix | 8 +++- pkgs/os-specific/linux/extrace/default.nix | 2 +- pkgs/os-specific/linux/jool/cli.nix | 2 +- pkgs/os-specific/linux/ldm/default.nix | 2 +- pkgs/os-specific/linux/mmc-utils/default.nix | 2 +- pkgs/os-specific/linux/numad/default.nix | 2 +- pkgs/os-specific/linux/pam_mount/default.nix | 2 +- .../os-specific/linux/pcmciautils/default.nix | 4 +- pkgs/os-specific/linux/rfkill/default.nix | 2 +- pkgs/os-specific/linux/rtl8192eu/default.nix | 2 +- .../os-specific/linux/rtlwifi_new/default.nix | 2 +- pkgs/os-specific/linux/sysstat/default.nix | 4 +- pkgs/os-specific/linux/untie/default.nix | 2 +- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/servers/fileshare/default.nix | 2 +- pkgs/servers/mail/postfix/pfixtools.nix | 7 +--- pkgs/servers/mail/spamassassin/default.nix | 4 +- pkgs/servers/monitoring/nagios/default.nix | 4 +- pkgs/servers/nosql/redis/default.nix | 3 +- pkgs/servers/varnish/default.nix | 2 +- pkgs/shells/bash/5.0.nix | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- pkgs/tools/X11/setroot/default.nix | 4 +- pkgs/tools/X11/srandrd/default.nix | 2 +- pkgs/tools/X11/xcwd/default.nix | 2 +- pkgs/tools/X11/xdotool/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/X11/xpointerbarrier/default.nix | 2 +- pkgs/tools/archivers/undmg/default.nix | 2 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 2 +- pkgs/tools/cd-dvd/cdrkit/default.nix | 2 +- pkgs/tools/filesystems/ciopfs/default.nix | 2 +- pkgs/tools/filesystems/glusterfs/default.nix | 2 +- pkgs/tools/graphics/dpic/default.nix | 2 +- pkgs/tools/graphics/kst/default.nix | 2 +- pkgs/tools/graphics/pngcheck/default.nix | 2 +- pkgs/tools/graphics/quirc/default.nix | 2 +- pkgs/tools/misc/dylibbundler/default.nix | 2 +- pkgs/tools/misc/fdupes/default.nix | 2 +- pkgs/tools/misc/fondu/default.nix | 2 +- pkgs/tools/misc/fzy/default.nix | 2 +- pkgs/tools/misc/lf/default.nix | 4 +- pkgs/tools/misc/memtest86+/default.nix | 2 +- pkgs/tools/misc/moreutils/default.nix | 4 +- pkgs/tools/misc/pal/default.nix | 2 +- pkgs/tools/misc/svtplay-dl/default.nix | 2 +- pkgs/tools/misc/teleconsole/default.nix | 2 +- pkgs/tools/misc/tty-clock/default.nix | 2 +- pkgs/tools/misc/vmtouch/default.nix | 2 +- pkgs/tools/misc/xdo/default.nix | 2 +- pkgs/tools/networking/ratools/default.nix | 2 +- pkgs/tools/networking/shadowfox/default.nix | 2 +- pkgs/tools/networking/traceroute/default.nix | 2 +- .../tools/package-management/clib/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 4 +- pkgs/tools/security/aws-okta/default.nix | 2 +- pkgs/tools/security/crunch/default.nix | 2 +- pkgs/tools/security/meo/default.nix | 2 +- pkgs/tools/security/nitrokey-app/default.nix | 2 +- .../security/phrasendrescher/default.nix | 2 +- pkgs/tools/system/daemon/default.nix | 2 +- pkgs/tools/system/ioping/default.nix | 2 +- pkgs/tools/system/lr/default.nix | 2 +- pkgs/tools/system/nq/default.nix | 2 +- pkgs/tools/system/xe/default.nix | 2 +- pkgs/tools/text/ansifilter/default.nix | 2 +- pkgs/tools/text/replace/default.nix | 2 +- pkgs/tools/text/zimreader/default.nix | 2 +- pkgs/tools/typesetting/hevea/default.nix | 2 +- pkgs/tools/video/yamdi/default.nix | 2 +- 248 files changed, 336 insertions(+), 335 deletions(-) diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index b06bed7c09c..f48216ff446 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -141,7 +141,7 @@ in }); xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: { - configureFlags = "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb"; + configureFlags = [ "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb" ]; }); }; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 389052d30e1..ee9932a7aa3 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preBuild = "cd source"; - makeFlags = "DESTDIR= PREFIX=$(out)"; + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; meta = { description = "Synthetized (not sampled) pipe organ emulator"; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 737e73421c9..dde2c5e44b3 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -62,7 +62,7 @@ multiStdenv.mkDerivation { # Cf. https://github.com/phantom-code/airwave/issues/57 hardeningDisable = [ "format" ]; - cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK"; + cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; postInstall = '' mv $out/bin $out/libexec diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 054fc758d64..0d2858713eb 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { libXinerama libXrender ladspa-sdk ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://distrho.sourceforge.net; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index b17561e1567..e514032f44e 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 gtk2 lv2 faust ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index ecdafdaeadd..376aadc7385 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libXext libXi ]; - buildFlags = "linux-alsa"; + buildFlags = [ "linux-alsa" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c0bbd6e71db..11daabbf810 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -79,7 +79,7 @@ with stdenv.lib; stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; - buildFlags = "Rack"; + buildFlags = [ "Rack" ]; installPhase = '' install -D -m755 -t $out/bin Rack diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 2c6b153370e..7d70ad14b5d 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ncurses ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "CFLAGS=-fgnu89-inline" ]; diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 1161fc8256c..c43640b6524 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { done ''; - makeFlags = [ - "-C src" + makeFlags = [ + "-C" "src" "prefix=${placeholder "out"}" ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index d32a3fb5f1b..ab149131b80 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { }; src = [ ftesrc ftecommon ]; - buildFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; - installFlags = "PREFIX=$(out) INSTALL_NONROOT=1"; + installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; meta = with stdenv.lib; { description = "A free text editor for developers"; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 70b2d3c148d..2682c1e789b 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc ''; - cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so"; + cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 377a5ae6168..314b4007aad 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 fftw ]; - cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; + cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; meta = { homepage = https://github.com/Y-Vladimir/SmartDeblur; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 8ef705f7ef4..7b14d7750c3 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ./switch.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index a3f0a3b84f2..4e04cdbbf38 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake sword qt4 boost clucene_core ]; - cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" "-DCMAKE_BUILD_TYPE=Debug" ]; meta = { description = "A Qt4 Bible study tool"; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e506829b575..d6680c61eb9 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i -e 's/ -Wno-format//g' Makefile ''; - makeFlags = "PREFIX=${placeholder "out"}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Lightweight and fast battery icon that sits in the system tray"; diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 9b877c2594b..7d211b26a42 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' # Version 1.7 was released as 1.6 diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index e7d0e6a63a5..857ef9ac27b 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation { ++ optional (uiType == "gtk") gtk2 ++ optionals (uiType == "cocoa") [ AppKit Cocoa ]; - makeFlags = "INSTALLDIR=$(out)"; + makeFlags = [ "INSTALLDIR=$(out)" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6 + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with stdenv.lib; { description = "An e-book reader for Linux"; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 60feecd665d..3e4c9828ede 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/jarun/googler"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 4251d2c1f36..b5c57054f8b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs"; - buildFlags = "-tags extended"; + buildFlags = [ "-tags" "extended" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 2a9e162e7ea..1aece5eb4e2 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 4568c3e8acc..d75ec9ef2c2 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libtool ]; - configureFlags = "--libexecdir=$(out)/bin"; + configureFlags = [ "--libexecdir=$(out)/bin" ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index a3247b29fb8..b786b34e955 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; + makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index eb6d954eb33..bfd4b1abd5e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [pkgconfig]; buildInputs = [gtk2 glib pidgin]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -e 's/-Wl,-soname//' -i Makefile diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index a2e59f0c0ff..edb4ca3c349 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt ''; - cmakeFlags = "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1"; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; meta = { homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index b081a6b3672..40914295597 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sic"; version = "1.2"; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6c3b3a69b1d..ba8f272203b 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 374810138f6..70b439a5f77 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,7 +57,7 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"); patches = [ ./xdg-open-brief.patch @@ -248,7 +248,7 @@ in (stdenv.mkDerivation rec { find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; ''; - makeFlags = "SHELL=${bash}/bin/bash"; + makeFlags = [ "SHELL=${bash}/bin/bash" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index f718854224c..68b4cfe8af4 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig ''; - makeFlags = "VERSION=${version} GITCOUNT=0"; + makeFlags = [ "VERSION=${version}" "GITCOUNT=0" ]; installPhase = '' mkdir -p $out/bin $out/lib/udev/rules.d diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix index f9042f30011..5230fcd2eb6 100644 --- a/pkgs/applications/science/biology/sumatools/default.nix +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -22,7 +22,7 @@ in rec { rev = "sumalib_v${version}"; sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; inherit meta; }; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2378cb9408e..ac001540e09 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -143,7 +143,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = "revision coq coqide bin/votour"; + buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; createFindlibDestdir = true; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index a4538e1070a..9528a5942a4 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - buildFlags = "all"; + buildFlags = [ "all" ]; checkPhase = "make test1"; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 6e1926810df..643d990feb8 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too - makeFlags = "CC=cc all"; + makeFlags = [ "CC=cc" "all" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index 4b237a01a3e..b244ee75b30 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://mrob.com/pub/ries/; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 432280a18fb..02f1f4e58a9 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!withXaw3d) "--with-local-xaw" ; - makeFlags = "all"; + makeFlags = [ "all" ]; meta = { homepage = http://www.scilab.org/; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index f86bed854a2..6cdc86d20eb 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - makeFlags = "CAML_INCLUDES=${ocaml}/lib/ocaml/caml"; + makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 76b29135f66..528a96c9903 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - makeFlags = "PREFIX= DESTDIR=$(out)" ; + makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; meta = with stdenv.lib; { homepage = https://github.com/mhagger/git-imerge; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 660c391c0d5..3a354133e87 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ python2 git ]; - makeFlags = "prefix=$$out"; + makeFlags = [ "prefix=$$out" ]; postInstall = '' mkdir -p "$out/etc/bash_completion.d/" diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index c2153ebea89..d06ae234ae9 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ] ++ optional pamSupport pam; - buildFlags = "-tags"; + buildFlags = [ "-tags" ]; buildFlagsArray = ( optional sqliteSupport "sqlite" diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index a4632399df0..66e63fcc375 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Multiple Repository management tool"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 70865ea848b..9e9e6657291 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; buildInputs = [ btrfs-progs go-md2man utillinux ]; - buildFlags = "VERSION=v${version}"; + buildFlags = [ "VERSION=v${version}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 8093d4752a0..5a8814fb9e2 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -187,11 +187,11 @@ stdenv.mkDerivation (rec { ''; # TODO: Flask needs more testing before enabling it by default. - #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ]; makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] ++ (config.makeFlags or []); - buildFlags = "xen tools"; + buildFlags = [ "xen" "tools" ]; postBuild = '' make -C docs man-pages diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index c62edd6d71a..acfd06235ac 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0v9307ij8xzwdaxay3r75sd2cp453s3qb6q7dy9fks2p6wwqpazi"; }; - makeFlags = "all"; - installFlags = "PREFIX=\${out} VERSION=${version}"; + makeFlags = [ "all" ]; + installFlags = [ "PREFIX=\${out}" "VERSION=${version}" ]; buildInputs = optional (contains_any scripts perlscripts) perl; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 2fb6fb44833..7895d8c124a 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; - makeFlags = "all"; + makeFlags = [ "all" ]; preInstall = '' mkdir -p $out/share/man/man1 ''; - installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; + installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" "MANDIR=\${out}/share/man" ]; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 3e976f8919f..619345d1b96 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; - makeFlags = "all"; - installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc"; + makeFlags = [ "all" ]; + installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" ]; postInstall = '' mkdir -p $out/share/man/man1 cp *.1 $out/share/man/man1 diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index c13b950599e..073af3bfd05 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ xlibsWrapper lua gettext groff ]; - buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; - installFlags = "PREFIX=\${out}"; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + installFlags = [ "PREFIX=\${out}" ]; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index eaeb9979c10..60900bd2a3c 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; - buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; - installFlags = "PREFIX=\${out}"; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + installFlags = [ "PREFIX=\${out}" ]; postInstall = '' wrapProgram $out/bin/notion \ diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index e0f2243827c..426fcfe8efc 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help - makeFlags = "WMII_HGVERSION=hg${rev}"; + makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; meta = { homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 10b99e4eb5d..c12d50d792f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./patches/mail-notification-dont-link-against-bsd-compat.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = "./jb configure prefix=$out"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 0e99d03c081..23e8080f01f 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-console-kit" ]; - makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; + makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 05f5936a6cb..b7c40153209 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; - NIX_LDFLAGS = [ "-ldl" "-lm" ]; + NIX_LDFLAGS = "-ldl -lm"; patches = [ ./rox-filer-2.11-in-source-build.patch @@ -23,7 +23,7 @@ in stdenv.mkDerivation { setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; # patch source with defined patches - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f7e500bdf54..f4d86247c6c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -11,7 +11,7 @@ mkXfceDerivation { buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = "-p1"; + patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 4112a74d5ee..380755bf01e 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; + installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; # We need a bootstrap-chicken to regenerate the c-files after # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index fb280795d88..3e47e413636 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out)"; - installFlags = "PLATFORM=${platform} PREFIX=$(out)"; + buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; + installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; buildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 9a01519a881..edde6af615f 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; }; - buildFlags = "build"; + buildFlags = [ "build" ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 839ee821d00..37f79933b77 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Linux 8086 development environment"; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index a22862c4292..90c2b8fd23c 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; # skip interactive browser check - buildFlags = "nobrowsers"; + buildFlags = [ "nobrowsers" ]; preConfigure='' diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index a2b73f61c27..7bddafc6ff5 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; - makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; + makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; - installFlags = "INSTALL_PREFIX=\${out}"; + installFlags = [ "INSTALL_PREFIX=\${out}" ]; postInstall = '' for i in $out/lib/fpc/*/ppc*; do diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 9306eec817f..533140631a5 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { patchShebangs src/tools patchShebangs bin ''; - buildFlags = "-C src/ocaml-output"; + buildFlags = [ "-C" "src/ocaml-output" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; - installFlags = "-C src/ocaml-output"; + installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" ''; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 7066744bb54..08ba9e46814 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). - cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include"; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; prePatch = '' substituteInPlace ./configure \ diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index fccdf7a978d..a96ad3bd6f0 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; - NIX_CFLAGS_COMPILE = [ - "-O3" - ]; + NIX_CFLAGS_COMPILE = "-O3"; - buildFlags = "iasl"; + buildFlags = [ "iasl" ]; buildInputs = [ bison flex ]; diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 556aefd3704..a6d2bcd875e 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (rec { prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; - buildFlags = "world bootstrap world.opt"; + buildFlags = [ "world" "bootstrap" "world.opt" ]; buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 4be41490534..f582ef9834a 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -7,10 +7,10 @@ let in stdenv.mkDerivation rec { - + pname = "ocaml"; version = "3.11.2"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index edb3acdbdb1..1026b1bd8d7 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -7,10 +7,10 @@ let in stdenv.mkDerivation rec { - + pname = "ocaml"; version = "3.12.1"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 2669e8224bf..a4b21251bd1 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -3,22 +3,22 @@ let useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "ocaml"; version = "4.00.1"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; + configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; + buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d39c0d86fd5..6980b6e5ff1 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation (args // { ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; + installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index aa50cf225ca..1f53c4f0e78 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; - buildFlags = "world bootstrap world.opt"; + buildFlags = [ "world" "bootstrap" "world.opt" ]; buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 52cc2f1e943..7b06628dbc7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -745,7 +745,7 @@ self: super: { substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" ''; nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; - makeFlags = "html"; + makeFlags = [ "html" ]; installPhase = '' mv _build/html $out ''; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index a9922a38765..9b7f36f4c87 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = ''mkdir -p "$out/bin"''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 97d2b67372a..fe77a27d449 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ./1.8.5-arm-flags.patch ]; - patchFlags = "-p3"; + patchFlags = [ "-p3" ]; # fixes build on gcc8 postPatch = '' diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index fd0da496fa4..f370e45b5fd 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildFlags = "lib info pdf html"; + buildFlags = [ "lib" "info" "pdf" "html" ]; installTargets = [ "install" "install-info" "install-pdf" "install-html" ]; inherit doCheck; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 7576c24024a..4b84f73a258 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # Shared-only build - buildFlags = "shared"; + buildFlags = [ "shared" ]; postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 1658f8a6fa7..1c14454af5c 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2"; }; - buildFlags = "cutee"; + buildFlags = [ "cutee" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 07f1c7ec917..3438bfee07b 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Lightweight audio filtering library made from webrtc code"; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 157f801d2f2..c2165a9d9c7 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -86,5 +86,5 @@ stdenv.mkDerivation rec { } // stdenv.lib.optionalAttrs stdenv.isDarwin { - makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index ec6b304dc3c..637a11efaef 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -1,42 +1,39 @@ { stdenv, hspell }: let - dict = a: stdenv.mkDerivation ({ + dict = variant: a: stdenv.mkDerivation ({ inherit (hspell) src patchPhase nativeBuildInputs; meta = hspell.meta // { broken = true; - description = "${a.buildFlags} Hebrew dictionary"; + description = "${variant} Hebrew dictionary"; + + buildFlags = [ variant ]; + } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); in { recurseForDerivations = true; - aspell = dict { + aspell = dict "aspell" { name = "aspell-dict-he-${hspell.version}"; - buildFlags = "aspell"; - installPhase = '' mkdir -p $out/lib/aspell cp -v he_affix.dat he.wl $out/lib/aspell''; }; - myspell = dict { + myspell = dict "myspell" { name = "myspell-dict-he-${hspell.version}"; - buildFlags = "myspell"; - installPhase = '' mkdir -p $out/lib/myspell cp -v he.dic he.aff $out/lib/myspell''; }; - hunspell = dict { + hunspell = dict "hunspell" { name = "hunspell-dict-he-${hspell.version}"; - buildFlags = "hunspell"; - installPhase = '' mkdir -p $out/lib cp -rv hunspell $out/lib''; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index feeb4de15e1..43cfe2ef251 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -103,7 +103,7 @@ let setOutputFlags = false; # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. - buildFlags = "all alltools install-man"; + buildFlags = [ "all" "alltools" "install-man" ]; postInstall = '' diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index be418125dfb..03cc3b2beb4 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - makeFlags = "libcef_dll_wrapper"; + makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index ccfe241324e..53ec231dec9 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7"; }; - cmakeFlags = "-DLCB_NO_MOCK=ON"; + cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libevent openssl ]; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 2eee9bafe44..4519cc7dd74 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; installPhase = '' install -Dm644 execinfo.h stacktraverse.h -t $out/include diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 2de407e8f63..10a0d179d3e 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { unzip ${src} ''; - makeFlags = "-f makefile.u"; + makeFlags = [ "-f" "makefile.u" ]; installPhase = '' mkdir -p $out/include $out/lib diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 4f1a5f8a179..73029c76818 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)' ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 6d782543099..0dec9daee6a 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 830ec7bdaee..25bac68faf6 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; patches = [ ./hardcoded-compiler.patch ]; - patchFlags = "-p3"; + patchFlags = [ "-p3" ]; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 15e83cf9d76..c1b065dbf2b 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; buildInputs = [ autoconf automake libtool libX11 xorgproto libXi libXaw diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 54aa42439d9..af59e50ec5e 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ ./link-against-ncurses.patch ./no-arch_only.patch diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index cdc36617c52..7fbef9a986a 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; upstreamPatches = (let diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index e6c58b96e5c..3b3eba39cc3 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON"; + cmakeFlags = [ "-DWITH_VTK=ON" "-DBUILD_ALL_MODULES=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index a93ede63a26..2bb284477e6 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -142,26 +142,27 @@ stdenv.mkDerivation { numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ]; patches = [ ./unicode.patch ]; - cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11" - + " -DDOLFIN_AUTO_DETECT_MPI=OFF" - + " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF") - + " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_PARMETIS=OFF" - + " -DDOLFIN_ENABLE_PETSC4PY=OFF" - + " -DDOLFIN_ENABLE_PETSC=OFF" - + " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF") - + " -DDOLFIN_ENABLE_SCOTCH=OFF" - + " -DDOLFIN_ENABLE_SLEPC4PY=OFF" - + " -DDOLFIN_ENABLE_SLEPC=OFF" - + " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF") - + " -DDOLFIN_ENABLE_TRILINOS=OFF" - + " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"); + cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11" + "-DDOLFIN_AUTO_DETECT_MPI=OFF" + ("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")) + "-DDOLFIN_ENABLE_PARMETIS=OFF" + "-DDOLFIN_ENABLE_PETSC4PY=OFF" + "-DDOLFIN_ENABLE_PETSC=OFF" + ("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")) + "-DDOLFIN_ENABLE_SCOTCH=OFF" + "-DDOLFIN_ENABLE_SLEPC4PY=OFF" + "-DDOLFIN_ENABLE_SLEPC=OFF" + ("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")) + "-DDOLFIN_ENABLE_TRILINOS=OFF" + ("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF")) + ]; checkPhase = '' make runtests ''; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index b8e7518cd33..010838efab5 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit patches; buildInputs = [ libX11 libXaw ]; - buildFlags = "without_doc"; + buildFlags = [ "without_doc" ]; postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 9139befe020..fd99a70de3a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -42,7 +42,8 @@ with super; ]; # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null; + NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin + "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua @@ -253,7 +254,7 @@ with super; # Upstreams: # 5.1: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz # 5.2: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; patches = [ ./luuid.patch ]; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index c3bf3217b6a..a3a4573c0ae 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix index 8abe4b2550e..38b1df3ca3b 100644 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { --replace arm-none-eabi arm-none-eabihf rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk ''; - buildFlags = "all:default"; + buildFlags = [ "all:default" ]; doCheck = true; checkTarget = "test:all"; installPhase = '' diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index 2584c5ad8b3..ed216d8236a 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' mkdir $out/bin diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index b5a4f179b17..7b8103efac8 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -45,7 +45,7 @@ EOF createFindlibDestdir = true; - buildFlags = "all"; + buildFlags = [ "all" ]; doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index d0bc2f5a375..7de8968e061 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -8,14 +8,14 @@ let url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; patches = []; - installTargets = "install-findlib"; + installTargets = [ "install-findlib" ]; } else { version = "1.05"; download_id = "1037"; url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; patches = [./makefile_1_05.patch]; - installTargets = "install"; + installTargets = [ "install" ]; }; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" ''; - buildFlags = "all allopt"; + buildFlags = [ "all" "allopt" ]; inherit (param) installTargets; diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix index 99f101010f3..24547a03a08 100644 --- a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix +++ b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix @@ -19,7 +19,7 @@ buildOcaml rec { ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; - buildFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-cohttp; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 50857e159dd..1c7a0ccb0fa 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ncurses ]; propagatedBuildInputs = [ param.zarith zlib ]; - buildFlags = "setup.data build"; + buildFlags = [ "setup.data" "build" ]; preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 26876cad8c8..824da303068 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ menhir ]; - makeFlags = "-C src"; + makeFlags = [ "-C" "src" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 1abf387bdd3..62e63592566 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { make ''; - makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib"; + makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; meta = { homepage = http://dypgen.free.fr; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index 39ec4c011f8..979c364e496 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }) ]; - makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)"; + makeFlags = [ "PREFIX=$(out)" "OCAML_SITE=$(OCAMLFIND_DESTDIR)" ]; postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META"; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index ae85847b58b..847322b1a10 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildFlags = "lib libopt glut glutopt"; + buildFlags = [ "lib" "libopt" "glut" "glutopt" ]; postInstall = '' cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index d0349de4db3..e2ebb76397c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = "world"; + buildFlags = [ "world" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 217af54040f..46b76abd268 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = "world"; + buildFlags = [ "world" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index fff4cff7802..b74501fdd68 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib" ]; - buildFlags = "ocaml_all"; + buildFlags = [ "ocaml_all" ]; - installFlags = "-C bindings/ocaml"; + installFlags = [ "-C" "bindings/ocaml" ]; postInstall = '' mkdir -p $OCAMLFIND_DESTDIR/ diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index cd9d9f2d150..da68c811df1 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ ''; - makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo"; + makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; meta = { homepage = http://cairographics.org/cairo-ocaml; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index ed868c30a44..d32fcf07b6c 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ camlp4 ]; - buildFlags = "all all.opt"; + buildFlags = [ "all" "all.opt" ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 24942da0072..dca97a53cbf 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -15,7 +15,7 @@ let extra = { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = "mkdir $out/bin"; }; diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 2cdab404c5f..cd1435d6599 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index f94ee8d7637..8ce33e67efe 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure avahi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 846fb7e3730..7524823a5dc 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 54f99bf8afc..1a006c9eb8f 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index ebd13743442..e41110386d7 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure fcgi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 74ec8e49343..e1c1b4d2d4b 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure faust libtool ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index efea0b4182c..4d019b5b699 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libffi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 22bbb4d3be4..54ac78fd6c4 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hsEnv pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "Pure interface generator"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index b67a972b00b..34c13f99f92 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ + "libdir=${placeholder ''out''}/lib" + "prefix=${placeholder ''out''}/" + ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 34d12f1471f..838e81b20ba 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure glpkWithExtras ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index d1657cdd445..c45f51509b7 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gnuplot ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 08aa674eb6b..847fe7538e9 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index a6a93f9ec95..1e7957ae382 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 2dd0865f6ea..94ceef78908 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure liblo ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 7f3638fe5c9..c0f50812946 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; - makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 98556acbf28..b4a63eb7020 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lv2 ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index 950c536e760..e55d4994455 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portmidi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 63196fadf46..59617beb461 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 8fbb1dac320..e117d04a4cc 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure octave ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 4ae1e58a7bc..69808d1aaf0 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libiodbc ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index d5b0a7dbde5..17a16229b57 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 20d61e5c362..547610fdf01 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index a6bb2ed6167..d145788c552 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure readline ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 235478a1776..aa8245bb12d 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index 91ff3a446c2..aa3b2544af0 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure sqlite ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 8c39b9791e0..b248a0084ff 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index dd7a945182b..d29719891d2 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 03e322d74c0..d939a3b3ad4 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index 8e268611035..73753a5d34f 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 9069bef68e0..2b7815c6978 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0dj4kk325b01s7q1zkwpm9rrzl7n1jf7fr92wcajjhc5kx14hwb0"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; checkInputs = [ pytest glibcLocales ]; # JPLTest uses assets not distributed in package checkPhase = '' diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 47c42a1df45..aec1916c1ff 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # Judging from SyntaxError disabled = isPy3k; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; postInstall = '' mv $out/usr/* $out/ diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 56e1de49f20..0ccf55e5bc4 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27"; }) ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; nativeBuildInputs = [ swig2 ]; buildInputs = [ swig2 openssl ]; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index fbaa1cfad71..c6f28067bf6 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { sha256 = "1ag0pji3p012hmj8kadcd0vydv9702188c0isizsi964qcl4va6m"; }) ]; - patchFlags = "-p1 -d code"; + patchFlags = [ "-p1" "-d" "code" ]; # cython is optional - if not supplied, the "pure python" implementation will be used nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 3f20a6ae478..df309c5c68a 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ mesa libGL ]; - makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; + makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index d4f81a82546..6074b76d300 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; })]; - patchFlags = "irclib.py"; + patchFlags = [ "irclib.py" ]; propagatedBuildInputs = [ paver ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index de9d06f7ce0..8a119aa2d32 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -236,7 +236,7 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" "-Wno-error=sizeof-pointer-memaccess" @@ -495,23 +495,22 @@ in sassc = attrs: { nativeBuildInputs = [ rake ]; dontBuild = false; - SASS_LIBSASS_PATH = libsass; + SASS_LIBSASS_PATH = toString libsass; postPatch = '' substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' ''; - } // (if stdenv.isDarwin then { + } // (lib.optionalAttrs stdenv.isDarwin { # https://github.com/NixOS/nixpkgs/issues/19098 - buildFlags = "--disable-lto"; - } else {}); + buildFlags = [ "--disable-lto" ]; + }); - scrypt = attrs: - if stdenv.isDarwin then { - dontBuild = false; - postPatch = '' - sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile - ''; - } else {}; + scrypt = attrs: lib.optionalAttrs stdenv.isDarwin { + dontBuild = false; + postPatch = '' + sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile + ''; + }; semian = attrs: { buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 6f3df32f3c0..a882d158f32 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; - cmakeFlags = "-DAPRON_ROOT=${ocamlPackages.apron}"; + cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; postBuild = "make doc"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 736640eba8e..dccf4a55831 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper which ]; buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; - buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + buildFlags = [ "PWD=$(out)/lib/erlang/lib/cuter-${version}" "cuter_target" ]; configurePhase = '' autoconf ./configure --prefix $out diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 9975f0f5465..fe86a22b7f4 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ python ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 965f0ed096c..4d63e2c6a15 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlags = "PREFIX=$(out) CC=cc"; + makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 6b471560fa9..de5da5674a2 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; - makeFlags = "all"; + makeFlags = [ "all" ]; - installTargets = "install install-META"; + installTargets = [ "install" "install-META" ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 1531408e498..c3fbb586349 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { preConfigure = "configureFlagsArray=(--strict" + " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; - buildFlags = "world.opt"; + buildFlags = [ "world.opt" ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 8aa446081b7..fc5f2e4a688 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -18,7 +18,7 @@ let param = sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; extra = { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' mkdir $out/bin ''; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 075020eef5c..ef0f5c4fabd 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; - buildFlags = "release"; + buildFlags = [ "release" ]; dontAddPrefix = true; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 28efaf4cf3d..33b729f938d 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { patches = [ ./Makefile.patch ]; - buildFlags = "PREFIX=$(out)"; - installFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; preInstall = "mkdir $out/bin"; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 1ea1cd4ab38..6a3c0c20d85 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { url = "https://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ ./warn.patch ]; buildInputs = [ ocaml makeWrapper ncurses ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = "world.opt"; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 8683c75a696..9fbdc2e2e87 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perlPackages.perl makeWrapper ]; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index f1a1ceb9bb1..8f4ee7ce6e5 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ libgit2 ]; diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 01531d23c78..5908ceb0f80 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; meta = { description = "Command line utility to live-reload your application."; diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index 78936ec1949..e51c326da19 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { else if stdenv.isDarwin then "gmad_osx" else "gmad"; - premakeFlags = "--bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include"; + premakeFlags = [ "--bootil_lib=${bootil}/lib" "--bootil_inc=${bootil}/include" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index b0d1f2a5455..51f94177177 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -69,7 +69,7 @@ in { python ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; doCheck = true; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index d0828b8811b..704ef3c327e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - makeFlags = "INSTALL_PERSONAL_DIR="; + makeFlags = [ "INSTALL_PERSONAL_DIR=" ]; postInstall = '' mv $out/games/ $out/bin diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index eea92b43b52..07ca9223bb0 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postUnpack = "sourceRoot+=/src"; makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; - buildFlags = "build "; + buildFlags = [ "build" ]; enableParallelBuilding = true; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index fc9bc985c00..7ea83f80fef 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cd .. ''; patches = [ ./parse.patch ]; - patchFlags = "-p 0"; + patchFlags = [ "-p" "0" ]; NIX_LD_FLAGS = '' -rpath ${stdenv.cc}/lib -rpath ${stdenv.cc}/lib64 diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index 7f552bdd5d6..fdc28d3a539 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - makeFlags = "INSTALL=install"; + makeFlags = [ "INSTALL=install" ]; meta = { description = "Terminal-based Tetris clone by Victor Nilsson"; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index ce097bd5f23..b98560992e3 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; - makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; + makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 29586f3fb55..13bb63ca709 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -245,7 +245,7 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 8ca83c2c93d..e2f2bcc2f24 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 39a7e38e034..0d4c7ab7216 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -11,7 +11,7 @@ let rev = "244f8bbbdf64ae603f9f6c09a3067943837459ec"; sha256 = "0x4y5q7ygxfjfy2wxijkps9khsjjfb169sbda410vaw0m88wqj5p"; }; - makeFlags = "CPU=m68k SYNTAX=mot"; + makeFlags = [ "CPU=m68k" "SYNTAX=mot" ]; installPhase = '' mkdir -p $out/bin cp vasmm68k_mot $out/bin diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 358cc59d3db..ad111a61514 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - makeFlags = "LINK=gcc CFLAGS=-O2"; + makeFlags = [ "LINK=gcc" "CFLAGS=-O2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 74e35379137..278d8d8dc5f 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # For pthread_cancel - cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s"; + cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; buildInputs = [ zlib SDL cmake ]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8a07461bb2f..01a84230dbb 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -314,7 +314,7 @@ in { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; - buildFlags = "u-boot-with-nand-spl.imx"; + buildFlags = [ "u-boot-with-nand-spl.imx" ]; extraConfig = '' CONFIG_CMD_SETEXPR=y ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix index 2d5520b9bf9..5685d09e54f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix @@ -3,7 +3,7 @@ appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ IOKit ]; - xcbuildFlags = "-target caffeinate"; + xcbuildFlags = [ "-target" "caffeinate" ]; installPhase = '' install -D Products/Deployment/caffeinate $out/bin/caffeinate ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f335a6c1154..f1b5e19feb2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -5,7 +5,7 @@ appleDerivation { # buildInputs = [ Foundation xpc darling ]; buildInputs = [ xpc xnu ]; - xcbuildFlags = "-target Security_frameworks_osx"; + xcbuildFlags = [ "-target" "Security_frameworks_osx" ]; # NIX_CFLAGS_COMPILE = "-Wno-error -I${xnu}/include/libkern -DPRIVATE -I${xnu}/Library/Frameworks/System.framework/Headers"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 8706d22be19..3e7e89642c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -6,7 +6,7 @@ appleDerivation { buildInputs = [ CoreSymbolication darling xnu ]; NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration"; NIX_LDFLAGS = "-L./Products/Release"; - xcbuildFlags = "-target dtrace_frameworks -target dtrace"; + xcbuildFlags = [ "-target" "dtrace_frameworks" "-target" "dtrace" ]; doCheck = false; checkPhase = "xcodebuild -target dtrace_tests"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 8bd45aa008b..2b196e46ef4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -11,7 +11,7 @@ appleDerivation { --replace '#include ' "" ''; - xcbuildFlags = "-target util"; + xcbuildFlags = [ "-target" "util" ]; installPhase = '' mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index cac2d97482a..2af1c5db2e3 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]; - buildFlags = "libtapi"; + buildFlags = [ "libtapi" ]; installTarget = "install-libtapi"; diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 9f5f8aa4422..d4f20ede2ef 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00mjyj8yicrpnlm46rlbkvxgl5381l8xawh7rmjk10p3zrm56jbv"; }; - buildFlags = "ARCHES=x86_64"; + buildFlags = [ "ARCHES=x86_64" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 93ac3fe5b74..e24171dfefe 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ./gcc.patch ]; - makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; + makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; unpackPhase = '' sourceRoot=broadcom-sta diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ea6a6e77572..1ee7ece0537 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ kerberos keyutils pam talloc ]; - makeFlags = "root_sbindir=$(out)/sbin"; + makeFlags = [ "root_sbindir=$(out)/sbin" ]; meta = with stdenv.lib; { homepage = http://www.samba.org/linux-cifs/cifs-utils/; diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index a4ec902f762..55dcba378ca 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = https://www.nongnu.org/dmidecode/; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 0e35f45f042..74f3430c2d8 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -31,9 +31,13 @@ stdenv.mkDerivation rec { substituteInPlace scripts/drbd.rules --replace /usr/sbin/drbdadm $out/sbin/drbdadm ''; - makeFlags = "SHELL=${stdenv.shell}"; + makeFlags = [ "SHELL=${stdenv.shell}" ]; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; + installFlags = [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + "INITDIR=$(out)/etc/init.d" + ]; meta = with stdenv.lib; { homepage = http://www.drbd.org/; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 6aaaaec1b13..0d00eaa3ac8 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' install -dm755 "$out/share/licenses/extrace/" diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index fe5436625e8..58b1b53d52f 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnl iptables ]; - makeFlags = "-C src/usr"; + makeFlags = [ "-C" "src/usr" ]; prePatch = '' sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 96bb91175dc..ce76e31a920 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed '16i#include ' -i ldm.c ''; - buildFlags = "ldm"; + buildFlags = [ "ldm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 297faa2a604..16c73377cb4 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; }; - makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' make install prefix=$out diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index ed84c41001b..0d5dd118798 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "install -m" "install -Dm" ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 29ed9375c2e..4bda93baddc 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sh autogen.sh --prefix=$out ''; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index aeb4d78d0ec..75c32577a00 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ln -sf ${configOpts} ./config/config.opts'') ; - makeFlags = "LEX=flex"; - installFlags = ''INSTALL=install DESTDIR=''${out}''; + makeFlags = [ "LEX=flex" ]; + installFlags = [ "INSTALL=install" "DESTDIR=${placeholder "out"}" ]; postInstall = lib.concatMapStrings (path: '' for f in : $(find ${path} -type f); do diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 6b6bef29cc3..80b5ce01243 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 57544659e86..f24921c7ce6 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 94ba31d59e1..403f0a40010 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index ba6aff4e8bc..2ad7b21d451 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { export SYSTEMCTL=systemctl ''; - makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_FILE_ATTRIBUTES=y CHOWN=true"; - installTargets = "install_base install_nls install_man"; + makeFlags = [ "SYSCONFIG_DIR=$(out)/etc" "IGNORE_FILE_ATTRIBUTES=y" "CHOWN=true" ]; + installTargets = [ "install_base" "install_nls" "install_man" ]; patches = [ ./install.patch ]; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index d4f83eb8caf..9ca1c37e11b 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A tool to run processes untied from some of the namespaces"; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index ee8f0079075..0ddec9282e6 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { QTDIR = qt48; - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; + # cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 357237e1e29..42f280eed23 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig git ]; buildInputs = [ libmicrohttpd ]; - makeFlags = "BUILD=release"; + makeFlags = [ "BUILD=release" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 8a92843e43e..9fb441a92de 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -42,12 +42,9 @@ stdenv.mkDerivation { --replace /bin/bash ${bash}/bin/bash; ''; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=unused-result" "-Wno-error=nonnull-compare" - "-Wno-error=format-truncation" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; - makeFlags = "DESTDIR=$(out) prefix="; + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; meta = { description = "A collection of postfix-related tools"; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index f3032bfc86a..274f45d5b2d 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -20,9 +20,9 @@ perlPackages.buildPerlPackage rec { # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. - makeFlags = "PERL_BIN=${perlPackages.perl}/bin/perl PERL_TAINT=no"; + makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ]; - makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin"; + makeMakerFlags = [ "CONFDIR=/homeless/shelter" "LOCALSTATEDIR=/var/lib/spamassassin" ]; doCheck = false; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 693e67ee6dd..8df30645725 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ php perl gd libpng zlib unzip ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; - buildFlags = "all"; + buildFlags = [ "all" ]; # Do not create /var directories preInstall = '' substituteInPlace Makefile --replace '$(MAKE) install-basic' "" ''; - installTargets = "install install-config"; + installTargets = [ "install" "install-config" ]; meta = { description = "A host, service and network monitoring program"; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4b1003db284..278ba8d13c5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! - makeFlags = "PREFIX=$(out)" + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc"; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8af11183c69..8d49846cbc0 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -19,7 +19,7 @@ let pcre libxslt groff ncurses readline libedit makeWrapper python3 ]; - buildFlags = "localstatedir=/var/spool"; + buildFlags = [ "localstatedir=/var/spool" ]; postInstall = '' wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index b78282ab6e4..a06b08a5599 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = upstreamPatches; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 239dfa0963b..6bae355812c 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ underlinkingPatch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index bb113c90849..a9b5f17af83 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ stdenv.lib.optional enableXinerama libXinerama; - buildFlags = "CC=cc " + (if enableXinerama then "xinerama=1" else "xinerama=0"); + buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; - installFlags = "DESTDIR=$(out) PREFIX="; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index af9394a84fa..6d5fa0f3d98 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/jceb/srandrd"; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index 48cab6529cc..d50a7c006c8 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; installPhase = '' install -D xcwd "$out/bin/xcwd" diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index d20714befba..6fa185dfeab 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { homepage = https://www.semicomplete.com/projects/xdotool/; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index b5350ebecf7..f8f48ea4cdb 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that # lacks libXi. - makeFlags = "LDFLAGS=-lXi"; + makeFlags = [ "LDFLAGS=-lXi" ]; # XXX: Actually tests require an X server. doCheck = true; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index dfac2cf88a5..4dbe31df03c 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = { homepage = https://uninformativ.de/git/xpointerbarrier; diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 9d072c9bb19..72be49d9792 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/matthewbauer/undmg; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index a17b0302503..908808b79f3 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; - makeFlags = "RM=rm LN=ln MV=mv"; + makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvorbis libmad libao ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 81bd4f60f43..7de086dba60 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/wodim $out/bin/cdrecord ''; - makeFlags = "PREFIX=\$(out)"; + makeFlags = [ "PREFIX=\$(out)" ]; meta = { description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools"; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 4a8c767e44a..533bb2322e7 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse glib attr ]; - makeFlags = "DESTDIR=$(out) PREFIX="; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f9960722e82..b5fc12024b1 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation ''--localstatedir=/var'' ]; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index d28f73dd91c..62fa83800cb 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - makeFlags = "CC=${stdenv.cc.outPath}/bin/cc"; + makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 24d678e1142..480ae328cd3 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qtbase gsl getdata netcdf muparser matio ]; - cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; + cmakeFlags = [ "-Dkst_qt5=1" "-Dkst_release=1" ]; postInstall = '' mkdir -p $out diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 6814a06e3b9..f7bd8d520c8 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib.static}/lib"; + makeFlags = [ "ZPATH=${zlib.static}/lib" ]; buildInputs = [ zlib ]; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 9891ea5e52b..4b610ebbfef 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p "$out"/{bin,lib,include} find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; description = ''A small QR code decoding library''; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix index 6bb9924ddd0..c4209442de8 100644 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 8c303dd1e0c..af9a7c9a133 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Identifies duplicate files residing within specified directories"; diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 33efd2bd614..772ae236764 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 5b05ce534d7..24daa7fc81f 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A better fuzzy finder"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 61e115e71eb..c2f281ecb17 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { # TODO: Setting buildFlags probably isn't working properly. I've tried a few # variants, e.g.: - # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\""; - # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\""; + # - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ]; + # - buildFlags = [ "-ldflags" "\\\"-X" "${goPackagePath}/main.gVersion=${version}\\\"" ]; # Override the build phase (to set buildFlags): buildPhase = '' runHook preBuild diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 48f048b3abf..57cf5bb97e2 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; - buildFlags = "memtest.bin"; + buildFlags = [ "memtest.bin" ]; doCheck = false; # fails diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 336d673f7ec..44f791e5b8a 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = "CC=cc"; - installFlags = "PREFIX=$(out)"; + buildFlags = [ "CC=cc" ]; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index be96dd9d3d3..85bad70edc9 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gettext readline ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index b530193258c..66ed0a11fd9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; - makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}"; + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python.interpreter}" ]; postInstall = '' wrapProgram "$out/bin/svtplay-dl" \ diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 4cac9befe16..b8e984e90c4 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; CGO_ENABLED = 1; - buildFlags = "-ldflags"; + buildFlags = [ "-ldflags" ]; meta = with stdenv.lib; { homepage = "https://www.teleconsole.com/"; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index edaa9b662e7..b261f0ef841 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/xorg62/tty-clock; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index e5bb23016ae..fda442a6729 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [perl]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Portable file system cache diagnostics and control"; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index f042b9e209f..77a2ef763a9 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ libxcb xcbutilwm xcbutil ]; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index cf8c370c522..f5353db6803 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; - makeFlags = "-C src"; + makeFlags = [ "-C" "src" ]; installPhase = '' install -vD bin/* -t $out/bin diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 8a2dee19b95..f2ae143e1b9 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index af8f5cafb89..8591db4e016 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; - makeFlags = "prefix=$(out) LDFLAGS=-lm"; + makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" ]; preConfigure = '' sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index eb8f5ef186f..75c47dda0c4 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ curl ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5c55ac31588..ce2936f96f3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -94,9 +94,9 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = "profiledir=$(out)/etc/profile.d"; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; - installFlags = "sysconfdir=$(out)/etc"; + installFlags = [ "sysconfdir=$(out)/etc" ]; doInstallCheck = true; # not cross diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index f960245e2b3..66a9f61eefb 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 libiconv ]; diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 57943a31406..259ee38c68f 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace 'sudo ' "" ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Wordlist generator"; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 19f51775ff2..d10c1659964 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; - buildFlags = "QMAKE=qmake"; + buildFlags = [ "QMAKE=qmake" ]; buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 33a873f73da..48df486ef0a 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkgconfig wrapQtAppsHook ]; - cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix index 93dc75c1f32..71a9824bb62 100644 --- a/pkgs/tools/security/phrasendrescher/default.nix +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libssh2 gpgme ]; - configureFlags = "--with-plugins"; + configureFlags = [ "--with-plugins" ]; meta = with stdenv.lib; { description = "A modular and multi processing pass phrase cracking tool"; diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 9bc6ecc6ddf..76f53b55f3d 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perl ]; meta = { diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index b4ab0f04d1c..5cd3a707dde 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Disk I/O latency measuring tool"; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 74bc177023f..0600209723f 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mpaqn0zfhxdf9wzs1wgdd29bjcyl3rgfdlqbwhiwcy2h3vy2h8s"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/chneukirchen/lr; diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 1d8eeff209e..89c84c8c9ca 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -i tq \ -e 's|\bfq\b|'$out'/bin/fq|g' \ diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 02e36dbc31c..62423ff594f 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "Simple xargs and apply replacement"; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 7437d2765a9..bc265c5a5ae 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to convert ANSI to other formats"; longDescription = '' - Tool to remove ANSI or convert them to another format + Tool to remove ANSI or convert them to another format (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 9242014cdca..3549e7c1c94 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man"; + makeFlags = [ "TREE=\$(out)" "MANTREE=\$(TREE)/share/man" ]; preBuild = '' sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 15e5ddf2f19..177f9326dd2 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0x529137rxy6ld64xqa6xmn93121ripxvkf3sc7hv3wg6km182sw"; }; - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; patches = [ (fetchpatch { name = "zimreader_tntnet221.patch"; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index aa32d52dfc6..2a126ac5c83 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A quite complete and fast LATEX to HTML translator"; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 8fca318529f..b9b16e4d8ec 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; - buildFlags = "CC=cc"; + buildFlags = [ "CC=cc" ]; installPhase = '' install -D {,$out/bin/}yamdi From 02f92455c43d229cb53c7c65018fdab15632d98f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 13:19:43 +0100 Subject: [PATCH 200/211] qtcurve: fix build w/gcc9 https://hydra.nixos.org/build/108759256 --- pkgs/data/themes/qtcurve/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 673b97cc137..df8e86bf4c1 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -3,6 +3,7 @@ , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies +, fetchpatch }: let @@ -15,6 +16,13 @@ in mkDerivation { sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; }; + patches = [ + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; + sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; From 2157dcd141a5df499698ffb9b1d901192f089bdc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 5 Nov 2019 02:10:31 +0100 Subject: [PATCH 201/211] treewide: installFlags is a list --- pkgs/applications/audio/avldrums-lv2/default.nix | 2 +- pkgs/applications/audio/cd-discid/default.nix | 2 +- pkgs/applications/audio/eq10q/default.nix | 4 +--- pkgs/applications/misc/taskjuggler/2.x/default.nix | 5 ++--- .../networking/instant-messengers/swift-im/default.nix | 6 ++---- .../git-and-tools/git-remote-hg/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 2 +- pkgs/development/beam-modules/webdriver/default.nix | 2 +- pkgs/development/compilers/rgbds/default.nix | 2 +- pkgs/development/coq-modules/Cheerios/default.nix | 2 +- pkgs/development/coq-modules/InfSeqExt/default.nix | 2 +- pkgs/development/coq-modules/StructTact/default.nix | 2 +- pkgs/development/coq-modules/Verdi/default.nix | 2 +- pkgs/development/coq-modules/autosubst/default.nix | 2 +- pkgs/development/coq-modules/bignums/default.nix | 2 +- pkgs/development/coq-modules/coq-elpi/default.nix | 2 +- pkgs/development/coq-modules/coq-ext-lib/default.nix | 2 +- pkgs/development/coq-modules/coqprime/default.nix | 2 +- pkgs/development/coq-modules/corn/default.nix | 2 +- pkgs/development/coq-modules/dpdgraph/default.nix | 8 ++++---- pkgs/development/coq-modules/equations/default.nix | 2 +- pkgs/development/coq-modules/heq/default.nix | 2 +- pkgs/development/coq-modules/ltac2/default.nix | 2 +- pkgs/development/coq-modules/math-classes/default.nix | 2 +- pkgs/development/coq-modules/mathcomp/extra.nix | 4 ++-- pkgs/development/coq-modules/paramcoq/default.nix | 2 +- pkgs/development/coq-modules/tlc/default.nix | 2 +- pkgs/development/libraries/farbfeld/default.nix | 2 +- pkgs/development/libraries/fontconfig/2.10.nix | 2 +- pkgs/development/libraries/libguestfs/default.nix | 2 +- pkgs/development/libraries/libosmpbf/default.nix | 2 +- pkgs/development/libraries/libspotify/default.nix | 6 +++--- .../libraries/science/biology/htslib/default.nix | 2 +- pkgs/development/libraries/shhmsg/default.nix | 2 +- pkgs/development/libraries/shhopt/default.nix | 2 +- .../development/ocaml-modules/ocplib-simplex/default.nix | 2 +- pkgs/development/ocaml-modules/pprint/default.nix | 2 +- .../development/ocaml-modules/psmt2-frontend/default.nix | 2 +- pkgs/development/ocaml-modules/twt/default.nix | 2 +- pkgs/development/tools/imatix_gsl/default.nix | 2 +- .../tools/literate-programming/noweb/default.nix | 2 +- pkgs/development/tools/misc/trv/default.nix | 2 +- pkgs/games/angband/default.nix | 2 +- pkgs/misc/drivers/foomatic-filters/default.nix | 9 ++++----- pkgs/misc/screensavers/slock/default.nix | 2 +- pkgs/os-specific/linux/alsa-oss/default.nix | 2 +- pkgs/os-specific/linux/alsa-utils/default.nix | 2 +- pkgs/os-specific/linux/consoletools/default.nix | 2 +- pkgs/os-specific/linux/kernel/perf.nix | 2 +- pkgs/os-specific/linux/libcap/default.nix | 2 +- pkgs/os-specific/linux/open-isns/default.nix | 4 ++-- pkgs/os-specific/linux/paxtest/default.nix | 2 +- pkgs/os-specific/linux/sysklogd/default.nix | 2 +- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- pkgs/servers/http/apache-modules/mod_python/default.nix | 3 ++- pkgs/shells/zsh/zsh-syntax-highlighting/default.nix | 2 +- pkgs/tools/archivers/afio/default.nix | 2 +- pkgs/tools/compression/pbzip2/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 2 +- pkgs/tools/filesystems/sasquatch/default.nix | 2 +- pkgs/tools/filesystems/squashfs/default.nix | 2 +- pkgs/tools/misc/automirror/default.nix | 2 +- pkgs/tools/networking/iodine/default.nix | 2 +- pkgs/tools/networking/openresolv/default.nix | 2 +- pkgs/tools/networking/ssmtp/default.nix | 2 +- pkgs/tools/security/rarcrack/default.nix | 4 ++-- pkgs/tools/security/super/default.nix | 2 +- pkgs/tools/security/tboot/default.nix | 2 +- pkgs/tools/system/setserial/default.nix | 2 +- pkgs/tools/text/untex/default.nix | 4 ++-- 70 files changed, 86 insertions(+), 91 deletions(-) diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index eeb0f67d193..d71718c32a8 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 76f76c1e750..864e04d88f3 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; }; - installFlags = "PREFIX=$(out) INSTALL=install"; + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 0308fad831d..b4ad1505320 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { }) ]; - installFlags = '' - DESTDIR=$(out) - ''; + installFlags = [ "DESTDIR=$(out)" ]; fixupPhase = '' cp -r $out/var/empty/local/lib $out diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 6b38c3d59c2..a0dc7b7c71e 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -56,9 +56,8 @@ stdenv.mkDerivation rec { cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/ ''; - installFlags = - # kde_locale is not defined when installing without kde. - "kde_locale=\${out}/share/locale"; + # kde_locale is not defined when installing without kde. + installFlags = [ "kde_locale=\${out}/share/locale" ]; meta = { homepage = http://www.taskjuggler.org; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index db1d0a54dce..d1d69b3d837 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -31,10 +31,8 @@ stdenv.mkDerivation rec { "-fpermissive" ]; - preInstall = '' - installTargets="$out" - installFlags+=" SWIFT_INSTALLDIR=$out" - ''; + installTargets = [ (placeholder "out") ]; + installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = https://swift.im/; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 6df3a97dbbb..28e63c4f166 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; - installFlags = "HOME=\${out} install-doc"; + installFlags = [ "HOME=\${out}" "install-doc" ]; postInstall = '' wrapProgram $out/bin/git-remote-hg \ diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 312879a49e8..7c46d26bf5b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead. # We need many of these files during the installCheckPhase. - installFlags = "NO_INSTALL_HARDLINKS=1"; + installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; preInstall = (stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index b6695029f34..d772ad7a3c7 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -23,7 +23,7 @@ let buildInputs = [ erlang ]; - installFlags = "PREFIX=$(out)/lib/erlang/lib"; + installFlags = [ "PREFIX=$(out)/lib/erlang/lib" ]; meta = { description = "WebDriver implementation in Erlang"; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 99519c53fcd..bf2594b9bf4 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; - installFlags = "PREFIX=\${out}"; + installFlags = [ "PREFIX=\${out}" ]; meta = with stdenv.lib; { homepage = https://rednex.github.io/rgbds/; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 4e75b9407de..14048d1b0d8 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 5df96519e7f..ced2b7ce3db 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 2e4d12478b7..798aaabe677 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index d2e9660a630..3cf3a4e8d4b 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index bffa5172b0e..ee08af40c51 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [./0001-changes-to-work-with-Coq-8.6.patch]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://www.ps.uni-saarland.de/autosubst/; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index fb45e591ec1..0d6d7f17216 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { license = licenses.lgpl2; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index defe52987aa..56aa005c4a9 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 588172aea61..97703922395 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://github.com/coq-ext-lib/coq-ext-lib; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 6228bd4be9d..aaf867baf25 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bignums ]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate"; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index e5fa11c5cad..97bb884c92e 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { homepage = http://c-corn.github.io/; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 401cb299497..49288d3cb32 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation { mkdir -p $out/bin ''; - installFlags = '' - COQLIB=$(out)/lib/coq/${coq.coq-version}/ - BINDIR=$(out)/bin - ''; + installFlags = [ + "COQLIB=$(out)/lib/coq/${coq.coq-version}/" + "BINDIR=$(out)/bin" + ]; meta = { description = "Build dependency graphs between Coq objects"; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index b6efd3d75a4..9ea9ac21671 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preBuild = "coq_makefile -f _CoqProject -o Makefile"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://mattam82.github.io/Coq-Equations/; diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 03149bab58b..5d3c94c5f5c 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preBuild = "cd src"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ]; meta = with stdenv.lib; { homepage = https://www.mpi-sws.org/~gil/Heq/; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 67441e9cdd8..92484f169c1 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { coq.ocamlPackages.camlp5 ; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { description = "A robust and expressive tactic language for Coq"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 82802b8f30e..7aad4261fd3 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq bignums ]; enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://math-classes.github.io; diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index c342c25a411..2df9cbe58c7 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -74,7 +74,7 @@ versions = { core-deps = with coqPackages; [ mathcomp-field_1_9 ]; extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; }; - }; + }; "1.8.0" = { finmap.version = "1.2.1"; bigenough.version = "1.0.0"; @@ -154,7 +154,7 @@ packageGen = { propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; - installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { inherit description; diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a8dd74dd5fb..a57d1bc9088 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) ; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.hasAttr v params; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index fb966f762bc..119261f412b 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq ]; - installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib"; + installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; meta = { homepage = "http://www.chargueraud.org/softs/tlc/"; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index a29cbb9bbd1..a528ad6f7f6 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg ]; nativeBuildInputs = [ makeWrapper ]; - installFlags = "PREFIX=/ DESTDIR=$(out)"; + installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; postInstall = '' wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" ''; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 1d66735569d..635baff796b 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; # Don't try to write to /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + installFlags = [ "sysconfdir=$(out)/etc" "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; passthru = { # Empty for backward compatibility, there was no versioning before 2.11 diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 07f2099f11a..8d480c2d882 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; - installFlags = "REALLY_INSTALL=yes"; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 4be744e7ba9..416101cad0a 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sourceRoot = "OSM-binary-1.3.3/src"; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; meta = { homepage = https://github.com/scrosby/OSM-binary; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 9ef3d665413..1b0953df4e6 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -50,11 +50,11 @@ else stdenv.mkDerivation { buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific - installFlags = stdenv.lib.optionalString (isLinux) + installFlags = stdenv.lib.optional isLinux "prefix=$(out)"; - patchPhase = stdenv.lib.optionalString (isLinux) + patchPhase = stdenv.lib.optionalString isLinux "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; - postInstall = stdenv.lib.optionalString (isLinux) + postInstall = stdenv.lib.optionalString isLinux "mv -v share $out"; passthru = { diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 0b13696ad5f..7d771414fb0 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended - installFlags = "prefix=$(out)"; + installFlags = [ "prefix=$(out)" ]; preCheck = '' patchShebangs test/ diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 5f14a7bb5ee..596ea1cfaf8 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; - installFlags = "INSTBASEDIR=$(out)"; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with stdenv.lib; { description = "A library for displaying messages"; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index dbac4c85961..985ee59348b 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; - installFlags = "INSTBASEDIR=$(out)"; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with stdenv.lib; { description = "A library for parsing command line options"; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 1c09edf3a7e..50c63ef718a 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ocaml findlib ]; - installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 899806c4dae..d618f90e541 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; dontBuild = true; - installFlags = "-C src"; + installFlags = [ "-C" "src" ]; meta = with stdenv.lib; { homepage = http://gallium.inria.fr/~fpottier/pprint/; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 57f1a832f56..485620514e4 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 207a7b183e6..940f6cf5107 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { dontBuild = true; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; dontStrip = true; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 549a4d1b826..c4d290bf967 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile"; preBuild = "cd src"; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 43cb6e6c2c7..2b798783dfc 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ let noweb = stdenv.mkDerivation rec { # HACK: This is ugly, but functional. PATH=$out/bin:$PATH make -BC xdoc - make $installFlags install-man + make "''${installFlags[@]}" install-man ln -s "$tex" "$out/share/texmf" ''; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 44744413138..2e056306db4 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontStrip = true; - installFlags = "SEMVER=${version} PREFIX=$(out)"; + installFlags = [ "SEMVER=${version}" "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/afiniate/trv; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 46eb054bc8e..309ea244d71 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses5 ]; - installFlags = "bindir=$(out)/bin"; + installFlags = [ "bindir=$(out)/bin" ]; meta = with stdenv.lib; { homepage = http://rephial.org/; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index d4f15992e74..dbcc17820ec 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -26,11 +26,10 @@ stdenv.mkDerivation rec { installTargets = "install-cups"; - installFlags = - '' - CUPS_FILTERS=$(out)/lib/cups/filter - CUPS_BACKENDS=$(out)/lib/cups/backend - ''; + installFlags = [ + "CUPS_FILTERS=$(out)/lib/cups/filter" + "CUPS_BACKENDS=$(out)/lib/cups/backend" + ]; meta = { description = "Foomatic printing filters"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index f5e8b60cea0..9dadd085067 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libX11 libXext libXrandr ]; - installFlags = "DESTDIR=\${out} PREFIX="; + installFlags = [ "DESTDIR=\${out}" "PREFIX=" ]; postPatch = "sed -i '/chmod u+s/d' Makefile"; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index d3e7dd5fa5d..77b351a1998 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 8b1faf788e5..7b356746861 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 8ea3e3445cc..c46af5fba85 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)"]; - installFlags = ''PREFIX=""''; + installFlags = [ "PREFIX=\"\"" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/linuxconsole/; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 37b728bde88..f343f11f5b6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { doInstallCheck = false; # same separateDebugInfo = true; - installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; + installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' wrapProgram $out/bin/perf \ diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 9c730bb9659..174f1be99db 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace 'man_prefix=$(prefix)' "man_prefix=$doc" ''; - installFlags = "RAISE_SETFCAP=no"; + installFlags = [ "RAISE_SETFCAP=no" ]; postInstall = '' rm "$lib"/lib/*.a diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 7b34c1029ba..6a0273afbdd 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; - installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns"; - installTargets = "install install_hdrs install_lib"; + installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; + installTargets = [ "install" "install_hdrs" "install_lib" ]; meta = { description = "iSNS server and client for Linux"; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index e01f84576ce..6bd59e1e7fd 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.psm"; makeFlags = [ "PAXBIN=${paxctl}/bin/paxctl" "BINDIR=$(out)/bin" "RUNDIR=$(out)/lib/paxtest" ]; - installFlags = ''DESTDIR=""''; + installFlags = [ "DESTDIR=\"\"" ]; meta = with stdenv.lib; { description = "Test various memory protection measures"; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 513503ff98e..213394e5ecc 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DSYSV"; - installFlags = "BINDIR=$(out)/sbin MANDIR=$(out)/share/man INSTALL=install"; + installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; preConfigure = '' diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index a25bf48f8dd..f1838f2a2cb 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; - installTargets = "install install-man"; + installFlags = [ "PREFIX=$(out)" "RMQ_ERLAPP_DIR=$(out)" ]; + installTargets = [ "install" "install-man" ]; runtimePath = stdenv.lib.makeBinPath [getconf erlang socat]; postInstall = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index f947bf535cc..6aed1481ddf 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { --replace '-$GIT' "" ''; + installFlags = [ "LIBEXECDIR=${placeholder "out"}/modules" ]; + preInstall = '' - installFlags="LIBEXECDIR=$out/modules $installFlags" mkdir -p $out/modules $out/bin ''; diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 741587ef960..0dbfba52c0f 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zsh ]; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Fish shell like syntax highlighting for Zsh"; diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 13da95a28b5..8d1e28fed29 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { */ patches = [ ./0001-makefile-fix-installation.patch ]; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = { homepage = http://members.chello.nl/~k.holtman/afio.html; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 94ca5eb58b1..3314544084f 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preBuild = "substituteInPlace Makefile --replace g++ c++"; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 7c92dc95268..804b052b61a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { #patches = [ ./purity.patch ]; # To prevent make install from failing. - preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + installFlags = [ "OWNER=" "GROUP=" "confdir=${placeholder "out"}/etc" ]; # Install systemd stuff. #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index c393c65a720..36ac3630e54 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cd squashfs-tools ''; - installFlags = "INSTALL_DIR=\${out}/bin"; + installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" ] ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 15a535eed3b..f02a913bc25 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { preBuild = "cd squashfs-tools"; - installFlags = "INSTALL_DIR=\${out}/bin"; + installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ] ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 3bfb2d656d9..84778fb1c2d 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ronn ]; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/schlomo/automirror; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 5aa0c01e848..44bf52c9933 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; - installFlags = "prefix=\${out}"; + installFlags = [ "prefix=\${out}" ]; meta = { homepage = http://code.kryo.se/iodine/; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 190c903d9c1..423282aa8c1 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { EOF ''; - installFlags = "SYSCONFDIR=$(out)/etc"; + installFlags = [ "SYSCONFDIR=$(out)/etc" ]; postInstall = '' wrapProgram "$out/sbin/resolvconf" --set PATH "${coreutils}/bin" diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index ebe31dc8b5a..4ed0c3393bc 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' ''; - installFlags = "etcdir=$(out)/etc"; + installFlags = [ "etcdir=$(out)/etc" ]; installTargets = [ "install" "install-sendmail" ]; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 65158b3c5fe..68e5df80937 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = [ libxml2 file p7zip unrar unzip ]; - buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; - installFlags = "PREFIX=\${out}"; + buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + installFlags = [ "PREFIX=\${out}" ]; patchPhase = '' substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i" diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 1f00d42f277..716973a3e2e 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)"; + installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(TMPDIR)" ]; meta = { homepage = "https://www.ucolick.org/~will/#super"; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index f5184b98562..478f77f95f9 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace docs/Makefile --replace /usr/share /share ''; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 036e3a83cf2..68ea32e1e8a 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ groff ]; - installFlags = ''DESTDIR=$(out)''; + installFlags = [ "DESTDIR=$(out)" ]; postConfigure = '' sed -e s@/usr/man/@/share/man/@ -i Makefile diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index 923adf8571d..f9c7e3cdfc6 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; unpackPhase = "tar xf $src"; - installTargets = "install install.man"; - installFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man/man1"; + installTargets = [ "install" "install.man" ]; + installFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man/man1" ]; preBuild = '' sed -i '1i#include \n#include ' untex.c mkdir -p $out/bin $out/share/man/man1 From 65395a7105feac9eb4a2ddf7915607e24b19f71e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 4 Nov 2019 13:33:53 +0100 Subject: [PATCH 202/211] treewide: installTargets is a list --- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/misc/oneko/default.nix | 2 +- pkgs/applications/misc/xxkb/default.nix | 2 +- pkgs/applications/networking/ids/suricata/default.nix | 2 +- pkgs/applications/science/astronomy/xearth/default.nix | 4 ++-- pkgs/applications/window-managers/larswm/default.nix | 2 +- pkgs/development/compilers/z88dk/default.nix | 4 ++-- pkgs/development/interpreters/metamath/default.nix | 2 +- pkgs/development/libraries/qrupdate/default.nix | 4 +--- pkgs/development/python-modules/cld2-cffi/default.nix | 2 +- pkgs/development/tools/literate-programming/noweb/default.nix | 2 +- pkgs/development/tools/nsis/default.nix | 2 +- pkgs/development/web/wml/default.nix | 2 +- pkgs/games/xskat/default.nix | 2 +- pkgs/misc/screensavers/xautolock/default.nix | 2 +- pkgs/os-specific/linux/nvme-cli/default.nix | 2 +- pkgs/os-specific/linux/rtkit/default.nix | 2 +- pkgs/tools/X11/xbrightness/default.nix | 2 +- pkgs/tools/X11/xzoom/default.nix | 2 +- pkgs/tools/cd-dvd/isomd5sum/default.nix | 2 +- pkgs/tools/misc/toybox/default.nix | 2 +- pkgs/tools/security/pass/extensions/genphrase.nix | 2 +- pkgs/tools/video/vncrec/default.nix | 2 +- 23 files changed, 25 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index fdefcf7e77d..08fe9b4f9af 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [libao libid3tag libmad zlib] ++ stdenv.lib.optional stdenv.isLinux alsaLib; - installTargets = "install install-man"; + installTargets = [ "install" "install-man" ]; meta = with stdenv.lib; { description = "Command-line MP3 player"; diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 3a0a548be0b..1c5858b5677 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "Creates a cute cat chasing around your mouse cursor"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index db952758f04..612e4a557a7 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "MANDIR=${placeholder "man"}/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "A keyboard layout indicator and switcher"; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 7f2a9d71fe5..cb45ec3f1e5 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc" ]; - installTargets = "install install-conf"; + installTargets = [ "install" "install-conf" ]; postInstall = '' wrapProgram "$out/bin/suricatasc" \ diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index e9fc0607998..752e25b4d8d 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libXt libXext ]; - installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; - installTargets="install install.man"; + installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "sets the X root window to an image of the Earth"; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index 4ec1a4bcd05..f6f3132178c 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXext libXmu ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { homepage = http://www.fnurt.net/larswm; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 433b6e6b32c..2d62bfede09 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # we test in checkPhase substituteInPlace Makefile \ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ - --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' + --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' ''; checkPhase = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} ''; - installTargets = "libs install"; + installTargets = [ "libs" "install" ]; meta = with stdenv.lib; { homepage = "https://www.z88dk.org"; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 3de21191512..2213ace8f57 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # luckily, they're not really needed so we don't build it. makeFlags = [ "DATA=" ]; - installTargets = "install-exec"; + installTargets = [ "install-exec" ]; meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 85e45d3fad0..3e0dc99f81f 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation { buildFlags = [ "lib" "solib" ]; - installTargets = if stdenv.isDarwin - then ["install-staticlib" "install-shlib"] - else "install"; + installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; buildInputs = [ gfortran openblas ]; diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index a38d4c0866e..7775fee5ba0 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 2b798783dfc..7a2252c6b27 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -39,7 +39,7 @@ let noweb = stdenv.mkDerivation rec { mkdir -p "$tex/tex/latex/noweb" ''; - installTargets = "install-code install-tex install-elisp"; + installTargets = [ "install-code" "install-tex" "install-elisp" ]; postInstall = '' substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 0539e8de92b..f8beae4d527 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; prefixKey = "PREFIX="; - installTargets = "install-compiler"; + installTargets = [ "install-compiler" ]; meta = with stdenv.lib; { description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 841a6ebecb0..6208bff15bc 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -53,7 +53,7 @@ perlPackages.buildPerlPackage { enableParallelBuilding = false; - installTargets = "install"; + installTargets = [ "install" ]; meta = with stdenv.lib; { homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/"; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 383bdb88284..086aaded9aa 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* MANPATH .*| MANPATH = $out/man|" ''; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { inherit (s) version; description = ''Famous german card game''; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 4d4e1c1fc41..cefcdbc75a3 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "Launch a given program when your X session has been idle for a given time."; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 76257f94fe7..cb7f3c9510c 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # To omit the hostnqn and hostid files that are impure and should be unique # for each target host: - installTargets = "install-spec"; + installTargets = [ "install-spec" ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 78bcd925aea..4ad454437f5 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus libcap ]; - NIX_LDFLAGS = [ "-lrt" ]; + NIX_LDFLAGS = "-lrt"; meta = with stdenv.lib; { homepage = http://0pointer.de/blog/projects/rtkit; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index 2857ea6c7be..e196411ce41 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "X11 brigthness and gamma software control"; diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index 31f2c014557..ed7828f37e2 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { inherit version; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 90315540aba..3bc1f886ccd 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=${placeholder "out"}" ]; # we don't install python stuff as it borks up directories - installTargets = "install-bin install-devel"; + installTargets = [ "install-bin" "install-devel" ]; meta = with stdenv.lib; { homepage = https://github.com/rhinstaller/isomd5sum; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index ccf8113e1a5..b863786145c 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static"; - installTargets = "install_flat"; + installTargets = [ "install_flat" ]; # tests currently (as of 0.8.0) get stuck in an infinite loop... # ...this is fixed in latest git, so doCheck can likely be enabled for next release diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index 187852e8b55..208012e2f88 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installTargets = "globalinstall"; + installTargets = [ "globalinstall" ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index c09da3dd231..857524661bf 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { "BINDIR=${placeholder "out"}/bin" "MANDIR=${placeholder "out"}/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "VNC recorder"; From a13649c6b127aabb04377a4239f77792b928adbc Mon Sep 17 00:00:00 2001 From: Merijn Broeren Date: Sun, 27 Oct 2019 13:03:25 +0000 Subject: [PATCH 203/211] treewide: replace make/build/configure/patchFlags with nix lists --- doc/languages-frameworks/go.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 53c891e66f8..e8cf27d0565 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -103,7 +103,7 @@ deis = buildGoPackage rec { goDeps = ./deps.nix; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; } From 5f2d96ba2e8324fa4488fc689f324dbbb25be486 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 00:44:07 +0100 Subject: [PATCH 204/211] glibc: NIX_CFLAGS_COMPILE -> always string --- pkgs/development/libraries/glibc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 50b359da96c..2abc8b7ea66 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -47,14 +47,14 @@ callPackage ./common.nix { inherit stdenv; } { # musl-specific flags below. # At next change to non-musl glibc builds, remove this `then` # and the above condition, instead keeping only the `else` below. - then (if withGd then "-Wno-error=stringop-truncation" else null) + then (stdenv.lib.optionalString withGd "-Wno-error=stringop-truncation") else - builtins.concatLists [ + builtins.toString (builtins.concatLists [ (stdenv.lib.optional withGd "-Wno-error=stringop-truncation") # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - ]; + ]); # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new From 76a8f48119c92f2be1461c175ea617a28945035e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 14:11:04 +0100 Subject: [PATCH 205/211] iasl: 20191018 -> 20191213 https://acpica.org/node/175 --- pkgs/development/compilers/iasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 9eb3748d0d4..742a6c43b04 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iasl"; - version = "20191018"; + version = "20191213"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0pz95fb1zvsj9238bg7a4vxl1svn5mnjg10sn5qvgr008q0v9782"; + sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h"; }; NIX_CFLAGS_COMPILE = [ From 59ab29fe88b06b31de5bea7ac11492a9dbc0c680 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Dec 2019 14:11:32 +0100 Subject: [PATCH 206/211] virtualbox: fix build Newer `iasl`-versions disallow strings within certain declarations[1] which breaks the virtualbox build as it relies on exactly this behavior[2]. This should be removed again when updating virtualbox to 6.1. [1] https://acpica.org/node/172 [2] https://hydra.nixos.org/build/108774352 --- .../virtualization/virtualbox/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6ecdf1d29bc..66d165d09a7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,6 +23,16 @@ let # guest-additions/default.nix as well. main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy"; version = "6.0.14"; + + iasl' = iasl.overrideAttrs (old: rec { + inherit (old) pname; + version = "20190108"; + src = fetchurl { + url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; + }; + NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=stringop-truncation" ]; + }); in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -41,7 +51,7 @@ in stdenv.mkDerivation { dontWrapQtApps = true; buildInputs = - [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk From a08e5665fa74e781054ab20abc5d3e70f9dc4d03 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 29 Dec 2019 18:15:49 +0000 Subject: [PATCH 207/211] rubygems: fix for Ruby with no openssl This fixes the rubyMinimal package. --- pkgs/development/interpreters/ruby/default.nix | 2 +- pkgs/development/interpreters/ruby/rubygems/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index ee9b61259bb..a87131ff40b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index dd1db5a8450..3caac2447e2 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "rubygems"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + + (fetchpatch { + url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch"; + sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9"; + }) ]; installPhase = '' From c0e0177560ba8690c9bfec6959c672e782a3341f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 23:08:35 -0800 Subject: [PATCH 208/211] procps: 3.3.15 -> 3.3.16 --- pkgs/os-specific/linux/procps-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 1f39a99ea0b..62a6b645c2c 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "procps"; - version = "3.3.15"; + version = "3.3.16"; # The project's releases are on SF, but git repo on gitlab. src = fetchurl { url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; - sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h"; + sha256 = "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj"; }; buildInputs = [ ncurses ] From 78dc3cfe43dda32673c13db77d55e4b5008b5259 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 13:46:40 -0800 Subject: [PATCH 209/211] libmicrohttpd: 0.9.68 -> 0.9.69 --- pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index c8340626935..ba4d74e4d48 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.68"; + version = "0.9.69"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "0q8bc4hrxn6llml7w2vam6n833x8injs39wgdkhwkawr50m6wwf5"; + sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv"; }; outputs = [ "out" "dev" "devdoc" "info" ]; From d19071f1c4b69e4ebde06c19a716cf6abebbfe37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Dec 2019 12:20:21 -0800 Subject: [PATCH 210/211] sqlite: 3.30.0 -> 3.30.1 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 529b3ba9e71..5837361e01b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.30.0"; + version = "3.30.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0n7w839y55dc3qqf2zv8xk6238cc6mpx24q4w5amwic7g96cza70"; + sha256 = "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc"; }; outputs = [ "bin" "dev" "out" ]; From 1156a04c7ffd6ceca695b0e327911f9405a09fb6 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 21 Dec 2019 17:52:50 +0100 Subject: [PATCH 211/211] rhash: 1.3.8 -> 1.3.9 + refresh meta.homepage + set meta.license (0BSD starting with 1.3.9) --- pkgs/tools/security/rhash/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index ad606af9562..863b03a117c 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.8"; + version = "1.3.9"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2"; + sha256 = "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq"; }; nativeBuildInputs = [ which ]; @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ]; meta = with stdenv.lib; { - homepage = http://rhash.anz.ru; + homepage = "http://rhash.sourceforge.net/"; description = "Console utility and library for computing and verifying hash sums of files"; + license = licenses.bsd0; platforms = platforms.all; maintainers = [ maintainers.andrewrk ]; };