From 8f729c0070ec3f78edadeaebcbd110257fe4577e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 3 Sep 2019 22:37:20 +0200 Subject: [PATCH 001/684] 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 764333fd1224..04392923b12a 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/684] 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 56bb35b64df8..86414980177f 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/684] 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 1ed457aa5fe1..2ae0782941d5 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/684] 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 037fd198fef6..8024f3109513 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/684] 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 365cfeab0581..f02923de349f 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/684] 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 fccdf7a978d4..9eb3748d0d48 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/684] 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 3d2fb50371ee..4c39babc3176 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/684] 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 492a9321a21c..96c235c14987 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/684] 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 96c235c14987..4a7c6282d4c7 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/684] 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 5a318c311af8..3443a508aea4 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/684] 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 2730696344e0..3f64ca2addf1 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/684] 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 d96ceb5d26b8..d43c10c8bf9a 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/684] 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 550cd9dce278..f6702229374a 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/684] 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 9e20923c2447..bdba8688f9d0 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/684] 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 bdba8688f9d0..7f7d34199be1 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/684] 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 249f3f4f21a4..bc4928153397 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/684] 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 249fdc958c80..5a56c0867dd8 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/684] 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 7f8f0786e038..860c1f8e94f7 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/684] 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 80059e448c9e..075c843e684e 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/684] 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 bcf0743b7b9e..f6c204d26b7d 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/684] 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 04392923b12a..150786789bba 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/684] 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 93e5da5b792d..000000000000 --- 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 3d253b8f6d67..000000000000 --- 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 150786789bba..8526f5e00c7c 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/684] 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 0bf8a7e85dce..ab78551e4fc6 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/684] 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 70ae09aa6ef8..1582bbbb30fa 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/684] 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 1582bbbb30fa..6f5cbeb7ed46 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/684] 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 61f2c4540465..f927b4ffc780 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 000000000000..a5c4c97bbc08 --- /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/684] 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 3058e926c3f9..0b5ff3817302 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/684] 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 cdec695d90f2..82a99bf2df10 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/684] 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 d65889be3ac0..db9e68ae9050 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/684] 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 d3b80aa00feb..b7b43edc1cd9 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/684] 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 f9dc3de7735b..df94de882be6 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/684] 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 5653c70d4317..dd6e3d4a84b8 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/684] 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 d8717b46eef4..ca6ad37b5aae 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/684] 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 f38ed7f0309e..0c91b782117d 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/684] 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 672569ed1002..da118f6bca57 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/684] 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 b1d8a27b5a22..9f34c60e16cb 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/684] 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 a6437f070b98..c87694321f35 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/684] 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 12197c2de40c..a56ab127235a 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/684] 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 b2a992b850e1..56f1ec747ca2 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/684] 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 9a0b8c9ebf54..dd0137a1463d 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/684] 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 8526f5e00c7c..1babd42803b7 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/684] 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 50b359da96ce..6115611b42e4 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/684] 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 92f6f0080219..14fc7782c532 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/684] 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 6379f2c32826..48bd1b21ecd6 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/684] 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 32b131159572..46b03720d16c 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/684] 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 80203dd0df9c..eea27b3e51ff 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/684] 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 2041d935c942..623645efc0ca 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/684] 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 49e77a5ec9d8..e4db7ea5994e 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/684] 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 c0018529ea8b..b744c58d4fb1 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/684] 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 e6a94daee106..9dd3425fcc48 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/684] 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 f20a32acedde..7e525648691d 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/684] 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 ba395c5e7f6b..e9f41b4c9f5c 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/684] 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 e9f41b4c9f5c..94acc7ab7bfd 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/684] 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 e4d0c0fde174..945ba59cf3df 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/684] 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 7fad204a0189..9a01bf3eed63 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/684] 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 f5184b985622..f52060b5c60c 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/684] 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 b1e9cde906cf..4a530e54de71 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/684] 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 71f488c760a4..368419c07f5f 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/684] 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 ba05ee8e8b51..9471efa92d75 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/684] 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 ae20414a065d..982acb44b5e3 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/684] 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 25f9c6ed4c7a..bee7058293d9 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/684] 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 74e8c0e6b434..12dc066dec38 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/684] 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 7c7f8f51de7d..632b5fc1fd5e 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/684] 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 1c6ddfc99eb6..93dd5e527e38 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/684] 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 95f89e0eda5a..2ed4b8ce3e3d 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 73a51cd27310..000000000000 --- 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 4ab14685a6c1..000000000000 --- 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 079eb0806d2c..000000000000 --- 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 0464bcf77971..000000000000 --- 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 5617ed9dc934..02164e3581aa 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 414e1ce51003..e9109d5da2bf 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/684] 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 cbb4ad4591e9..000000000000 --- 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 e9109d5da2bf..3a7414094fb6 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/684] 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 c51a5f504741..1ff969187668 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/684] 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 ad90a52a5bdb..bd58dbf6e122 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/684] 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 58f355b27fe1..8510e897332e 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/684] 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 34051a1da404..0c4a8a156ed4 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/684] 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 3a7414094fb6..850af6d96ac3 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/684] 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 850af6d96ac3..9bb3cfd23001 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/684] 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 7225efadebd9..c743f8bd6532 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 9bb3cfd23001..0f482a1e9f7e 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/684] 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 e22dc4dbae30..a10c50c9946b 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/684] 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 ab2d77780512..60b02a13cb77 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/684] 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 d3c2ed9060c7..92df54d6e83b 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/684] 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 c7568d990626..822575d85b9e 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/684] 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 cdf2769c27eb..0f4679a42237 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/684] 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 324334427393..3047cde885bd 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/684] 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 9a74b0bb4a86..0c7e2566f00c 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/684] 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 1e5c987d508b..21615f62a3de 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/684] 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 ef46c694acb7..99df32c93639 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/684] 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 2ae0782941d5..680b585643b7 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/684] 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 d8c3d484f436..0e4260b6e2d1 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/684] 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 70a0bdbe2406..60b87d2dd9aa 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/684] 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 000000000000..eaf71f1468de --- /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 2fe7df7695b8..a99b3fa96ae9 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/684] 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 000000000000..8ea5ca970855 --- /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 ac5dcbe6b942..c443303f3739 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/684] 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 93e73a44bc9c..b482176ff29d 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/684] 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 3047cde885bd..470d794dd94a 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/684] 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 631e0c9cca52..bc626cbad114 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/684] 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 775cfeded8b4..f2ce5248b55d 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 1c38b47576ab..1c782e8f94b3 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/684] 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 d7603c42fca9..d45c28528e72 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/684] 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 470d794dd94a..3c19b98c28dd 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/684] 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 4f69c1c80790..e016bf95339c 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/684] 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 a3f0a3b84f23..a467a7eff9bb 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/684] 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 c63b234031b7..d799b3292c5c 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/684] 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 5d7b95136ddf..e2ff96d366a2 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/684] 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 c1c22cb910d7..18b9fe0f280c 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/684] 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 e4b27d98dff9..8e2ef7c87e1d 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/684] 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 e9041993657e..e4cbfc7f0b4f 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/684] 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 cf8bffe07362..953ba9484fad 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/684] 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 1655c154d4e5..0afe2fbe9281 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/684] 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 3c585c3f07fa..fd84d93ba756 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/684] 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 ae0ecbf08e77..396ec6960420 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/684] 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 0f386a7c42fe..442e6e700180 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/684] 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 000000000000..d5b669dab7a9 --- /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 442e6e700180..76e60fda86a8 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/684] 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 682d70df3933..6c62adb7821c 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/684] 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 0373ca2d67cd..e0399d0a6c6e 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 37a44f15e9ce..93e75a855d3d 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 c5b9cdff1d07..eb3df1e4ff6a 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 52b9c3ab5f55..6f3d33bcaa7c 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/684] 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 14bfd40a5932..529d361f206f 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/684] 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 802a18dfda5d..63a773522a0d 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/684] 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 706e99179f5d..67d3c35609e6 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/684] 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 b2d65422db45..4def461c9383 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/684] 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 903a1a26eb71..69c4b3aeb74e 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/684] 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 85174e9c3e69..a6e072ef76f7 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/684] 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 3c31ba805d89..918f76753891 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/684] 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 56710945ecb1..42d3b9435697 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/684] 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 46255e276f5b..a49e0eaaac67 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/684] 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 2162db25c86e..b16b230ce27d 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/684] 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 cc07590dedc6..000000000000 --- 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 000000000000..2280605439ff --- /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 d05944a568f3..3df651afce8d 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/684] 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 db2d177b710c..000000000000 --- 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 49d07a89e52a..000000000000 --- 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 9cdce402c6e0..2e71ccc529a2 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/684] 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 0c5ab7585833..000000000000 --- 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 2e71ccc529a2..4a8f1cbae2b1 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/684] 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 004975f10d8a..eec1f32b4df8 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/684] 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 ee1282e9a135..176ef7f7616b 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/684] 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 a9d21a1f5a96..1c81dd608cbf 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/684] 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 c34d766a7e97..d4fbb2ceb598 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/684] 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 f927b4ffc780..f927eaefb4eb 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/684] 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 8b002ce81957..e962303f5f06 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/684] 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 2af93961e02b..818bea7d0ff5 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/684] 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 5d31193ee8d4..1d052adbba9f 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/684] 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 4a8f1cbae2b1..5e1db1289bb0 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/684] 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 5e1db1289bb0..9841ed47675a 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/684] 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 9841ed47675a..de9046ec2664 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/684] 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 de9046ec2664..e349fe744269 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/684] 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 3f3b50ea8fe6..2d3d1e8d722d 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/684] 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 94acc7ab7bfd..6637a75ea2f7 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/684] 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 9f34c60e16cb..ced19bffb31a 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/684] 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 d799b3292c5c..7d145354b300 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/684] 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 df016d9fcac0..7e24ba901e59 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 e349fe744269..f96e31ed0b04 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/684] 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 94573bcd2010..c6bb07e7b87d 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/684] 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 6beb55f055b5..030b3d2b6d85 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/684] {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 f96e31ed0b04..212224f18dff 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/684] 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 000e345cf132..dfd1d8b893b0 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/684] 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 212224f18dff..2e7121c4b6a8 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/684] {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 9886c2fa2ed9..000000000000 --- 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 a36c2286956b..000000000000 --- 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 dd19fccd822a..000000000000 --- 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 1b0738216079..000000000000 --- 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 3e02704f8998..000000000000 --- 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 f91a8c033fe3..000000000000 --- 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 e7abedf31214..000000000000 --- 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 300c3736abf7..000000000000 --- 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 2e7121c4b6a8..54455e3607e1 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/684] 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 000000000000..1058cd031767 --- /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 3d09277ad4cf..1666b3d842d9 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/684] 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 000000000000..ea9342574087 --- /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 6b67e2cc8561..a90fbe6ae837 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/684] 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 668d18045445..722f6b25429a 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 54455e3607e1..ac7ac83ec7cd 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/684] 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 cb83b19269bd..184dcb48a0de 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/684] 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 5b5072c71f3f..000000000000 --- 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 f2b618d6bb3a..000000000000 --- 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 0c4a8a156ed4..6b642832b83f 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 99df32c93639..000000000000 --- 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 0ea659d1927f..dd00eda1b571 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 ac7ac83ec7cd..7513834a25b5 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/684] 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 075c843e684e..108d1a587580 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/684] 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 89979e18bdc6..49a5c38846aa 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/684] 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 f5dcb3357f7c..57a7294c887d 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/684] 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 db5d90e2f021..1a8f07a3ae0e 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/684] 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 a06b38c0ec73..9dd3970bbb22 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/684] 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 7a5f6c8dd818..0d5a50570f5f 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/684] 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 83aa667f58fd..44c5f6d1f242 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/684] 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 38a2d8fe56ca..b14ba6479d9b 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/684] 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 2d0a5a63d6f7..82bcd49592d4 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/684] 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 5c9a0ecc71b7..617e058bd8fc 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/684] 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 76173bc5b998..4b1a695ca551 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/684] 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 f7763ba49da1..e53e4e3737ed 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/684] 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 47ca63fca990..e51224433e8b 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/684] 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 321204a0c4fd..2351ce2b5549 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/684] 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 7499750c1f0c..df9c32608783 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/684] 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 73ed823d2be5..1e5d9a0a664b 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/684] 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 11d5c3780154..065d65449867 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/684] 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 f78ed0f7925d..1831161979d3 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/684] 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 b543565758c1..37467f225eab 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/684] 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 090bf6a566a3..792568e8b57b 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/684] 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 1e891092f7c5..f6285c364e7b 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/684] 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 e5e33c76d205..121368abf4c7 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/684] 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 7bbcc906292d..b8f649fbdcbb 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/684] 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 20d85405bbac..09ba6510707b 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/684] 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 160b77229b3c..1326d0454591 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/684] 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 26b94f306bc6..811952f845ff 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/684] 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 4ff8c759a260..e1d1fa3070a9 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/684] 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 1adab6b70a3e..a44cccf9a9d1 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/684] 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 193bcf205f5b..55025621fc7d 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/684] 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 1ddc603dc62e..1d70c9641f8e 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/684] 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 6b8694a91d47..1d2e581f3c96 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/684] 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 58f464575b0c..44b0f5d84b66 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/684] 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 ba43403d9bbb..1eb19e2de6f9 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/684] 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 224c01e2c50a..8fbdf28965bf 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/684] 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 483b3d788e29..840da0461706 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/684] 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 5e0f37bbb526..d1d4ee806b80 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/684] 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 9651e9a5f80c..17d11d4fb749 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/684] 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 4f586f2f99e0..ce17cc60ebf8 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/684] 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 640a4d761f47..628493a34b1b 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/684] 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 b1e01f705dcf..f468196dc73d 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/684] 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 d978cb003c76..46e1460d795e 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/684] 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 6483973546c6..11dd5449b4b0 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/684] 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 f181ab71edfb..48a58c0c7d11 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/684] 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 6dafbfe2f9fe..6a0385614e87 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/684] 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 b2f7fdf2a906..c88f12c74d1a 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/684] 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 92945004cb02..6ca0c6e8e08f 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/684] 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 59aa3861510c..006cef6f1027 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/684] 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 97d032045b35..1e585136d887 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/684] 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 7513834a25b5..879c6562707f 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/684] 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 b06bed7c09ce..f48216ff446f 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 389052d30e1c..ee9932a7aa3b 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 737e73421c9b..dde2c5e44b30 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 054fc758d645..0d2858713eba 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 b17561e1567a..e514032f44e2 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 ecdafdaeaddd..376aadc7385b 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 c0bbd6e71db3..11daabbf8104 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 2c6b153370e4..7d70ad14b5db 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 1161fc8256cb..c43640b65245 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 d32a3fb5f1b5..ab149131b808 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 70b2d3c148db..2682c1e789b4 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 377a5ae61687..314b4007aad5 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 8ef705f7ef4b..7b14d7750c3a 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 a3f0a3b84f23..4e04cdbbf386 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 e506829b575e..d6680c61eb9b 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 9b877c2594b3..7d211b26a422 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 e7d0e6a63a59..857ef9ac27bb 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 60feecd665de..3e4c9828edec 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 4251d2c1f368..b5c57054f8b3 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 2a9e162e7ea9..1aece5eb4e26 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 4568c3e8acc1..d75ec9ef2c25 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 a3247b29fb8e..b786b34e9553 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 eb6d954eb334..bfd4b1abd5e5 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 a2e59f0c0ff2..edb4ca3c3495 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 b081a6b3672d..409142955970 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 6c3b3a69b1d6..ba8f272203bc 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 374810138f6e..70b439a5f778 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 f718854224ce..68b4cfe8af46 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 f9042f300113..5230fcd2eb62 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 2378cb9408ef..ac001540e097 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 a4538e1070a3..9528a5942a43 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 6e1926810df0..643d990feb8d 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 4b237a01a3e5..b244ee75b304 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 432280a18fb2..02f1f4e58a9d 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 f86bed854a2b..6cdc86d20eb2 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 76b29135f66c..528a96c9903a 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 660c391c0d5e..3a354133e875 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 c2153ebea893..d06ae234ae92 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 a4632399df04..66e63fcc3750 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 70865ea848b3..9e9e6657291b 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 8093d4752a0b..5a8814fb9e28 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 c62edd6d71a1..acfd06235ac7 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 2fb6fb44833d..7895d8c124ab 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 3e976f8919f8..619345d1b96d 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 c13b950599ed..073af3bfd053 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 eaeb9979c10c..60900bd2a3c2 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 e0f2243827c5..426fcfe8efce 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 10b99e4eb5d2..c12d50d792f2 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 0e99d03c0813..23e8080f01f0 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 05f5936a6cb0..b7c401532091 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 f7e500bdf543..f4d86247c6cd 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 4112a74d5eee..380755bf01ec 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 fb280795d889..3e47e4136363 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 9a01519a8812..edde6af615f0 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 839ee821d00e..37f79933b779 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 a22862c42920..90c2b8fd23c4 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 a2b73f61c279..7bddafc6ff59 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 9306eec817f9..533140631a54 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 7066744bb54d..08ba9e468147 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 fccdf7a978d4..a96ad3bd6f01 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 556aefd37049..a6d2bcd875e1 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 4be414905348..f582ef9834a6 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 edb3acdbdb1a..1026b1bd8d75 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 2669e8224bff..a4b21251bd18 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 d39c0d86fd57..6980b6e5ff13 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 aa50cf225cac..1f53c4f0e782 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 52cc2f1e9434..7b06628dbc7e 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 a9922a387657..9b7f36f4c874 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 97d2b67372af..fe77a27d449a 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 fd0da496fa40..f370e45b5fdd 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 7576c24024a4..4b84f73a2585 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 1658f8a6fa7a..1c14454af5c4 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 07f1c7ec917a..3438bfee07b4 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 157f801d2f2f..c2165a9d9c7a 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 ec6b304dc3ce..637a11efaef7 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 feeb4de15e1b..43cfe2ef251c 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 be418125dfbb..03cc3b2beb45 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 ccfe241324e1..53ec231dec96 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 2eee9bafe44b..4519cc7dd744 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 2de407e8f639..10a0d179d3e9 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 4f1a5f8a1798..73029c76818b 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 6d782543099c..0dec9daee6ac 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 830ec7bdaee2..25bac68faf6a 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 15e83cf9d769..c1b065dbf2b4 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 54aa42439d97..af59e50ec5e2 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 cdc36617c52d..7fbef9a986ab 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 e6c58b96e5c7..3b3eba39cc3b 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 a93ede63a263..2bb284477e6d 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 b8e7518cd332..010838efab5d 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 9139befe0204..fd99a70de3a6 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 c3bf3217b6a7..a3a4573c0aed 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 8abe4b2550e0..38b1df3ca3b5 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 2584c5ad8b3f..ed216d8236aa 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 b5a4f179b17a..7b8103efac85 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 d0bc2f5a3756..7de8968e0610 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 99f101010f3e..24547a03a086 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 50857e159dd2..1c7a0ccb0faa 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 26876cad8c83..824da3030685 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 1abf387bdd3f..62e635925664 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 39ec4c011f85..979c364e496b 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 ae85847b58b4..847322b1a109 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 d0349de4db32..e2ebb76397c8 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 217af54040f8..46b76abd268f 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 fff4cff7802a..b74501fdd680 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 cd9d9f2d150e..da68c811df18 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 ed868c30a442..d32fcf07b6cc 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 24942da00729..dca97a53cbfb 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 2cdab404c5fe..cd1435d65996 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 f94ee8d7637f..8ce33e67efe8 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 846fb7e37306..7524823a5dcc 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 54f99bf8afc9..1a006c9eb8f9 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 ebd13743442d..e41110386d79 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 74ec8e49343b..e1c1b4d2d4b0 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 efea0b4182c2..4d019b5b6999 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 22bbb4d3be41..54ac78fd6c4d 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 b67a972b00b1..34c13f99f92f 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 34d12f1471fb..838e81b20ba1 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 d1657cdd445d..c45f51509b71 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 08aa674eb6bb..847fe7538e90 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 a6a93f9ec95b..1e7957ae3820 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 2dd0865f6ea1..94ceef78908c 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 7f3638fe5c9c..c0f508129461 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 98556acbf281..b4a63eb7020f 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 950c536e7606..e55d49944555 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 63196fadf468..59617beb461e 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 8fbb1dac320d..e117d04a4cce 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 4ae1e58a7bca..69808d1aaf01 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 d5b0a7dbde59..17a16229b573 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 20d61e5c3626..547610fdf016 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 a6bb2ed61672..d145788c552b 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 235478a1776a..aa8245bb12dd 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 91ff3a446c2b..aa3b2544af07 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 8c39b9791e02..b248a0084ff1 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 dd7a945182ba..d29719891d2a 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 03e322d74c0c..d939a3b3ad48 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 8e2686110356..73753a5d34f5 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 9069bef68e04..2b7815c69787 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 47c42a1df45f..aec1916c1ffe 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 56e1de49f20a..0ccf55e5bc4e 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 fbaa1cfad710..c6f28067bf69 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 3f20a6ae4781..df309c5c68af 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 d4f81a825461..6074b76d300a 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 de9d06f7ce09..8a119aa2d326 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 6f3df32f3c04..a882d158f32d 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 736640eba8ea..dccf4a558317 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 9975f0f5465c..fe86a22b7f49 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 965f0ed096cd..4d63e2c6a15a 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 6b471560fa9e..de5da5674a2c 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 1531408e4980..c3fbb5863497 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 8aa446081b72..fc5f2e4a688b 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 075020eef5c4..ef0f5c4fabd4 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 28efaf4cf3d2..33b729f938df 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 1ea1cd4ab380..6a3c0c20d85f 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 8683c75a696d..9fbdc2e2e872 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 f1a1ceb9bb19..8f4ee7ce6e53 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 01531d23c781..5908ceb0f80d 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 78936ec19499..e51c326da195 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 b0d1f2a5455e..51f941771777 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 d0828b8811bc..704ef3c327e9 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 eea92b43b520..07ca9223bb0c 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 fc9bc985c00f..7ea83f80fefa 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 7f552bdd5d66..fdc28d3a5390 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 ce097bd5f231..b98560992e33 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 29586f3fb55b..13bb63ca7091 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 8ca83c2c93dc..e2f2bcc2f24b 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 39a7e38e0346..0d4c7ab7216a 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 358cc59d3db0..ad111a615142 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 74e35379137a..278d8d8dc5f3 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 8a07461bb2f1..01a84230dbb6 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 2d5520b9bf9c..5685d09e54fe 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 f335a6c11548..f1b5e19feb22 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 8706d22be19b..3e7e89642c26 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 8bd45aa008b9..2b196e46ef45 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 cac2d97482a6..2af1c5db2e32 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 9f5f8aa44228..d4f20ede2efa 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 93ac3fe5b745..e24171dfefec 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 ea6a6e775722..1ee7ece05377 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 a4ec902f762d..55dcba378ca1 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 0e35f45f042a..74f3430c2d89 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 6aaaaec1b13e..0d00eaa3ac80 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 fe5436625e87..58b1b53d52f9 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 96bb91175dc8..ce76e31a9204 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 297faa2a6042..16c73377cb4b 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 ed84c41001b6..0d5dd118798e 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 29ed9375c2e3..4bda93baddcf 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 aeb4d78d0ec4..75c32577a00a 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 6b6bef29cc36..80b5ce012437 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 57544659e868..f24921c7ce67 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 94ba31d59e1a..403f0a400107 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 ba6aff4e8bcf..2ad7b21d451a 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 d4f83eb8caf6..9ca1c37e11b4 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 ee8f00790754..0ddec9282e61 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 357237e1e291..42f280eed23b 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 8a92843e43ec..9fb441a92de3 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 f3032bfc86aa..274f45d5b2d1 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 693e67ee6ddb..8df306457251 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 4b1003db2847..278ba8d13c57 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 8af11183c699..8d49846cbc04 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 b78282ab6e4c..a06b08a5599c 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 239dfa0963b2..6bae355812c2 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 bb113c90849c..a9b5f17af832 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 af9394a84fa5..6d5fa0f3d980 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 48cab6529ccb..d50a7c006c89 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 d20714befba1..6fa185dfeab4 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 b5350ebecf77..f8f48ea4cdb6 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 dfac2cf88a55..4dbe31df03ca 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 9d072c9bb192..72be49d97927 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 a17b03025032..908808b79f3c 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 81bd4f60f43e..7de086dba607 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 4a8c767e44ac..533bb2322e72 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 f9960722e829..b5fc12024b17 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 d28f73dd91c8..62fa83800cba 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 24d678e11422..480ae328cd38 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 6814a06e3b95..f7bd8d520c87 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 9891ea5e52b0..4b610ebbfef2 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 6bb9924ddd09..c4209442de8d 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 8c303dd1e0c1..af9a7c9a1332 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 33efd2bd6143..772ae236764c 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 5b05ce534d70..24daa7fc81fa 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 61e115e71eb7..c2f281ecb17b 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 48f048b3abf8..57cf5bb97e2e 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 336d673f7ecd..44f791e5b8aa 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 be96dd9d3d35..85bad70edc9c 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 b530193258c9..66ed0a11fd92 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 4cac9befe16a..b8e984e90c43 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 edaa9b662e76..b261f0ef8411 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 e5bb23016ae9..fda442a67294 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 f042b9e209f7..77a2ef763a97 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 cf8c370c522a..f5353db68035 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 8a2dee19b957..f2ae143e1b9e 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 af8f5cafb894..8591db4e016c 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 eb8f5ef186f1..75c47dda0c40 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 5c55ac31588c..ce2936f96f3f 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 f960245e2b33..66a9f61eefb2 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 57943a314064..259ee38c68f7 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 19f51775ff24..d10c16599643 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 33a873f73dae..48df486ef0a4 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 93dc75c1f32d..71a9824bb62b 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 9bc6ecc6ddfa..76f53b55f3db 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 b4ab0f04d1c0..5cd3a707dde2 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 74bc177023fb..0600209723fd 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 1d8eeff209ed..89c84c8c9ca8 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 02e36dbc31c5..62423ff594ff 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 7437d2765a9a..bc265c5a5aee 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 9242014cdca5..3549e7c1c943 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 15e5ddf2f199..177f9326dd27 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 aa32d52dfc6d..2a126ac5c839 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 8fca318529ff..b9b16e4d8ece 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/684] 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 673b97cc137c..df8e86bf4c15 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/684] 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 eeb0f67d1937..d71718c32a82 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 76f76c1e750d..864e04d88f3c 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 0308fad831d0..b4ad15053204 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 6b38c3d59c29..a0dc7b7c71e3 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 db1d0a54dce0..d1d69b3d837b 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 6df3a97dbbb2..28e63c4f1662 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 312879a49e86..7c46d26bf5b3 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 b6695029f34c..d772ad7a3c71 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 99519c53fcda..bf2594b9bf4c 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 4e75b9407dee..14048d1b0d82 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 5df96519e7ff..ced2b7ce3dbf 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 2e4d12478b79..798aaabe6773 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 d2e9660a630e..3cf3a4e8d4bd 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 bffa5172b0e4..ee08af40c51e 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 fb45e591ec1a..0d6d7f172161 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 defe52987aa0..56aa005c4a92 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 588172aea61c..977039223959 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 6228bd4be9d0..aaf867baf258 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 e5fa11c5cad4..97bb884c92e2 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 401cb299497b..49288d3cb327 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 b6efd3d75a4e..9ea9ac216718 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 03149bab58b1..5d3c94c5f5c8 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 67441e9cdd8d..92484f169c15 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 82802b8f30e7..7aad4261fd32 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 c342c25a4118..2df9cbe58c72 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 a8dd74dd5fb6..a57d1bc9088d 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 fb966f762bc2..119261f412b1 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 a29cbb9bbd11..a528ad6f7f61 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 1d66735569d5..635baff796b7 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 07f2099f11ab..8d480c2d8829 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 4be744e7ba93..416101cad0aa 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 9ef3d6654138..1b0953df4e65 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 0b13696ad5f8..7d771414fb01 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 5f14a7bb5ee5..596ea1cfaf88 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 dbac4c859619..985ee59348b1 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 1c09edf3a7ea..50c63ef718ad 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 899806c4dae2..d618f90e5415 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 57f1a832f562..485620514e45 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 207a7b183e6e..940f6cf5107d 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 549a4d1b8266..c4d290bf9671 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 43cb6e6c2c75..2b798783dfc6 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 44744413138f..2e056306db4f 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 46eb054bc8ef..309ea244d713 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 d4f15992e742..dbcc17820ec2 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 f5e8b60cea06..9dadd085067d 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 d3e7dd5fa5da..77b351a19987 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 8b1faf788e58..7b356746861f 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 8ea3e3445cce..c46af5fba85c 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 37b728bde887..f343f11f5b60 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 9c730bb96597..174f1be99dba 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 7b34c1029bae..6a0273afbdd3 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 e01f84576ced..6bd59e1e7fd0 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 513503ff98e6..213394e5eccf 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 a25bf48f8dde..f1838f2a2cba 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 f947bf535cc9..6aed1481ddf3 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 741587ef960f..0dbfba52c0fc 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 13da95a28b5d..8d1e28fed296 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 94ca5eb58b1f..3314544084f8 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 7c92dc95268e..804b052b61ae 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 c393c65a7207..36ac3630e54d 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 15a535eed3ba..f02a913bc257 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 3bfb2d656d90..84778fb1c2d0 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 5aa0c01e8485..44bf52c9933f 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 190c903d9c17..423282aa8c10 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 ebe31dc8b5a9..4ed0c3393bc8 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 65158b3c5fe3..68e5df809377 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 1f00d42f2774..716973a3e2e7 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 f5184b985622..478f77f95f96 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 036e3a83cf28..68ea32e1e8ac 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 923adf8571d1..f9c7e3cdfc63 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/684] 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 fdefcf7e77d6..08fe9b4f9af1 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 3a0a548be0b9..1c5858b5677f 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 db952758f04c..612e4a557a71 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 7f2a9d71fe51..cb45ec3f1e53 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 e9fc06079981..752e25b4d8d3 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 4ec1a4bcd059..f6f3132178c5 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 433b6e6b32cb..2d62bfede093 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 3de211915122..2213ace8f572 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 85e45d3fad03..3e0dc99f81fc 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 a38d4c0866e0..7775fee5ba0d 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 2b798783dfc6..7a2252c6b273 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 0539e8de92be..f8beae4d527a 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 841a6ebecb0e..6208bff15bc4 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 383bdb882844..086aaded9aa2 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 4d4e1c1fc418..cefcdbc75a37 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 76257f94fe76..cb7f3c9510c5 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 78bcd925aea0..4ad454437f57 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 2857ea6c7be4..e196411ce412 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 31f2c0145578..ed7828f37e2a 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 90315540abac..3bc1f886ccd2 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 ccf8113e1a5a..b863786145c6 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 187852e8b55a..208012e2f883 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 c09da3dd2316..857524661bfa 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/684] 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 53c891e66f87..e8cf27d05652 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/684] 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 50b359da96ce..2abc8b7ea668 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/684] 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 9eb3748d0d48..742a6c43b04b 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/684] 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 6ecdf1d29bc1..66d165d09a72 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/684] 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 ee9b61259bb0..a87131ff40bb 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 dd1db5a84508..3caac2447e2e 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/684] 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 1f39a99ea0bf..62a6b645c2c4 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/684] 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 c83406269354..ba4d74e4d484 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/684] 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 529b3ba9e71f..5837361e01bc 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/684] 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 ad606af95621..863b03a117c5 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 ]; }; From ee6a49ee169905feadc351d5ae6448b7d1029979 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:03 +0100 Subject: [PATCH 212/684] python: JPype1: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/JPype1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 3e3d90f09d25..9198970cc42c 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1630439d5b0fb49e2878b43a1a1f074f9d4f46520f525569e14f1f0f9399f871"; + sha256 = "c16d01cde9c2c955d76d45675e64b06c3255784d49cea4147024e99a01fbbb18"; }; patches = [ ./set-compiler-language.patch ]; From abc938446eb28bbe1f040757589e3192a4c10ec6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:03 +0100 Subject: [PATCH 213/684] python: Pygments: 2.4.2 -> 2.5.2 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index cb0986e1d7f0..38636c9e31d5 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.4.2"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748"; + sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; }; propagatedBuildInputs = [ docutils ]; From 1eaac598425a3aaef755e589ea67eece99a77796 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:03 +0100 Subject: [PATCH 214/684] python: Rtree: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/Rtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index 1ac721874da2..867c771350c1 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Rtree"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "6a34b25f588e1563e45af251a8469b43a125d972eb2fa66e9ce96ed29f06c454"; + sha256 = "55c046a98e8d84235792de1f18635f680d7b4085264fbced6b073f28fcbe353a"; }; propagatedBuildInputs = [ libspatialindex ]; From b029c4a8bfa04f1a685eddf0e86eda606e8eda8d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:03 +0100 Subject: [PATCH 215/684] python: absl-py: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 5b0b9d19570b..e7a2f120c1b3 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "d9129186431e150d7fe455f1cb1ecbb92bb5dba9da9bc3ef7b012d98c4db2526"; + sha256 = "75e737d6ce7723d9ff9b7aa1ba3233c34be62ef18d5859e706b8fdc828989830"; }; propagatedBuildInputs = [ From 9485da9024d5ba5efd53e3cc5d8078158adc9149 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 216/684] python: aioamqp: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/aioamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 3cd6277a3faa..17abad630a53 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aioamqp"; - version = "0.13.0"; + version = "0.14.0"; meta = { homepage = https://github.com/polyconseil/aioamqp; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ced0d2bb0054809b37b0636da34fc7cda23d66943fb5f9f0610555988cf347b2"; + sha256 = "eef5c23a7fedee079d8326406f5c7a5725dfe36c359373da3499fffa16f79915"; }; disabled = pythonOlder "3.3"; From acd94765fae746910a4d7101675e2ca50ef2001a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 217/684] python: aioesphomeapi: 2.4.2 -> 2.6.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 5be6f9d86fda..dee851174065 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.4.2"; + version = "2.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e43e0fd628506f95752e90ab1579e5495183cc3c46915d0b0a062975cb5d181b"; + sha256 = "139d1d348fcfe2f34926a210a32dff069935d17167c4e1cb66e8b039cbb4d6c1"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; From 744129b45cc66169312d9d149c597d0c532e88a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 218/684] python: aiohue: 1.9.2 -> 1.10.1 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 258d5f10c958..ede51da9ef1b 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.9.2"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "a7e545ae17658c10f2c5321e40b85426a8c284e5b33b5dfbe9171f9bdf37aa3e"; + sha256 = "d95e51f15c442d769004774e7b4220155e32dc6c8ae834b035a2f0d8ff783ff0"; }; propagatedBuildInputs = [ aiohttp ]; From e542a06fe95d6950b00939c63f16dfd972573224 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 219/684] python: alembic: 1.2.1 -> 1.3.2 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index da958cd8d971..72e7ae6417aa 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.2.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a"; + sha256 = "3b0cb1948833e062f4048992fbc97ecfaaaac24aaa0d83a1202a99fb58af8c6d"; }; buildInputs = [ pytest pytestcov mock coverage ]; From f6b06b8379f4c9c3b6d4c8e3951f4cc1f0d31302 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 220/684] python: altair: 3.2.0 -> 4.0.0 --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 344a724756ed..3cd944cad9a9 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "altair"; - version = "3.2.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "098macm0sw54xqijdy1c8cppcgw79wn52qdc71qqb51nibc17gls"; + sha256 = "92dcd7b84c715f8e02bbdf37e36193a4af8138b5b064c05f237e6ed41573880a"; }; propagatedBuildInputs = [ From 30998de95107b46c87d819820b405efd1d236d18 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 221/684] python: ansible-lint: 4.1.1a0 -> 4.2.0 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 50addec97c2c..1728563b5f51 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "4.1.1a0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00mw56a3lmdb5xvrzhahrzqv3wvxfz0mxl4n0qbkxzggf2pg0i8d"; + sha256 = "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a"; }; nativeBuildInputs = [ setuptools_scm ]; From f6702bc836b60892016be09c4bbd4e7d5ebde5c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 222/684] python: apispec: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 217a921a634e..1ed984fc7182 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0rr32z9hbf8w4w1fs5gj2v0ixcq2vq7a3wssrlxagi5ii7ygap7y"; + sha256 = "24b8490c22310b0779a058ccb24ec2fef33d571bb5aba1f525ab5963b0eabcdd"; }; checkInputs = [ From 81bfe163ad4dc421e34eb27e91ede9652c31f2b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 223/684] python: argon2_cffi: 19.1.0 -> 19.2.0 --- pkgs/development/python-modules/argon2_cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 187e795416cd..c6a3decaf278 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "19.1.0"; + version = "19.2.0"; src = fetchPypi { inherit pname version; - sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; + sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3"; }; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; From fc12dff061a01d1448eae489a5f0f4224e8b943a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 224/684] python: ase: 3.18.1 -> 3.19.0 --- pkgs/development/python-modules/ase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index c84672e8abc2..3aa5a432c4b0 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.18.1"; + version = "3.19.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zxcdj61j9mxlgk2y4ax6rpml9gvmal8aa3pdmwwq4chyzdlh6g2"; + sha256 = "a8378ab57e91cfe1ba09b3639d8409bb7fc1a40b59479c7822d206e673ad93f9"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; From e6fd547dfa4f8283330c7fa6a072dc193713c5de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 225/684] python: astropy-helpers: 3.2.2 -> 4.0.1 --- pkgs/development/python-modules/astropy-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index fac97d2d3682..93b2784902f1 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; - version = "3.2.2"; + version = "4.0.1"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cf32cb008b19597a1fe1a4d97f59734f30cd513aa3369a321e7b5b86cdb623fb"; + sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413"; }; meta = with lib; { From 406ac1372326feb2a2d12a381e3005870752a9ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 226/684] python: astropy: 3.2.3 -> 4.0 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index fce2ecd392ab..c23c15e1d4d4 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.2.3"; + version = "4.0"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "47f00816c2978fdd10f448c8f0337d6dca7b8cbeaab4bf272b5fd37cb4b890d3"; + sha256 = "404200e0baa84de09ac563ad9ccab3817e9b9669d0025cee74a8752f4bc2771b"; }; nativeBuildInputs = [ astropy-helpers ]; From 938e8bb4496ebb7b5733220c9f8b67d0acc874b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:04 +0100 Subject: [PATCH 227/684] python: asyncssh: 1.18.0 -> 2.1.0 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index da222f7e615f..3d2250794410 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.18.0"; + version = "2.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1d9x7xpsqqd5scdk7f1c76lycgrxylaaf5qn4p46i8clfvm5a435"; + sha256 = "19d0b4c65115d09b42ed21c748884157babfb3055a6e130ea349dfdcbcef3380"; }; patches = [ From f173edd97180dedc46eb28aa00b324f1786e74e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 228/684] python: autobahn: 19.10.1 -> 19.11.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index bcda2b4b617e..c3d95f8915c7 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.10.1"; + version = "19.11.1"; src = fetchPypi { inherit pname version; - sha256 = "734385b00547448b3f30a752cbfd2900d15924d77dc4a1699b8bce1ea8899f39"; + sha256 = "201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ From 47ebc473fce44162c934f2e8b7e29e6e7f36e9e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 229/684] python: awkward: 0.12.17 -> 0.12.18 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 2c5d562657b6..8b375d162038 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.17"; + version = "0.12.18"; src = fetchPypi { inherit pname version; - sha256 = "f794c926e726b3545035ffcb8e6defe6a4ea975c6266c0154024e4591739a253"; + sha256 = "9b3df4f2be92ac7d16709f15769c97591f25f0442061f1a4cc8715feb268e45c"; }; nativeBuildInputs = [ pytestrunner ]; From 34d94851ec382634ab5b02b72e614f1b9d921023 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 230/684] python: awkward1: 0.1.28 -> 0.1.32 --- pkgs/development/python-modules/awkward1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 6b515b56713a..e40148f720b7 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.1.28"; + version = "0.1.32"; src = fetchPypi { inherit pname version; - sha256 = "2269aca04c827549435e24f9976d27e904d02b74a30caa9a2a463225a8ba1609"; + sha256 = "3b3c8ef1382074807d67a0d0051a3a611452f4423b1d128a483eb5d2b0d1b347"; }; nativeBuildInputs = [ cmake ]; From 7e961f659cc35f1ac9e68d548c39e162e36b0f7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 231/684] python: aws-adfs: 1.20.0 -> 1.21.1 --- pkgs/development/python-modules/aws-adfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 0c16480e9c43..9772a14afd56 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.20.0"; + version = "1.21.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1j18ffq5z8bcajavnlpbfhxrcadld5iv5gsfxg543yvdsp6hn2dg"; + sha256 = "18c93a1a8c6462d042ad5dc204c7449766b8e13fe11db51da269ec9e1dc8091e"; }; # Relax version constraint From 7f568e88de231429f74ae58617821d364b7e05cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 232/684] python: aws-sam-translator: 1.16.0 -> 1.19.0 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 298ce22daa6a..e3fa33cdb05b 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.16.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "0xvfbhiqdqy4qs4z8v2p7z3l01w5af948bmf400s5jsq2hnxl6nv"; + sha256 = "28efbfa3df5382bf611366eeadfe2d49d8a82f2c2b6e537bce680b9eb0702ec5"; }; # Tests are not included in the PyPI package From afc1c1e6bd0bcabb56443ba95045c61dd3eb1c1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 233/684] python: azure-keyvault: 1.1.0 -> 4.0.0 --- pkgs/development/python-modules/azure-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 91f31ec0a01b..006015646ee0 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-keyvault"; - version = "1.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49"; + sha256 = "e85f5bd6cb4f10b3248b99bbf02e3acc6371d366846897027d4153f18025a2d7"; }; propagatedBuildInputs = [ From fcb9968cdead312fafe4f5fa1ef3d43ad3d7e975 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 234/684] python: azure-mgmt-cdn: 3.1.0 -> 4.0.0 --- pkgs/development/python-modules/azure-mgmt-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index bbee8b39993e..da6d1639a136 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0cdbe0914aec544884ef681e31950efa548d9bec6d6dc354e00c3dbdab9e76e3"; + sha256 = "a53e9e09e2711ce9109329538fe9a8a1a5d0809efb231d7df481e55d09c4f02a"; }; propagatedBuildInputs = [ From 7363042bb57bfad4bde0e28d8cb57ad43b85da4f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 235/684] python: azure-mgmt-containerservice: 8.0.0 -> 8.1.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 2d98f57f1bad..5d1e3e6e3a97 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8fa3d3ac8a88ad6fd25f87966c27049864780d88b7b946d06da310d945a8772a"; + sha256 = "21fabdd393ba2ff1162a490cfa0d2b72a715da8462b1645bd986241137fc771f"; }; propagatedBuildInputs = [ From 7e5c31d25c3dd725943db50958ace1b7b97c3cc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 236/684] python: azure-mgmt-cosmosdb: 0.9.0 -> 0.11.0 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index aef56be79c0b..45542c8e9d57 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0y28z30g7y2pj7rfxyxmqpr19z24d01g9qhafvjxry748im1961h"; + sha256 = "3f6c1369903856864c7e4a05c2c261563153597172b182382d6332f3acd04016"; }; propagatedBuildInputs = [ From d93b6cd343d11ee102943e5ea5cef1ac6282c5af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 237/684] python: azure-mgmt-datamigration: 3.0.0 -> 4.0.0 --- .../python-modules/azure-mgmt-datamigration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 7fc7c5683011..dc889deba12a 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pc5pf7jpkpdrad5hafh2hki01dpx5773whp6kpxp71gh265mm5n"; + sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217"; }; propagatedBuildInputs = [ From 5dac231141198fa0aac811b2c95065954c1cdec1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 238/684] python: azure-mgmt-hanaonazure: 0.10.0 -> 0.12.0 --- .../python-modules/azure-mgmt-hanaonazure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c8b6ebfba63e..789784babfb4 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.10.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "01gnrhwi3nswjdxk9fjjwbyyx83agpdksrksk0c4d7bm9p2871g6"; + sha256 = "cc844a152079e0d18fb5f47663a24cb204982925425c1fb51bac53894885000b"; }; propagatedBuildInputs = [ From dc6da42c830af1067aaff2a07ac783f176411566 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:05 +0100 Subject: [PATCH 239/684] python: azure-mgmt-hdinsight: 1.2.0 -> 1.3.0 --- .../python-modules/azure-mgmt-hdinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 82955674c4bc..6cda959448cf 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yq9s7a2ch8j84af3hzj350jnjq5s3ysiqvmypvcb7vl6rkkd2lm"; + sha256 = "55e129da3c3750cd5a26b91035990590a3f97aef4971de62d84de00f4fd6f1e4"; extension = "zip"; }; From e7a2e0e367b16dcb0bc67467c8d13fd6a0616814 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 240/684] python: azure-mgmt-media: 1.1.1 -> 2.0.0 --- pkgs/development/python-modules/azure-mgmt-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index d86b7f40d4bc..90b45d0e3f05 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5d0c6b3a0f882dde8ae3d42467f03ea6c4e3f62613936087d54c67e6f504939b"; + sha256 = "b144e66cb8b947b871354edbcee15b78e107fb8f3a337d46d04cd8b73300741b"; }; propagatedBuildInputs = [ From 0695ee66ad3ff7080957b4dbca9735928cf9a461 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 241/684] python: azure-mgmt-resource: 6.0.0 -> 7.0.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 4f2481097e1a..8f9128a62a03 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "6.0.0"; + version = "7.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; + sha256 = "eaea8b5d05495d1b74220052275d46b6bed93b59245bcaa747279a52e41c3bdf"; }; postInstall = if isPy3k then "" else '' From 689d1c0427c41b90b872c72d78550f25e677f012 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 242/684] python: azure-mgmt-sql: 0.15.0 -> 0.16.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5a5a708a5dd2..0929ca3ff5c2 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.15.0"; + version = "0.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9"; + sha256 = "ddbdc29c1dca437275b0cb5a6fe2d86fa6886ccefb2270287357f07afe80a4ac"; }; propagatedBuildInputs = [ From 0490e05654871f2cf84bce75eef4625c0e31edec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 243/684] python: azure-mgmt-storage: 6.0.0 -> 7.0.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index c2b172e6c49e..552b1c88792a 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "6.0.0"; + version = "7.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pgmxr8shz6rmgbacfy1xb99y9ja38ck1lap0n58m6jjy1mgxk2w"; + sha256 = "7f5e6b18dee267c99f08f6a716a93173bbae433c8665f5c59153fb1a963bc105"; }; postInstall = if isPy3k then "" else '' From 843f91dfd213b5ddd4c3df00de225d6c58017d8e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 244/684] python: azure-servicebus: 0.50.1 -> 0.50.2 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 7656e7c6376a..02460b27952e 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.1"; + version = "0.50.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0i8ls5h2ny12h9gnqwyq13ysvxgdq7b1kxirj4n58dfy94a182gv"; + sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5"; }; buildInputs = [ From d9d272391243c923d929974bd338a2f93ffff773 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 245/684] python: azure-servicefabric: 6.5.0.0 -> 7.0.0.0 --- .../python-modules/azure-servicefabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 79d303a4652c..19420b0526d9 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "6.5.0.0"; + version = "7.0.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "02q32rc3vmg3kpi92s2y2ic47s3mi9qjcvzvrpjdlzji8lhd9w45"; + sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9"; }; propagatedBuildInputs = [ From 502e54660771316b06f29448463f432a21a0f176 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 246/684] python: backports.functools_lru_cache: 1.5 -> 1.6.1 --- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 2a8b5e7960d4..b346b5c75030 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.5"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a"; + sha256 = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"; }; buildInputs = [ setuptools_scm ]; From f31155fb8a0a4abe598ea947c77fe01c61d22e6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 247/684] python: bayespy: 0.5.18 -> 0.5.19 --- pkgs/development/python-modules/bayespy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 430e7c3da8aa..210fbbe2176e 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.18"; + version = "0.5.19"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "86c453d827b8d6c3574ec306f6fadfc5028614e1cd46676841336e6787a7496a"; + sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f"; }; checkInputs = [ pytest glibcLocales ]; From f6e83bbac4b906a74e6832f8fce557da90895844 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 248/684] python: bids-validator: 1.2.4 -> 1.3.12 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index ec66124e3c78..6b7bad58bc4c 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.12"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg"; + sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; }; propagatedBuildInputs = [ ]; From 136fd2d210b099e26174030efbfc30579cc6f288 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 249/684] python: bitarray: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3c84366c9d13..f119aedc4b82 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "0nv1283qcfilhnb4q6znlijply6lfxwpvp10cr0v33l0qwa86mwz"; + sha256 = "4f8706b651243c9faa981f075bcbdef2fab83e9b9bc9211ed2cb5849f9a68342"; }; meta = with lib; { From c2918071999d47aea777b6afd01361bc1f82108b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 250/684] python: bjoern: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/bjoern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ddbb2f0d27e8..08caabef3bdf 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1ajmmfzr6fm8h8s7m69f2ffx0wk6snjvdx527hhj00bzn7zybnmn"; + sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b"; }; buildInputs = [ libev ]; From 29233fd101cd84cc5ed8ba46223f1ce3ee8a8070 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:06 +0100 Subject: [PATCH 251/684] python: bokeh: 1.3.4 -> 1.4.0 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index c92f299f919f..a352fb0fbb07 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "1.3.4"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2"; + sha256 = "c60d38a41a777b8147ee4134e6142cea8026b5eebf48149e370c44689869dce7"; }; patches = [ From 03a5c5ef4562a8450013227a4ffe46d8dde029a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 252/684] python: BoltzTraP2: 19.7.3 -> 19.11.1 --- pkgs/development/python-modules/boltztrap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index df10288905d2..d89cf3c615d9 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "19.7.3"; + version = "19.11.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; + sha256 = "3927ae782b7329dede2bf85ff5ff328c88f0514ecb592267e28912340f395d3e"; }; dontUseCmakeConfigure = true; From d495408b2f4e5b0982655f934f2de91317d27c56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 253/684] python: breathe: 4.13.1 -> 4.14.0 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 08e37e2773c7..cb049b659430 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.13.1"; + version = "4.14.0"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "c6752345252f48092bf72a450fd9e84367bd5b4af99d86c92047f82c6c2287ab"; + sha256 = "178848e4088faf8c2c60f000379fcabfb3411b260e0fbddc08fb57e0e5caea08"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 82ec0f9934949b6ac0faf9bc523ff9466b353250 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 254/684] python: browser-cookie3: 0.7.6 -> 0.9.0 --- pkgs/development/python-modules/browser-cookie3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 807dafab4369..c0e53b8bb708 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.7.6"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h"; + sha256 = "af5cb74fcee3a7b76391cd1eaf653a70b179ed6026cdeba2b3512f09c8ade568"; }; disabled = !isPy3k; From 5296ad0cb52fdcda812cbfa6be7690bb4bd8d07c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 255/684] python: cachetools: 3.1.1 -> 4.0.0 --- pkgs/development/python-modules/cachetools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 51bf0e753a91..aac67a109cb1 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "3.1.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a"; + sha256 = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198"; }; meta = with stdenv.lib; { From 6e9799840133a0faf991ba4d11851b97d13a245c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 256/684] python: cachy: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/cachy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index d5c3428fcc1f..e66bef51d03c 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cachy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"; + sha256 = "186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"; }; propagatedBuildInputs = [ From f07cea7f379596dbcf6c4ae50339ee71fd25cf9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 257/684] python: celery: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/celery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 19eaeaf8d827..de34ce5ba0cb 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4c4532aa683f170f40bd76f928b70bc06ff171a959e06e71bf35f2f9d6031ef9"; + sha256 = "d3363bb5df72d74420986a435449f3c3979285941dff57d5d97ecba352a0e3e2"; }; postPatch = '' From 364e32218aaa07b81b63e4abba73352675d372b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 258/684] python: certifi: 2019.9.11 -> 2019.11.28 --- pkgs/development/python-modules/certifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 40e743285722..7ffc50ea5206 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.9.11"; + version = "2019.11.28"; src = fetchPypi { inherit pname version; - sha256 = "0l0yw94ypd117bl7f0fx8sqw9wsnrpcsn92vr7nkxy54zq665wz4"; + sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; }; meta = { From a9db6e4375c953934974761fef256c72a349605d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 259/684] python: cfn-lint: 0.24.8 -> 0.26.1 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index eeccaedf5f68..d470dc7dea19 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.24.8"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "5aa1540ee9a7efc23ebe54a22f1a505766a4bb44f64a0f4fe79574a156a9b43e"; + sha256 = "648c9fc70abc479183c63e53eebaae5a9d5236480b55e7fae033a727c21592fd"; }; propagatedBuildInputs = [ From f4e5e09791d5127275f65cf9181084dd7dcbd091 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 260/684] python: channels: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/channels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 9cdbd0dac114..b7c83b3b3ffe 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d"; + sha256 = "08e756406d7165cb32f6fc3090c0643f41ca9f7e0f7fada0b31194662f20f414"; }; # Files are missing in the distribution From c60f8224f02d73a2c13fe00dab26d4b4c45ae95a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:07 +0100 Subject: [PATCH 261/684] python: cliff: 2.16.0 -> 2.17.0 --- pkgs/development/python-modules/cliff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 7882c98e524d..46ac5be03cee 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "2.16.0"; + version = "2.17.0"; src = fetchPypi { inherit pname version; - sha256 = "622e777b8ac2eb479708fe53893c37b2fd5469ce2c6c5b794a658246f05c6b81"; + sha256 = "f5a1c6b32047aa0d272398d311fd711d41dd5e1cd5195ebe36ebb47f464416fa"; }; propagatedBuildInputs = [ From 4b5cefd95f05d6e421ae8904ff939037e77c6694 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 262/684] python: clifford: 1.0.4 -> 1.2.0 --- pkgs/development/python-modules/clifford/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index ca95ebbf1f3b..961f6b5bc1de 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "clifford"; - version = "1.0.4"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7fc5aa76b4f73c697c0ebd2f86c5233e7ca0a5109b80147f4e711bc3de4b3f2c"; + sha256 = "b27fdec70574ac928c91fe333a70ece153d75cd0499cce09acea5980ae349bee"; }; propagatedBuildInputs = [ From a528ff3a28d2ba6bafb1739f3ac406a51388c1fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 263/684] python: clikit: 0.3.2 -> 0.4.1 --- pkgs/development/python-modules/clikit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 37a41c7fba4a..94f3fa08b138 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.3.2"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pvzq3glf4sjgrm0wyxln3s6vicdc9q8r5sgaiqmxdmd9pylw0xm"; + sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"; }; propagatedBuildInputs = [ From 2983e381e073e0b90477f41fb870b10625490d4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 264/684] python: ClusterShell: 1.8.1 -> 1.8.3 --- pkgs/development/python-modules/clustershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 4120dda54607..75a77d4c63cb 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.1"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "e913efb4fe017eed9731d5ad8be397509e7f1966e6cb6441ee2bce074b16b310"; + sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b"; }; propagatedBuildInputs = [ pyyaml ]; From 0fe27acafacd1e6a2bac8acd5db8b2d9c15fc1d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 265/684] python: colored: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/colored/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 2ccdb03bc22f..b62d80600c7d 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "colored"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0qf9470fsasimsmsri13jw1d2zpn3g24fv6vss64jq3ifwfkcs14"; + sha256 = "056fac09d9e39b34296e7618897ed1b8c274f98423770c2980d829fd670955ed"; }; # No proper test suite From 92f43f066d38e5fbdd123e8c8915f3e62b6ef5e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 266/684] python: confluent-kafka: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 8d992f71f33a..f32a6bfd1acd 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "1nn8z7ggjj04v97jm33dxh2cv2azy4xi1hwkj9qwbbc68vasc3cp"; + sha256 = "4025ccddbc79443a4e2342de0d770f669558eb737fca2e7851558cd45f78ef78"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; From 6d49dff1cf4e910d6673b6031e3ad3b3af83a707 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 267/684] python: cornice: 3.6.1 -> 4.0.1 --- pkgs/development/python-modules/cornice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 4ac38986245d..598c3bd1c089 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.6.1"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d3d608b9ff405e7ba5e9629ef0c09b7605997e1aea0dafb2aaa66761ff7cab08"; + sha256 = "d083832e9db65da4784436deabd7d37959de88c3b8ba51d539fa1e1f8313439d"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; From 3d4c6fdc5fbcd8cbc735b74c13f10b1a7d43369e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 268/684] python: coveralls: 1.8.2 -> 1.9.2 --- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index aaa6192f2d50..dbf6616c22d3 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.8.2"; + version = "1.9.2"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "fb51cddef4bc458de347274116df15d641a735d3f0a580a9472174e2e62f408c"; + sha256 = "8e3315e8620bb6b3c6f3179a75f498e7179c93b3ddc440352404f941b1f70524"; }; checkInputs = [ From 49431a303284a9b40848c882dc94a7fcbe41befd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 269/684] python: cupy: 6.4.0 -> 7.0.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index f949120db0cf..5426a609449d 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "6.4.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "126waa1jiynq00glr1hq86sgwwmakq009crfsn8qqgrj4c4clw6a"; + sha256 = "7230b25052b2b9074cc338b44338b4bd43575a48ad7b9c2ce7f36d7e0d117012"; }; checkInputs = [ From 50a0f5055bcd5ecccd81a2a4022e2a6a27e77baa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 270/684] python: cx_Oracle: 7.2.3 -> 7.3.0 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 7064e81a5d25..6ba8f3386387 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.2.3"; + version = "7.3.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "1b1zarb6g1b2nl3bj9m5ph1sxqc44bscwq30300q78hm666sbf6z"; + sha256 = "2e0da54e948b55e5c75fab14b391d58aa8b9be1eddfd9ec9a8a0e500bc8bfc7e"; }; preConfigure = '' From b6f4c76b0185285ce41a9398e0612bc8a2def9f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 271/684] python: datadog: 0.30.0 -> 0.33.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 53a33037d165..64ddae34e871 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.30.0"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "07c053e39c6509023d69bc2f3b8e3d5d101b4e75baf2da2b9fc707391c3e773d"; + sha256 = "bce73f33a4496b004402baa502251150e3b48a48f610ff89d4cd110b366ee0ab"; }; postPatch = '' From fde4fcdb3a34f7177eb2832ff6b9af6e3e7921fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:08 +0100 Subject: [PATCH 272/684] python: datashader: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/datashader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 2039283771e6..789e488e4615 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "59ac9e3830167d07b350992402a9f547f26eca45cd69a0fb04061a4047e7ff2a"; + sha256 = "3a423d61014ae8d2668848edab6c12a6244be6f249570bd7811dd5698d5ff633"; }; propagatedBuildInputs = [ From b1c211ea3e2cac0621d4979198ca06aeeedd2aef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 273/684] python: deluge-client: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/deluge-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 6f82adc94ca1..a2a986828b5c 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1ragmpihjr9p6n27hw7gy83qyc68csqpn18m9kvwsby1vi7mgdy8"; + sha256 = "4eac169b4b08008cacf4e5e26e82302a7ccd43c07846d1a1228f3e271a128de2"; }; # it will try to connect to a running instance From f2a6a6dabc1f71e2ff5594027a250788ee57c7a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 274/684] python: diff_cover: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/diff_cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 0d49f6278212..ed16f7f95e52 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.4.1"; + version = "2.5.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12h91rvbrf9qmdmj5nfqhcd3bpwq1pvk990bag4hyxcf86qlzds4"; + sha256 = "2ba4e8dcd5439a245287fac056db02a9261432b1a44a5cffbe593032de86f1c7"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; From 661ac37284c465fd29cb388bf5ceea41614804dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 275/684] python: distributed: 2.6.0 -> 2.9.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 4179499eaf37..97c2caabac8c 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.6.0"; + version = "2.9.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "30b0ca195ace1e39bdd278bf1ad257f7674b3e2b8e7a2a37ce7e2ade4aecccf3"; + sha256 = "b66a15d6c02c28dd07e815d09cd77dab8484004533d38895714a5f10c7e7e325"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; From 4b886d5f1ae9a95c7f66a0204ae96a7bb5a7b08e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 276/684] python: django-auth-ldap: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 4e2377ffb0f9..3e95e7ff16ba 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.0.0"; + version = "2.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1samrxf8lic6a4c0lgw31b38s97l8hnaknd7ilyy2plahmm0h03i"; + sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; }; propagatedBuildInputs = [ ldap django_2_2 ]; From 77bdd3e2a11870dd209d2ca16a4159ec0776be7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 277/684] python: django-configurations: 2.1 -> 2.2 --- .../python-modules/django-configurations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 0ca6c400df28..c31036c18148 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "2.1"; + version = "2.2"; pname = "django-configurations"; src = fetchPypi { inherit pname version; - sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; }; checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; From c727c90e8772e1a3746fb8f0c90d4fd9726ec475 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 278/684] python: django-cors-headers: 3.1.1 -> 3.2.0 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 358f2ab1be44..005dc65a4993 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5762ec9c2d59f38c76828dc1d4308baca4bc0d3e1d6f217683e7a24a1c4611a3"; + sha256 = "84933651fbbde8f2bc084bef2f077b79db1ec1389432f21dd661eaae6b3d6a95"; }; propagatedBuildInputs = [ django ]; From 84c34b4fd573a7002db2ae0f7635f12104402b67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 279/684] python: django-multiselectfield: 0.1.10 -> 0.1.11 --- .../python-modules/django-multiselectfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index acf49d741673..a4dcb57fe43e 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "ec305ca79b6e16fb6d699d3159258f9f680ead8ea5ef9b419e7faf13f31355df"; + sha256 = "043fa1aaddceb9b170c64c0745dc3a059165dcbc74946a434340778f63efa3c2"; }; propagatedBuildInputs = [ django ]; From 94bbec021a05875d180412ded8f16bc5965969db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 280/684] python: django-versatileimagefield: 1.10 -> 1.11 --- .../python-modules/django-versatileimagefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index d4f46e0355f7..90993db4c5bf 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "0y0r6ssxyg9x1rylpyxg2ha2hl18080k5xp308k4ankpjm50hvc8"; + sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; }; propagatedBuildInputs = [ pillow ]; From fdd4e634bd468ba291bc4ded84132e54b6206919 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 281/684] python: django-redis: 4.10.0 -> 4.11.0 --- pkgs/development/python-modules/django_redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 85761be9ba5f..c19ca2553194 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,11 +2,11 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg"; + sha256 = "a5b1e3ffd3198735e6c529d9bdf38ca3fcb3155515249b98dc4d966b8ddf9d2b"; }; doCheck = false; From c13dbca23c167fb5d902a5a795833f6f91996e41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 282/684] python: django-taggit: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 6ca498ce5e9e..2851894b6b6f 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.1.0"; + version = "1.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "044fzcpmns90kaxdi49qczlam4xsi8rl73rpfwvxx1gkcqzidgq1"; + sha256 = "4186a6ce1e1e9af5e2db8dd3479c5d31fa11a87d216a2ce5089ba3afde24a2c5"; }; propagatedBuildInputs = [ isort django ]; From c160950f45439d5927827bdff0f4421410bd4818 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:09 +0100 Subject: [PATCH 283/684] python: djangorestframework: 3.10.3 -> 3.11.0 --- .../python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index addff19853df..e9668a27c1c7 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.10.3"; + version = "3.11.0"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "140hwz52rlqqc10gbw5bhyyi4zbpqj3z7wgnh2jrhs2wfzwwp0fw"; + sha256 = "e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f"; }; # Test settings are missing From a218c86e20e9db94a9f361d077551d92c8fcc016 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 284/684] python: dkimpy: 0.9.5 -> 1.0.1 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 60c5dc24b113..9c061e9523a5 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "0.9.5"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "6bf47aa71bc466f5d6a201042317fb415fbc45f3cae4f5dbe1e337e235549ff2"; + sha256 = "5d5ba1a15dd8c980d4183989f383bd5522a88dafde4eee5e4eebf9ee6942d94e"; }; checkInputs = [ pytest ]; From 8c887f20f9bdb8b1aaf50804d355a99a9e0f5003 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 285/684] python: easy-thumbnails: 2.6 -> 2.7 --- pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index dae1df695624..894363237f50 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.6"; + version = "2.7"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275"; + sha256 = "e4e7a0dd4001f56bfd4058428f2c91eafe27d33ef3b8b33ac4e013b159b9ff91"; }; propagatedBuildInputs = [ django pillow ]; From 8af94a608fd9d37a6df4c47c99ac3cf80c95a7a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 286/684] python: EasyProcess: 0.2.7 -> 0.2.8 --- pkgs/development/python-modules/easyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 7f8a803740d0..32acb1213a88 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "f757cd16cdab5b87117b4ee6cf197f99bfa109253364c7bd717ad0bcd39218a0"; + sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; }; # No tests From e5ebebc7a0b326e600b36e44b239803de2c1702c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 287/684] python: ecdsa: 0.13.3 -> 0.14.1 --- pkgs/development/python-modules/ecdsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 825cc0df56ca..d6882b42e43f 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.13.3"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d"; + sha256 = "64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e"; }; # Only needed for tests From 5dd6b621ec08d75cb0225c38831f124bcd0b9b6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 288/684] python: effect: 0.12.0 -> 1.1.0 --- pkgs/development/python-modules/effect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 6b8329550da3..fec5518f0e80 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -7,12 +7,12 @@ , testtools }: buildPythonPackage rec { - version = "0.12.0"; + version = "1.1.0"; pname = "effect"; src = fetchPypi { inherit pname version; - sha256 = "0s8zsncq4l0ar2b4dijf8yzrk13x2swr1w2nb30s1p5jd6r24czl"; + sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; checkInputs = [ pytest From 26607cddcef4c630b6afded8cbb08f632e73a4bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 289/684] python: elasticsearch: 7.0.5 -> 7.1.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e9c65018f674..ccef465eca19 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.0.5"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "693935914d59a517dfffdaab547ff906712a386d9e25027517464960221cbd4c"; + sha256 = "0140787216646e1eb7eb001f8146aff7071d7ca438854249787b6cc221ddd266"; }; # Check is disabled because running them destroy the content of the local cluster! From 1136ecc5ac1c32f0002e8f45f5676e83a8005e20 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 290/684] python: Eve: 0.9.2 -> 1.0 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 73813d34c5a3..a8ac610855d5 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.9.2"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "0191ed42ef85d747758bba29df5ff1e296b8152fefddb2f75c3d778c2e6fb9d3"; + sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; }; propagatedBuildInputs = [ From a17d51feae2d3c48ef61bdd8f409fe1e6034d5ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 291/684] python: Faker: 2.0.5 -> 3.0.0 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 8daa637724d7..0d8c77f557f0 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "2.0.5"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "29093e61f12745150774fd05ab499e87252a4fa51ed51e45c40179e854f87925"; + sha256 = "92c84a10bec81217d9cb554ee12b3838c8986ce0b5d45f72f769da22e4bb5432"; }; nativeBuildInputs = [ pytestrunner ]; From bd8f10f0b4a54641ed273353b285234cba4b7f12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 292/684] python: fastapi: 0.42.0 -> 0.45.0 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c90b64dca811..a04e54c0d009 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.42.0"; + version = "0.45.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "48cb522c1c993e238bfe272fbb18049cbd4bf5b9d6c0d4a4fa113cc790e8196c"; + sha256 = "44712863ca3899eb812a6869a2efe02d6be6ae972968c76a43d82ec472788f17"; }; propagatedBuildInputs = [ From 2dfb99446465ee3632d38a6290cfce5402ceec95 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 293/684] python: Flask-API: 1.1 -> 2.0 --- pkgs/development/python-modules/flask-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index b0f9682ed854..8bb6a472c9fd 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-API"; - version = "1.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "0r23pdlaz6ibz9vml3m7v6v3firvykbrsi1zzxkdhls0zi9jq560"; + sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; }; propagatedBuildInputs = [ flask markdown ]; From 619f414bf669aeb2fe1f3fa7206db69b66c7ac63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:10 +0100 Subject: [PATCH 294/684] python: Flask-Caching: 1.7.2 -> 1.8.0 --- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index bd528af6bfab..02c19d8e95e1 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.7.2"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "17jnnmnpdflv120yhsfbnpick06iias6f2hcxmf1mi1nr35kdqjj"; + sha256 = "3d0bd13c448c1640334131ed4163a12aff7df2155e73860f07fc9e5e75de7126"; }; propagatedBuildInputs = [ flask ]; From e69dba9c94c80cc07b151a7358e7d263e1fb98d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 295/684] python: fonttools: 4.0.2 -> 4.2.2 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index eb59eaa0f1cd..604b09e4b03b 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.0.2"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "bb9bf6b5b4ded33e0d9f823e5ae2e1fa643af4d614915660abe3853a9a6931cd"; + sha256 = "66bb3dfe7efe5972b0145339c063ffaf9539e973f7ff8791df84366eafc65804"; extension = "zip"; }; From c2bb85d47223bb403df8dd5b6724000ba6d05488 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 296/684] python: fsspec: 0.5.2 -> 0.6.2 --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a94f847fc908..1be03cd0d2a1 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fsspec"; - version = "0.5.2"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6531a5fa9ea6bf27a5180d225558a8a7aa5d7c3cbf7e8b146dd37ac699017937"; + sha256 = "ffd7cd5ac32f36698097c3d78c2c433d4c12f7e4bce3a3a4036fd3491188046d"; }; # no tests From f2cfcb38d65df86831ac372c63c295da5c5abd77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 297/684] python: genanki: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/genanki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f4f3821afa31..bab5b26635d1 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "32ee8063b1d3b5cd95c117c5a4aa812940e3d3c0daa3d535cd6633c1025a59bc"; + sha256 = "c7c6c276f182a63a807b52a95f197df12794ff014f48dd287cb51ca2dcbe1b34"; }; propagatedBuildInputs = [ From fddaa59232e3afeef8544738233bdb61df80dcba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 298/684] python: gidgethub: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 140f93f33f80..341d08d95ed4 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762"; + sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; }; nativeBuildInputs = [ setuptools pytestrunner ]; From d999e8e59238032c17ac19555d13515b04675584 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 299/684] python: glom: 19.2.0 -> 19.10.0 --- pkgs/development/python-modules/glom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 2a89fb262ff2..739ef7d95e46 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "19.2.0"; + version = "19.10.0"; src = fetchPypi { inherit pname version; - sha256 = "c277f34e5e498834a63c2114a25a6c67b5cf0b92f96bb65cba063d861c3d1da6"; + sha256 = "c8a50cb9fcf0c84807836c6a73cf61285557834b9050d7bde7732b936aceb7dd"; }; propagatedBuildInputs = [ boltons attrs face ]; From 128ca567ae319442bab0aa808ca57ba2b1287ed5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 300/684] python: google-music: 3.1.0 -> 3.2.1 --- pkgs/development/python-modules/google-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 94fe6d5e0a14..0a3f145f131d 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.1.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "5c6cb11d56dfe2cfb95f3083ed4c1347dafbf15a88fc9a7aab3ed5ee4c75cc40"; + sha256 = "15d543ab31c981bcb9bfb10f588159848ef570fafb6b9d1347f1429a9b1f531a"; }; postPatch = '' From 2535e66a5327ce8ba6ffe2e690dbe97eb65bf6b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 301/684] python: google-api-core: 1.14.3 -> 1.15.0 --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 3a6b49e4e9ff..6bfc10f0a093 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.14.3"; + version = "1.15.0"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "df8adc4b97f5ab4328a0e745bee77877cf4a7d4601cb1cd5959d2bbf8fba57aa"; + sha256 = "2d661c8d650a1df5805d0e360121cb55c55d8bd29f858fa62cbe943e59ce89f7"; }; propagatedBuildInputs = [ From 74c21c24ea22e79ad0c634cea2d15488f5db5346 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 302/684] python: google-cloud-asset: 0.4.1 -> 0.6.0 --- .../development/python-modules/google_cloud_asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index e73f1e866133..934af49462b3 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.4.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e6c02a6709d13490c73450f3b1ac3436bd26795fa04d9711d7cad973a71eb118"; + sha256 = "35eeb50c101968b4b5eecc840002a6f83af6789b6a947f27f0b2787e30cc1835"; }; checkInputs = [ pytest mock ]; From 7e54065ec1b540b33212851f53f9096dc9ba393e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 303/684] python: google-cloud-automl: 0.7.1 -> 0.9.0 --- .../python-modules/google_cloud_automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 52248605c757..3fc0fc8598d5 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.7.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "fa92a77fcc79032dba756b82196a29f63a7b374379bacdb78be128e09b8abc03"; + sha256 = "6541245cdee3e3ba5d98bb3ecd0b343fd5d3de1e880cfc5daf59f4a69a045171"; }; checkInputs = [ pytest mock ]; From 7a562674ab808eddbe0fe3f7799d3e4c65794473 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 304/684] python: google-cloud-bigquery: 1.21.0 -> 1.23.1 --- .../python-modules/google_cloud_bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index f81663b407db..e361b4436ee8 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.21.0"; + version = "1.23.1"; src = fetchPypi { inherit pname version; - sha256 = "b38d5669235583ee4334d468b3719ea4a381da4b2abbedbf13cb926d893a11ab"; + sha256 = "99c341592d711d8f131fe80d842f7e1b04b2ca1faefa1ffedf4dec1b382cebf6"; }; checkInputs = [ pytest mock ipython ]; From f258bc0d667872143e2d33b9ab44ee01c94dfe9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 305/684] python: google-cloud-bigtable: 1.1.0 -> 1.2.0 --- .../python-modules/google_cloud_bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 3dae6bfdadcc..a71d2e493ddd 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5bfa5db942ddb491a62198e690754dbed80228e5cb2c389d809be33464f6cb31"; + sha256 = "eea9d4aca54499b555a893fa441deac1bd7ae9cbc8e03bdd681fd33fad72e170"; }; checkInputs = [ pytest mock ]; From 01b720484ce4bdaddeb7012050bcd5716e7391e7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:11 +0100 Subject: [PATCH 306/684] python: google-cloud-core: 1.0.3 -> 1.1.0 --- pkgs/development/python-modules/google_cloud_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index 0b0914b14806..139ce85a3191 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "10750207c1a9ad6f6e082d91dbff3920443bdaf1c344a782730489a9efa802f1"; + sha256 = "49036087c1170c3fad026e45189f17092b8c584a9accb2d73d1854f494e223ae"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; From 7af032f7a2bc5305c137f2f59e12ab53c4cc683d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 307/684] python: google-cloud-dataproc: 0.5.0 -> 0.6.1 --- .../python-modules/google_cloud_dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index a08a1c4fd107..becc2678dc16 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "24c28e9383e714b1447e5b4a2282beda2c94714e78cbb6cfc5f8ccbfcfdb3ffa"; + sha256 = "302bc448e77f1de958ba7413fb85819eda911043f219d8fc030a356848bc6f31"; }; checkInputs = [ pytest mock ]; From 1f3645f27c7b7f431ab92f9cf3fe51bf22c799af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 308/684] python: google-cloud-dlp: 0.12.1 -> 0.13.0 --- pkgs/development/python-modules/google_cloud_dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 6c7388b4cf17..309909384351 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "acf2b1f8388b0baf3286bd2a67e3adad70a28d0fa768fd2196a96710637c4b72"; + sha256 = "844f5e63597c2a15561eec68397ee5f425e9be7728d2d7072f50f983fab31b9a"; }; checkInputs = [ pytest mock ]; From d9bfec5723e80fe9a7df4e39e5fa533ac15e0bfc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 309/684] python: google-cloud-firestore: 1.5.0 -> 1.6.0 --- .../python-modules/google_cloud_firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 697e2b2d7c92..e6211d844fa7 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "201fa86bbc76cf7ccbfac293bb7ed2dfba9bb9e5244b2785f619d083a8b2b51d"; + sha256 = "7fec7b523ab5e1f87721ca61181114818579bb4d17de768a3993811c9d2aacfe"; }; checkInputs = [ pytest ]; From 1c65889d1c2caae744928689f6910d1ebe20d12c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 310/684] python: google-cloud-monitoring: 0.33.0 -> 0.34.0 --- .../python-modules/google_cloud_monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index 5bc612ad188a..a556fb955688 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "0.33.0"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "cba63744faeea3b0167a752268955df127736e453820f01cc24e97bf4ae83c24"; + sha256 = "75370af645dd815c234561e7b356fa5d99b0ee6448c0e5d013455c72af961d0b"; }; checkInputs = [ pytest mock ]; From 6053ff05f40c92c23100109888a01ca7cb127c03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 311/684] python: google-cloud-pubsub: 1.0.2 -> 1.1.0 --- .../python-modules/google_cloud_pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 8860578b2072..997234508664 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "afb08eb558f3e4d836e6f77443f81555d6921ffc888c7c3085acd1205fba6e8c"; + sha256 = "bdead87e40eba93043c6704578e946cf2794366312f936da0a2b3754234dde29"; }; checkInputs = [ pytest mock ]; From 9011ef4cdbf1b90c67424de20dd7745030798046 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 312/684] python: google-cloud-spanner: 1.11.0 -> 1.13.0 --- .../python-modules/google_cloud_spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index 0fad7cbdbfae..80e88d53f1fc 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.11.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "58b0c324296986d2f308d1b9917341d5c1e8e72253349e3ba5163b99bf7fc840"; + sha256 = "eafa09cc344339a23702ee74eac5713974fefafdfd56afb589bd25548c79c80d"; }; checkInputs = [ pytest mock ]; From ec1ac45f604e03a7c2a5db9fd8f728382c23aeb5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 313/684] python: google-cloud-speech: 1.2.0 -> 1.3.1 --- .../python-modules/google_cloud_speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index b14c48cbf08f..c00ea6539009 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "f8a1f67b01b5b8bd22fa3ba95a4b99ae4a55b6299665d5ae1afa3db7f6706c32"; + sha256 = "21b597b18ee2b9b9a5e2e05a7a1d47173f8f3adeada36b5bdf6cb816114430bf"; }; propagatedBuildInputs = [ google_api_core ]; From 3c82e244b77233931a7b6ae54defbeef6cdcd4cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 314/684] python: google-cloud-storage: 1.20.0 -> 1.23.0 --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 1d68197364b9..ff750602465b 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.20.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "2e7e2435978bda1c209b70a9a00b8cbc53c3b00d6f09eb2c991ebba857babf24"; + sha256 = "c66e876ae9547884fa42566a2ebfec51d280f488d7a058af9611ba90c78bed78"; }; propagatedBuildInputs = [ From 5695f58574029dc7d1e0a993f8c56319489ee2d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 315/684] python: google-cloud-tasks: 1.2.1 -> 1.3.0 --- .../development/python-modules/google_cloud_tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index 9a139399ccd3..95bcb0d4d577 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "93f57f5ee273b4efcb3d7cc9d1c0b9a63dc9fd61d1fb47b861182364cfd51f94"; + sha256 = "221388d1dd4bf21ba46ead499bbb3dfba9151b852c4fdca70935ba36e5c3631a"; }; checkInputs = [ pytest mock ]; From e1068060c3902bfa045be0eae9d2587e3be90095 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 316/684] python: google-cloud-videointelligence: 1.11.0 -> 1.12.1 --- .../python-modules/google_cloud_videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index a60109694096..57e106fcfbed 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "ef5c53772500bb30b546889ba8823a8d21217153544800f31a9bfd6f514643cb"; + sha256 = "66d0a63d27e83656b1b4e0205d32725e4c58db174118badba164bb7d05a66981"; }; checkInputs = [ pytest mock ]; From 1f73977d8cbd055de4b376526160d2efd65f939f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 317/684] python: google-cloud-vision: 0.39.0 -> 0.41.0 --- .../python-modules/google_cloud_vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 10c8792b9c86..39dfc123650e 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.39.0"; + version = "0.41.0"; src = fetchPypi { inherit pname version; - sha256 = "f33aea6721d453901ded268dee61a01ab77d4cd215a76edc3cc61b6028299d3e"; + sha256 = "fd7adcfd8f1bddc19797b25ba3287a4f0cf42e208f330fffb7f1cd125e4d6cd3"; }; checkInputs = [ mock ]; From 3317a78ec929e5f4b910e6ce4761dfe6e8726256 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:12 +0100 Subject: [PATCH 318/684] python: google-resumable-media: 0.4.1 -> 0.5.0 --- .../python-modules/google_resumable_media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index a7fc28623fc5..8486eba68c13 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cdeb8fbb3551a665db921023603af2f0d6ac59ad8b48259cb510b8799505775f"; + sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a"; }; checkInputs = [ pytest mock ]; From 529b2eb58de07b46c421eba67ce00e96b963e974 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 319/684] python: gunicorn: 19.9.0 -> 20.0.4 --- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 16c6921cdd6b..c1fb010c6d35 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "19.9.0"; + version = "20.0.4"; src = fetchPypi { inherit pname version; - sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3"; + sha256 = "1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626"; }; propagatedBuildInputs = [ setuptools ]; From 8dd701bb074bc4f28de25864d0c200092b076482 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 320/684] python: hmmlearn: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/hmmlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 32c79b171366..e29c31e6fa7b 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; + sha256 = "8003d5dc55612de8016156abdc7aa1dd995abc2431adb1ef33dd84a6d29e56bf"; }; buildInputs = [ setuptools_scm cython ]; From b8d4b5c340a5124bb0a35a52811524ae2b0a3fa1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 321/684] python: httplib2: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 77350b09941b..c40f3453d6b9 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107"; + sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58"; }; # Needs setting up From f56512136f71b27bb6b6e9965333a292b8af12cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 322/684] python: imagecodecs-lite: 2019.4.20 -> 2019.12.3 --- pkgs/development/python-modules/imagecodecs-lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index 6374b882718b..c7a6f59091ba 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "imagecodecs-lite"; - version = "2019.4.20"; + version = "2019.12.3"; src = fetchPypi { inherit pname version; - sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0"; + sha256 = "95d18aa13ceb1b18a6109433b42d054e13b9a295cba96c08ab719f864f589d68"; }; checkInputs = [ pytest ]; From 350143d0aa5c125f9821e0caa688d3d6c56883c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 323/684] python: imbalanced-learn: 0.5.0 -> 0.6.1 --- pkgs/development/python-modules/imbalanced-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index d8e35d3fcea2..568fc825ab6b 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.5.0"; + version = "0.6.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "1m8r055mvkws0s449s1dyrkgricls6basnszwbwqwrw6g19n1xsx"; + sha256 = "94f846ff8d19ee9ea42ba6feddfbc85d5b42098bd3b62318f8d3bc5c7133b274"; }; propagatedBuildInputs = [ scikitlearn ]; From c6df97507e90dbcaef4450473c126594b02b077b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 324/684] python: inflect: 2.1.0 -> 3.0.2 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 147cc8753eb0..999ab17472ee 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "2.1.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73"; + sha256 = "ee7c9b7c3376d06828b205460afb3c447b5d25dd653171db249a238f3fc2c18a"; }; buildInputs = [ setuptools_scm ]; From 45ddc2d9d792ff9833b3395757a422f234802138 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 325/684] python: intake: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/intake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index f670d8f01e07..487ffc35b1a8 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7"; + sha256 = "81c3bdadbb81ec10c923b89e118c229d977a584ccbe27466f8fde41c0c274c3f"; }; checkInputs = [ pytest ]; From 2e109f7d20c9c42ffcaaf666009c8ae84f44ea7b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 326/684] python: ipython: 7.10.1 -> 7.10.2 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f67c5ea941a2..e18260d1aab2 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.10.1"; + version = "7.10.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "03h3m64k8jq0cc48i34g8xq0r68cx3w7wz721mfhr7k06qdv11pi"; + sha256 = "762d79a62b6aa96b04971e920543f558dfbeedc0468b899303c080c8068d4ac2"; }; prePatch = lib.optionalString stdenv.isDarwin '' From 6385b5191186c2292896d94afb16532b27794edd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:13 +0100 Subject: [PATCH 327/684] python: jaraco.classes: 2.0 -> 3.0.0 --- pkgs/development/python-modules/jaraco_classes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index dadbb8104659..7c0831918ece 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.classes"; - version = "2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1xfal9085bjh4fv57d6v9ibr5wf4llj73gp1ybdlqd2bralc9hnw"; + sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; }; doCheck = false; buildInputs = [ setuptools_scm ]; From 9ee7d961f1f900b62619d25c33a3ff558849e55c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 328/684] python: jaraco.stream: 2.0 -> 3.0.0 --- pkgs/development/python-modules/jaraco_stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 492d903f24dc..324eb625014a 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4"; + sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73"; }; doCheck = false; buildInputs = [ setuptools_scm ]; From 3582ee04bab7053e4e8dc4a865580a22dec940a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 329/684] python: jsonschema: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d94a7742f9e3..9ff267b6fce3 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f"; + sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; }; nativeBuildInputs = [ setuptools_scm ]; From f7255add181c1bbdc3d59d7f28b0ed89145a0014 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 330/684] python: jupyterlab: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 520f342cc1d2..32d3ad0bada3 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2188a9bcaaf0b6a68ff9098a481f37ece8231634b862fd3c9adedc466aac79f2"; + sha256 = "6adb88acd05b51512c37df477a18c36240823a591c2a51bf6556198414026d8f"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; From a823aa2b4861602fe6281a1c0a224f5d272ac70d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 331/684] python: jupytext: 1.2.4 -> 1.3.0 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 2bb7e22b0970..b5b010688542 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.2.4"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "490e1127033fceed5c49f7b1cde6aabffb059fe0a778a0e8b10d28d9eecef1f0"; + sha256 = "e0b23c566dd3cf3a3a3bdcd880383d7fab79a5bbf0da6e5396818ac23a1ecf8a"; }; propagatedBuildInputs = [ From 313cf68f3a04d3765e422a5aaa2ed63fe9b1bda8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 332/684] python: kconfiglib: 13.2.0 -> 13.6.0 --- pkgs/development/python-modules/kconfiglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index ace5b862825d..74e56880ee91 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "13.2.0"; + version = "13.6.0"; src = fetchPypi { inherit pname version; - sha256 = "045yjmn6xqbyb68l1jqlgi3c8cwlw1krsrlfwrrgjijkmbx6yqmd"; + sha256 = "5bd148042654788a30ead478208abd44d5df971013a226b0aabae3c4243561bd"; }; # doesnt work out of the box but might be possible From 35743b0d3fbb9fcc7dc782af816603ea32212cf2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 333/684] python: keyring: 19.2.0 -> 20.0.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 65f8697e1247..9e3ac1781caa 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "19.2.0"; + version = "20.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1cvlm48fggl12m19j9vcnrlplidr2sjf8h3pdyki58f9y357q0wi"; + sha256 = "fc9cadedae35b77141f670f84c10a657147d2e526348698c93dd77f039979729"; }; nativeBuildInputs = [ setuptools_scm ]; From 3b3a61bf2f190d2fa41a2fbb0b001f77d991cad5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 334/684] python: keyrings.alt: 3.1.1 -> 3.4.0 --- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 3fe986fc3351..d9841776ffe1 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyrings.alt"; - version = "3.1.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lgp2d3hrpvbb2rfz18vrv5lrck72k3l2f2cpkbks2kigrfbgiqb"; + sha256 = "91328ac4229e70b1d0061d21bf61d36b031a6b4828f2682e38c741812f6eb23d"; }; postPatch = '' From f035c4d8e969f7069d3578215ad8353bd3c56737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 335/684] python: labelbox: 2.1 -> 2.3 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 18578da764ef..c8279835c92f 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.1"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "f97f01bf030b115d8b7f7b12a10ec5efe54750ad66b6b3567550b517a543ad11"; + sha256 = "6b515dc29329e8a3adac9d6b4fef84d80c513743be57ae66b54bcb30060172c6"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; From 3cf0401849208fd60ee763e149eab98993015bec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 336/684] python: leveldb: 0.194 -> 0.201 --- pkgs/development/python-modules/leveldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 4d6336ce7573..212f13d00cf8 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "leveldb"; - version = "0.194"; + version = "0.201"; src = fetchPypi { inherit pname version; - sha256 = "0f6d1y65k6miimic82n8zsx50z9k982mvzp90crwcv1knjrphcww"; + sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf"; }; meta = with lib; { From a76dd01cfdd721beec0adad8989f5656abd19818 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 337/684] python: apache-libcloud: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 381c3a2731a5..0fd025e32d29 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.6.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fcc165f2cc2db9a379c6d3a17b3beb9081bb64ba5c0bf7bbb58da864810092f0"; + sha256 = "29ee7d13b9b12d1335e752a489c01eed0c270940147f418cfff89ab66faf1305"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; From ef69547af2ed3994346508dd2bd1f04c488fc73f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 338/684] python: limits: 1.3 -> 1.4.1 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 57f47ff5fd82..614945d13644 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76"; + sha256 = "c071295307c447f85aaa3c3ab3ce058e29d67010f4fabf278a8e163916e4deab"; }; propagatedBuildInputs = [ six ]; From 146c48afc393dd3168e56e71dcac1b20b992a95b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:14 +0100 Subject: [PATCH 339/684] python: limnoria: 2019.11.09 -> 2019.11.22 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 9bcc95ddc304..7cd3ef85822a 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2019.11.09"; + version = "2019.11.22"; src = fetchPypi { inherit pname version; - sha256 = "1ni25jmri0928jj2c24xw5f2fzljjla54zh80fimks1aa5752j29"; + sha256 = "6ccc6906fd644444a1edd0984d10bddf5abf4dd91c94eeeaa4660f7dc3eca320"; }; patchPhase = '' From 23278b2749d70d9d1749c87f77b71db059de58f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 340/684] python: lmdb: 0.97 -> 0.98 --- pkgs/development/python-modules/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 13adad603d10..5f31511451d5 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.97"; + version = "0.98"; src = fetchPypi { inherit pname version; - sha256 = "0jw3n14x6qg5wps2w4qkqf4pyan949h1s2nbkrz2qh7xwnnp2g8p"; + sha256 = "0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708"; }; checkInputs = [ pytest cffi ]; From f0115c531ad98281d5e8df8980f32672558d28d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 341/684] python: lmtpd: 6.0.0 -> 6.1.0 --- pkgs/development/python-modules/lmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index bc91139728b0..d05acd21c107 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lmtpd"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "192d1j9lj9i6f4llwg51817am4jj8pjvlqmkx03spmsay6f832bm"; + sha256 = "256e23a3292818ecccf9a76ef52e0064c6f7e1f8602904e15337c8917ed0fafe"; }; meta = with stdenv.lib; { From 8c6aaf330a93b06a796bc5cd2add99b594ef5916 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 342/684] python: loguru: 0.3.2 -> 0.4.0 --- pkgs/development/python-modules/loguru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 67134fdfd95a..ed2c8992b7d2 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.3.2"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3"; + sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; }; checkInputs = [ pytest colorama ]; From 602e08c5029e5df98304f285188cfd13f408823f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 343/684] python: marshmallow-sqlalchemy: 0.19.0 -> 0.21.0 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 76e641bae2c8..2f85c33e757e 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.19.0"; + version = "0.21.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "175ydlxmj8pbkrv3wcrsd9jg7smnxhln2y0i691yafhidxgy8fmm"; + sha256 = "93fd8fad2b33d92a1ae58328eeb0f39ed174858d82f9e7084a174df7b41fd3a4"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; From d0c20bcec4dde3ffd08e1425b33f5e27468245ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 344/684] python: marshmallow: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 5b07fe244413..57956009a9ad 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.2.2"; + version = "3.3.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1a358beb89c2b4d5555272065a9533591a3eb02f1b854f3c4002d88d8f2a1ddb"; + sha256 = "0ba81b6da4ae69eb229b74b3c741ff13fe04fb899824377b1aff5aaa1a9fd46e"; }; propagatedBuildInputs = [ dateutil simplejson ]; From 950214545988e4e74cee0ef9dce1a7fce76c3cec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 345/684] python: measurement: 2.0.1 -> 3.2.0 --- pkgs/development/python-modules/measurement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index b342086d6556..260d62621026 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "measurement"; - version = "2.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "36ca385ffdccf140a75a7e1d816a4df97a6dd255f16fd2f53dd7ab43632a8835"; + sha256 = "352b20f7f0e553236af7c5ed48d091a51cf26061c1a063f46b31706ff7c0d57a"; }; propagatedBuildInputs = [ pbr six sympy ]; From 1aed632ff22d1855a8466cae7bf245b366e09fde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 346/684] python: mlrose: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/mlrose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 6222921db746..5fd39d9b347a 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mlrose"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0vsvqrf1wbbj8i198rqd87hf8rlq7fmv8mmibv8f9rhj0w8729p5"; + sha256 = "cec83253bf6da67a7fb32b2c9ae13e9dbc6cfbcaae2aa3107993e69e9788f15e"; }; propagatedBuildInputs = [ scikitlearn ]; From 3330dc4e85cfe06115c22f7be0179ac0c20c2217 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 347/684] python: mockito: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index bfef79b0f722..43a512b85fd2 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.2.0"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "142f5e8865a422ad2d67b9c67a382e3296e8f1633dbccd0e322180fba7d5303d"; + sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb"; }; # Failing tests due 2to3 From eb84b2494801304e269976d9cd9de57320583b01 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 348/684] python: more-itertools: 7.2.0 -> 8.0.2 --- pkgs/development/python-modules/more-itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index ad41043496a2..37152b3a502a 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "7.2.0"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"; + sha256 = "b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d"; }; checkInputs = [ nose ]; From 8a2f2bfd818cd9e5df65dfeb4150e3a73028e03a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 349/684] python: mt-940: 4.18.0 -> 4.19.0 --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index e7f382f8ac7c..f31bb4c064e7 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.18.0"; + version = "4.19.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "e5b6469e9bc64522125efae1de0e557f76884c961f122028098533d6f2a98f23"; + sha256 = "5d109e8dc4b490a4b92ec0153713710eb067b36b350ce1ff60c406afddc7d3cd"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; From 3440f1354111b4a754ab940d31a8069036bb6119 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 350/684] python: multidict: 4.5.2 -> 4.7.1 --- pkgs/development/python-modules/multidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 1539592dc6be..1cb24edac213 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.5.2"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "024b8129695a952ebd93373e45b5d341dbb87c17ce49637b34000093f243dd4f"; + sha256 = "d7b6da08538302c5245cd3103f333655ba7f274915f1f5121c4f4b5fbdb3febe"; }; checkInputs = [ pytest pytestrunner pytestcov ]; From ce12c52497af8d26a4f1958e2f7c16978010a9ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:15 +0100 Subject: [PATCH 351/684] python: munch: 2.3.2 -> 2.5.0 --- pkgs/development/python-modules/munch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index f4ecc2ff3061..77c291d80b18 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "munch"; - version = "2.3.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6ae3d26b837feacf732fb8aa5b842130da1daf221f5af9f9d4b2a0a6414b0d51"; + sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; }; propagatedBuildInputs = [ six ]; From 7f3ea939b4b940ff57eb2ba2a7e3121386c5aa21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 352/684] python: nameparser: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/nameparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index e8d2c209eb58..984304e9ccbf 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "1kc2phcz22r7vim3hmq0vrp2zqxl6v49hq40jmp4p81pdvgh5c6b"; + sha256 = "79b5f81b9315b03ac3744d12448032490f5028b5117b721775ba97118ecd5e45"; }; LC_ALL="en_US.UTF-8"; From 3bde837c589b862f3c190fbd0820deb6eb15062b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 353/684] python: natsort: 6.0.0 -> 6.2.0 --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index da8e953826ff..650d04c6487c 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "6.0.0"; + version = "6.2.0"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776"; + sha256 = "58c6fb2f355117e88a19808394ec1ed30a2ff881bdd2c81c436952caebd30668"; }; # testing based on project's tox.ini From 047f8a6bd627e9a12e279067f8b816503557055a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 354/684] python: nbsmoke: 0.2.8 -> 0.3.0 --- pkgs/development/python-modules/nbsmoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index ee4434c1d1d7..4af60ba9b9ed 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.2.8"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "eeda6c59b61130b9116a3d935e7c80ec5f617d7db8918d23289b2426efa229eb"; + sha256 = "070e999db3902a0c62a94d76de8fb98da21eaee22d9e90eb42f1636c87e1b805"; }; propagatedBuildInputs = [ From 7a58747ccfe255faba4bff9c11a1e17a858cfc44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 355/684] python: nbval: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/nbval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 812f68d5c4ea..ff9d6f134e0f 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "0613drjl740ppam3spm4b8mdcwwvl1lfmqy3vkgznbvzfxfpb3zj"; + sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6"; }; checkInputs = [ From 38e2daec8a52d30a988b10e61f97c7acbc49a8bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 356/684] python: Nevow: 0.14.4 -> 0.14.5 --- pkgs/development/python-modules/nevow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 74b8f7e29da1..26d915c7e562 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "Nevow"; - version = "0.14.4"; + version = "0.14.5"; disabled = isPy3k; src = fetchPypi { inherit version pname; - sha256 = "2299a0d2a0c1312040705599d5d571acfea74df82b968c0b9264f6f45266cf6e"; + sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; }; patches = [ From 3e1937a5312de17a3701933ce42e1c7928fdb9e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 357/684] python: nibabel: 2.5.1 -> 3.0.0 --- pkgs/development/python-modules/nibabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index f118e4d5a430..895b2e9a1a31 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.5.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "83ecac4773ece02c49c364d99b465644c17cc66f1719560117e74991d9eb566b"; + sha256 = "0f5bc325c9cb203c6f0ab876ba1a5ada811284bb3a4c5d063eeaafaefbad873d"; }; propagatedBuildInputs = [ From 5188b4c437611738051af770b50f8820eb77a30e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 358/684] python: nilearn: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 2da580abd926..9158ee77e508 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "18b763d641e6903bdf8512e0ec5cdc14133fb4679e9a15648415e9be62c81b56"; + sha256 = "07eb764f2b7b39b487f806a067e394d8ebffff21f57cd1ecdb5c4030b7210210"; }; # disable some failing tests From 7759b54df3a76920fc2666f32d5f9799ed33be80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 359/684] python: nipype: 1.2.3 -> 1.3.1 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index ee3c16f01b66..ab81b2b190b5 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -48,11 +48,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.2.3"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "a79c7a72897d81985d20a8c805465285400b59a45ddc527cda44026795fd1c47"; + sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; }; postPatch = '' From 4d91763fa02d2e0ceb791a62d234dfa0f181c299 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 360/684] python: oauthenticator: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 81c6daaf2de7..d8a976929768 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0ce31c929bb456ad8734b9b8a7f539e44ab3afff07169e25e974ca576f4c836c"; + sha256 = "cb4e23fcfe8dc9099c4ca005f8991b0f605b03a3e1cf4fed654b2470f6065bdf"; }; checkPhase = '' From f346273464f005565447441c845ddd4a7a7e2586 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 361/684] python: optuna: 0.17.1 -> 0.19.0 --- pkgs/development/python-modules/optuna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index bc96c4a2d470..ee00985aaff1 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "optuna"; - version = "0.17.1"; + version = "0.19.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3d1d3547340c47f34f3a416a2e0761a0ff887ae8ce06474e84ebcc8600afd438"; + sha256 = "cbcdc826915dd07f7df723bec0dd3edd5e61e54c40e7a8b023e19d4434eef602"; }; checkInputs = [ From 5f62481d35fd46cc15d135161c7562742bcde069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 362/684] python: panel: 0.6.4 -> 0.7.0 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index aefab4046687..0047548779c3 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.6.4"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "9b86a827f24dcfd1b6d821836e691fca7aab21b79a293031297f83cf2f8d6cef"; + sha256 = "71d446f469b424cb190bc896e78d0415b2bbebf17c6e5b024ed1a73b4448f8f4"; }; propagatedBuildInputs = [ From 7f871fd0eb30d304b049c46dc61c867171914a9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:16 +0100 Subject: [PATCH 363/684] python: paramiko: 2.6.0 -> 2.7.1 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 7ea4a5ee5339..a9a577b5a2e0 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.6.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0h9hb2kp07zdfbanad527ll90n9ji7isf7m39jyp0sr21pxfvcpl"; + sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; }; checkInputs = [ pytest mock pytest-relaxed ]; From c03d25b7555542a1aec634c15a6c25563fe66f24 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 364/684] python: parsedatetime: 2.4 -> 2.5 --- pkgs/development/python-modules/parsedatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 32247fcc3882..914d5e2680fd 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "parsedatetime"; - version = "2.4"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "3d817c58fb9570d1eec1dd46fa9448cd644eeed4fb612684b02dfda3a79cb84b"; + sha256 = "d2e9ddb1e463de871d32088a3f3cea3dc8282b1b2800e081bd0ef86900451667"; }; buildInputs = [ pytest pytestrunner ]; From 62dbdc10c459b276c5e63fa86ef9d84c0ec8196b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 365/684] python: parso: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/parso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index da42b279c75d..24fc57894056 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6"; + sha256 = "55cf25df1a35fd88b878715874d2c4dc1ad3f0eebd1e0266a67e1f55efccfbe1"; }; checkInputs = [ pytest ]; From e09590b468ef8c7605e7b99fdb94083cfaf230da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 366/684] python: partd: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/partd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index b400e8030f97..4d625f782001 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "partd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "54fd91bc3b9c38159c790cd16950dbca6b019a2ead4c51dee4f9efc884f8ce0e"; + sha256 = "6e258bf0810701407ad1410d63d1a15cfd7b773fd9efe555dac6bb82cc8832b0"; }; checkInputs = [ pytest ]; From 36930724fd1cfc5dd5eec1b4c28e858dfdee73f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 367/684] python: pep8-naming: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/pep8-naming/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 20da40560e20..5c66eb6cad0e 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.8.2"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1aff4g3i2z08cx7z17nbxbf32ddrnvqlk16h6d8h9s9w5ymivjq1"; + sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; }; propagatedBuildInputs = [ From 45010eb7bd808025a52245eb08cd5cbeb9d24a4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 368/684] python: pex: 1.6.12 -> 2.0.3 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index fec9de45f681..10001d1d6027 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.12"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "13q83yba01hzm9mlk5y1klqirxdmsm2yx1yll5zdik9fd8hg0rf6"; + sha256 = "a8a35e7eb212616b2964d70d8a134d41d16649c943ab206b90c749c005e60999"; }; nativeBuildInputs = [ setuptools ]; From 41182b52153278a91483857c1639e3f2cb220bd3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 369/684] python: pglast: 1.6 -> 1.8 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index eef727937767..bc54c18ac81a 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.6"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "dcbd8061c553b90440741b77fbb274beca84716641a50be8675a6afe6dfbcea2"; + sha256 = "115067100fbb9eb36f530d94b64b4e1e36a8d304537af0847d562ff9ed399c05"; }; disabled = !isPy3k; From cef5cd5a9a0c0d65e4f950ecfb6e2cb423582898 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 370/684] python: phonenumbers: 8.11.0 -> 8.11.1 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index d9b3cb6b172a..461d70497bf0 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.0"; + version = "8.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1gc38v26hp638vnx4hmyv2gfyjs8k8lbvnlxfixgm60v4v7wykln"; + sha256 = "239507184ee5b1b83557005af1d5fcce70f83ae18f5dff45b94a67226db10d63"; }; meta = { From 7d13d949d71a372ee224bcbdd350539c41fa6bda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 371/684] python: phonopy: 2.3.2.post11 -> 2.4.1.post5 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e8f92bd8d78f..e38c24087343 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.3.2.post11"; + version = "2.4.1.post5"; src = fetchPypi { inherit pname version; - sha256 = "4b4ef1c11bafa161a409ad018cbf8469aacd42fc77fd954442760161f63dd345"; + sha256 = "8a393ed79a600fe6371677890198a2d05ad27c37935aa83977f5244dfe3eac96"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; From 9e63e9c6a675ddf4fd7125ade45425451d4a4a22 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 372/684] python: pipdate: 0.3.4 -> 0.3.5 --- pkgs/development/python-modules/pipdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 08ed0c43a22b..93f38fb37796 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pipdate"; - version = "0.3.4"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "26bd12075e63ef7f8094da36c27bf5539d298f4ef2af6acba20e98b502439d6d"; + sha256 = "240c0f270ddb7470ad7b8c8fba4106e3dbd8817a370624fd8c32cf19155c9547"; }; propagatedBuildInputs = [ From c521d8a1ef4b5d5209f39fb81e3ed33244f8fa85 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 373/684] python: plone.testing: 7.0.2 -> 7.0.3 --- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 37ca1a33d659..91592596ed43 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.2"; + version = "7.0.3"; src = fetchPypi { inherit pname version; - sha256 = "2533c48b7bd54ff19da2b4f0c3ccd0a8878c46f03fadbf5f933baaf749d17690"; + sha256 = "160f130f641578fbede2e47686f1b58179efa9ff98ccdd1ad198b5d0c7e02474"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; From 4336fce5de7f2521bc2deceb1d9192f737af87fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 374/684] python: plotly: 4.2.1 -> 4.4.1 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 9bf22b939d1b..a71506c61979 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.2.1"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "6650ddb4da3aa94dcaa32e0779e611c6b17f371b5250ffdbf5ece6d66ba4483b"; + sha256 = "acc94f17452471ca3446c2ce491c4d1affb99b9ddd9eac4e05614ac4318f8780"; }; propagatedBuildInputs = [ From 7126d0f013dab88e62d6fdd9f7d1febb2276e8f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:17 +0100 Subject: [PATCH 375/684] python: portend: 2.5 -> 2.6 --- pkgs/development/python-modules/portend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 9cc88983a303..c7210265b139 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "portend"; - version = "2.5"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9"; + sha256 = "600dd54175e17e9347e5f3d4217aa8bcf4bf4fa5ffbc4df034e5ec1ba7cdaff5"; }; patches = [ ./black-19.10b0.patch ]; From 81166fe162a554d0028612c81e58763590d47f8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 376/684] python: prance: 0.15.0 -> 0.17.0 --- pkgs/development/python-modules/prance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 38133172ecf7..972520793a40 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.15.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "793f96dc8bba73bf4342f57b3570f5e0a94c30e60f0c802a2aaa302759dd8610"; + sha256 = "a128d0d5f639a6a19eefedd787a6ce9603634c3908927b1215653e4a8375195f"; }; buildInputs = [ From 97c210d7c30b3662c0f62a14f0e8b5e1bebc9224 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 377/684] python: psd-tools: 1.8.32 -> 1.8.34 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 38285b68563d..b4d4783ced78 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.8.32"; + version = "1.8.34"; meta = { description = "Python package for reading Adobe Photoshop PSD files"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fff16658c9ca6bc586adbe0ab060a7d0b7d057eb2a600c3b2001c0558873fb94"; + sha256 = "db471c867399f7a9cc31f9e83b1e6734411c44b26dcecaaefe04c1141f606707"; }; propagatedBuildInputs = [ docopt pillow ]; From b2082f0a3fab4c417c80597e5edc051875eeabde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 378/684] python: PuLP: 1.6.8 -> 2.0 --- pkgs/development/python-modules/pulp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 09fddad01586..414c21b263c0 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "1.6.8"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g"; + sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765"; }; propagatedBuildInputs = [ pyparsing ]; From b9317591ef0c33abfce85c443320ce0f63c771cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 379/684] python: pvlib: 0.6.3 -> 0.7.0 --- pkgs/development/python-modules/pvlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index cdd6011aba2e..7e561089a183 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.6.3"; + version = "0.7.0"; # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. disabled = pythonOlder "3.5"; src = fetchPypi{ inherit pname version; - sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69"; + sha256 = "ee935ba52f1d4a514cc3baa743db0377af732952faf800f20ffd8071fa2107c2"; }; checkInputs = [ pytest mock pytest-mock ]; From 1ed8168f00a9d180251be7a786cb836b67195fc1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 380/684] python: py3status: 3.21 -> 3.22 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 79b80fb11f0c..d2a2b50d3c05 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.21"; + version = "3.22"; src = fetchPypi { inherit pname version; - sha256 = "c208c680d1511e8c1dc950a930d3ee1b83f2dbfaac1308cd43c4773810fee89b"; + sha256 = "5e9884dde128e1bd82f8746e8f8806c8d7d89d95ce9ed7bacf7cc5fdb094aa21"; }; doCheck = false; From 3a59f9c4d767f5eba036699b980dca5472bb2480 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 381/684] python: pyaml: 19.4.1 -> 19.12.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 8601488bcf4c..6aeb37cfff6b 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "19.4.1"; + version = "19.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c79ae98ececda136a034115ca178ee8bf3aa7df236c488c2f55d12f177b88f1e"; + sha256 = "b3f636b467864319d7ded1558f86bb305b8612a274f5d443a62dc5eceb1b7176"; }; propagatedBuildInputs = [ pyyaml ]; From 2c9d5ae169cec6880080fdb50c90500effc2a4b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 382/684] python: pyatmo: 2.3.3 -> 3.1.0 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 795f623ba53f..5036307982bd 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "2.3.3"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b884402c62d589a38444e8f4b3892b18312e8f9442cd8d12e7ec01c698328f54"; + sha256 = "8fbcc3a88f8c51d190b697c80515e67530143de71f89cc6ecf99bbf2cbf3ef30"; }; propagatedBuildInputs = [ requests ]; From a0bf2352a63941860eccaab46856ac292e93bd0c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 383/684] python: pybids: 0.9.5 -> 0.10.0 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 84f5a41c45b6..dc9cbefe0b57 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.10.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "0e8f8466067ff3023f53661c390c02702fcd5fe712bdd5bf167ffb0c2b920430"; + sha256 = "b37ba89eb7407bbfdf8e26e1230b6ef452da3d986df5eed21aab96be61b6e844"; }; propagatedBuildInputs = [ From 76accbec9942f1267e102f361205c6865b9658af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 384/684] python: pybullet: 2.5.8 -> 2.6.0 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index b17e8a5aa94a..d0fc6709c2e3 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.5.8"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "5824e902e0dd8bf7177ce5d9e038c6b04be65f72621fe13f93ec15c9d9c85a49"; + sha256 = "5a75a4fc828f59a538e6b6381cfb37019193829beca4da2acf8cd0a749cf63b8"; }; buildInputs = [ From 6a6a2a5187f6c41a134d57ea7c3d2a535d0c698e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 385/684] python: pycares: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/pycares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index f68a10d6186e..22f519c04865 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd"; + sha256 = "663c000625725d3a63466a674df4ee7f62bf8ca1ae8a0b87a6411eb811e0e794"; }; buildInputs = [ c-ares ]; From 14574963e0307868cfaf0c5dc0f6a1df5378df97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:18 +0100 Subject: [PATCH 386/684] python: pydantic: 1.0 -> 1.2 --- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 3e8e5086eadd..23b6dd3432eb 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.0"; + version = "1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bf474cebe007701806f5f8b076fb8508116606e5c721734bb855bfec4185263c"; + sha256 = "da10b034750addbd95a328654d20364c479f4e2e26e0f72933204d61cbc8fa78"; }; propagatedBuildInputs = [ From 88903062b042461a1d52ffa85455660408034000 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 387/684] python: pyelftools: 0.25 -> 0.26 --- pkgs/development/python-modules/pyelftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 1715749fa2da..c619df297fef 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.25"; + version = "0.26"; src = fetchPypi { inherit pname version; - sha256 = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24"; + sha256 = "86ac6cee19f6c945e8dedf78c6ee74f1112bd14da5a658d8c9d4103aed5756a2"; }; checkPhase = '' From 69d72bd7d1b46583ff3b7e84d6f4696d541ad980 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 388/684] python: pyfakefs: 3.6.1 -> 3.7 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index b2dbfdba8198..97a0c3f50f84 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "3.6.1"; + version = "3.7"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "2654c665500ea8117b55cab51d4683a83ec1c76ddfae13640e509e4aac64b308"; + sha256 = "74cb0c53959f185f6b0fe6c9f6882359b2390df861d4857a9f1a95481b466ace"; }; postPatch = '' From 139c8ccaf4c01c0e221db54b4238c045f59495bd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 389/684] python: pykeepass: 3.0.3 -> 3.1.2 --- pkgs/development/python-modules/pykeepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index bb1f60025db7..1467783d76a2 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.0.3"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f"; + sha256 = "280b0884243d059df888a61fd3fc77b2ea76dce4fdb1c1f60f3ab9139ca1259c"; }; propagatedBuildInputs = [ From a48ebb64d64531848f13b3de6009f3e67552cafc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 390/684] python: pymatgen: 2019.10.16 -> 2019.12.3 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index b60aea364c66..0d0f1d36f4f9 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.10.16"; + version = "2019.12.3"; src = fetchPypi { inherit pname version; - sha256 = "a8e8b169001737cdf16bb89b26c391963ba2bead54ea510530a52586e2072234"; + sha256 = "cb2d10d2dad9f4949a34f8b96a9ff06aaa6df45f9faa75307068a35992ac67a9"; }; nativeBuildInputs = [ glibcLocales ]; From cd9754425fb8874a894b52e448088b1804c578dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 391/684] python: pymc3: 3.7 -> 3.8 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 35e5f7aa69a2..39472bb31776 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.7"; + version = "3.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ijna2ghvniryllr56qr4vi4k9q58mq21yx36nj5kg2j17f7rkbr"; + sha256 = "1bb2915e4a29877c681ead13932b0b7d276f7f496e9c3f09ba96b977c99caf00"; }; # No need for coverage stats in Nix builds From 123cb201cadfd8e7775d793e68c9eab45afe4b96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 392/684] python: pymongo: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 8748b0e559d5..a10bb9169edf 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4249c6ba45587b959292a727532826c5032d59171f923f7f823788f413c2a5a3"; + sha256 = "c43879fe427ea6aa6e84dae9fbdc5aa14428a4cfe613fe0fee2cc004bf3f307c"; }; # Tests call a running mongodb instance From 4b717af67d19b9c05fabfed127e3021284e7fd25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 393/684] python: pymssql: 2.1.4 -> 3.0.3 --- pkgs/development/python-modules/pymssql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index c162f065b799..954be3f40e2d 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymssql"; - version = "2.1.4"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1yvs3azd8dkf40lybr9wvswvf4hbxn5ys9ypansmbbb328dyn09j"; + sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; }; buildInputs = [cython setuptools-git]; From 8479a41f76ad897363855fd71dcf7dba3a57e2af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 394/684] python: pyobjc: 6.0.1 -> 6.1 --- pkgs/development/python-modules/pyobjc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index e71ab630b84c..8576de1b379c 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "6.0.1"; + version = "6.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f19dcd668473d61e500440569936b2272333ec385a603730c39f68a8d42b474b"; + sha256 = "53ae86caaedc48350c6e93d6e778a0c5044e802340b6d6a679e55014758be540"; }; meta = { From 1c0cbdc9e978e81e91ef1f301eeb4caad817d9c4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 395/684] python: pyOpenSSL: 19.0.0 -> 19.1.0 --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 018463ead546..4e643257a0c6 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -64,11 +64,11 @@ in buildPythonPackage rec { pname = "pyOpenSSL"; - version = "19.0.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; + sha256 = "9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507"; }; outputs = [ "out" "dev" ]; From f99e01aaa960ea27b5c4c06ffb772ffbec7cb294 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 396/684] python: pyperf: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 51a08e1f7ea8..4b14e2e5cc67 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371"; + sha256 = "0d214aa65e085d3e4108a36152cb12f7cd0f4e7fda93b5134b43a9687c975786"; }; checkInputs = [ nose psutil ] ++ From 05bb0fd5a29ef2a0a8eff31175c8e52e797d40a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:19 +0100 Subject: [PATCH 397/684] python: pyro-ppl: 0.5.1 -> 1.1.0 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index daed808deb11..a0545ece74a2 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.5.1"; + version = "1.1.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "cac2cb2a283c65d4187b7e19f0ff3b10a0ded1f377caba4f279c7898b206cd42"; + sha256 = "5ca2fd19276fcfcf52babb48d22892a41d6238d7a6c65e63f704b070a3816479"; }; propagatedBuildInputs = [ From 77a297347150147ecbf52b58790c1da2f93f961a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 398/684] python: pyscreenshot: 0.5.1 -> 0.6 --- pkgs/development/python-modules/pyscreenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 9e9d15e52956..2865380076ae 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "0.5.1"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c"; + sha256 = "7322ad9454652b1702a3689646ce53ef01ed2b14869ea557030bd4e03a06fc0e"; }; propagatedBuildInputs = [ From c3a57ecb9df742e1383f9d59a1357898ed447680 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 399/684] python: pytest-django: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 4480cc1afcfd..6b60eb6d3c58 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "b6c900461a6a7c450dcf11736cabc289a90f5d6f28ef74c46e32e86ffd16a4bd"; + sha256 = "17592f06d51c2ef4b7a0fb24aa32c8b6998506a03c8439606cb96db160106659"; }; nativeBuildInputs = [ pytest setuptools_scm ]; From 7883db15aefabdead1c673953b9602b826a7529b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 400/684] python: pytest-doctestplus: 0.4.0 -> 0.5.0 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index aa155e6b6ffa..cdf60b7b07c6 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8872b9c236924af20c39c2813d7f1bde50a1edca7c4aba5a8bfbae3a32360e87"; + sha256 = "41386187b9261cd59a3ffe4cf9df58d517288a1d3f11d96749b39b4e38b0a02c"; }; propagatedBuildInputs = [ From 2277d43260f7822e3577f4f6fe68a567d5038a0a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 401/684] python: pytest-mock: 1.11.2 -> 1.13.0 --- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c6c8b6f4f5c1..c4ef0d811117 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.11.2"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "04fgqm06vkg3k1ngha65g1k5a80x1g7pr11s78j2d72rj4w2ql7a"; + sha256 = "e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; From 9999563ef3ec0da2c0f941e17c037bf558377c73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 402/684] python: pytest-mpl: 0.10 -> 0.11 --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index edf0450366c5..aa73d3ccaedc 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.10"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0"; + sha256 = "26c5a47a8fdbc04652f18b65c587da642c6cc0354680ee44b16c161d9800a2ce"; }; buildInputs = [ pytest ]; From 9620c51978813c4eebf384a4a8ff1f718d70d26a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 403/684] python: pytest-qt: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/pytest-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index 4ce0241f415b..201da93b0187 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "3.2.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa"; + sha256 = "714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"; }; nativeBuildInputs = [ From 0ab1e536a2cba6b69ddd5db4e6f33a1461a3bfda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 404/684] python: pytest-services: 1.3.1 -> 2.0.1 --- pkgs/development/python-modules/pytest-services/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 2a4c5591a5f5..507cb4467bc1 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-services"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c"; + sha256 = "0848cead86d3816b9c4e37cecfda31d21a4366f0dca2313ea29f3ca375c6295d"; }; propagatedBuildInputs = [ From 1220bbd737058ce81e2bd205c2f7af689e47cd8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 405/684] python: pytest-testmon: 0.9.19 -> 1.0.1 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index ed1b754a9968..3f8fb783408a 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "0.9.19"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "f622fd9d0f5a0df253f0e6773713c3df61306b64abdfb202d39a85dcba1d1f59"; + sha256 = "b823b03faf5778d1e15fb9f52e104df4da9c1021daeb313b339fccbbfb8dbd5f"; }; buildInputs = [ pytest ]; From f286d1dacacdb120ffd380f022f26b15cfacd106 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 406/684] python: pytest: 5.2.4 -> 5.3.2 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index a0e26b442018..48b6e89a10ea 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { - version = "5.2.4"; + version = "5.3.2"; pname = "pytest"; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ff0090819f669aaa0284d0f4aad1a6d9d67a6efdc6dd4eb4ac56b704f890a0d6"; + sha256 = "6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa"; }; checkInputs = [ hypothesis mock ]; From 4dde0368714acf4e7b3a5182a2f4c2d3d69a9b55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 407/684] python: pytest-runner: 5.1 -> 5.2 --- pkgs/development/python-modules/pytestrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index ebe1c588faa9..fa937e9626c3 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "25a013c8d84f0ca60bb01bd11913a3bcab420f601f0f236de4423074af656e7a"; + sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; }; nativeBuildInputs = [ setuptools_scm pytest ]; From 2d328eed5add50a60b6c4ec25d040c6aaf712c07 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:20 +0100 Subject: [PATCH 408/684] python: python-gitlab: 1.13.0 -> 1.15.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4858ef8f8a6f..bbdf7aa6033c 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "125zimbdprfx2j90dp19hyh60lzj11264bm494awc585pr6v9d3k"; + sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; }; propagatedBuildInputs = [ requests six ]; From ea3f2db0afb7436e2ca142c1fc4e5bf26cd5ab80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 409/684] python: python-rapidjson: 0.8.0 -> 0.9.1 --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 213a1386a9b8..9c2b18ba0069 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.9.1"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "13fgy5bqslx913p9gachj9djk3g6wx1igwaccfnxjl2msrbwclwp"; + sha256 = "ad80bd7e4bb15d9705227630037a433e2e2a7982b54b51de2ebabdd1611394a1"; }; LC_ALL="en_US.utf-8"; From 2771f27e093a37f9482d2d7f3b45bcfbe0720de8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 410/684] python: python-redis-lock: 3.3.1 -> 3.4.0 --- pkgs/development/python-modules/python-redis-lock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 65c5e08d934c..8aad5a1a7d2f 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6"; + sha256 = "8e3ef458b9424daf35d587e69b63416a0c55ac46303f3aaff1bab4fe5a8f1e92"; }; checkInputs = [ pytest process-tests pkgs.redis ]; From 04d21172e4c36d93fd4e65d12754707504c04790 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 411/684] python: python-socketio: 4.3.1 -> 4.4.0 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a666a6428e77..8f85f991534d 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "4.3.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57"; + sha256 = "48cba5b827ac665dbf923a4f5ec590812aed5299a831fc43576a9af346272534"; }; propagatedBuildInputs = [ From 962df45844ad13090de2d72acec20064b8bcf881 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 412/684] python: python2-pythondialog: 3.4.0 -> 3.5.1 --- .../python-modules/python2-pythondialog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix index 144887c75b31..a19156d1018b 100644 --- a/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "python2-pythondialog"; - version = "3.4.0"; + version = "3.5.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a96d9cea9a371b5002b5575d1ec351233112519268d382ba6f3582323b3d1335"; + sha256 = "ad159c7b455d9cb2a5173590656d19a26e9cc208264cfab755f5827070d18613"; }; patchPhase = '' From f41e2ca96f584858b3b1c065f5d2b4ad5d5fc74e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 413/684] python: pythondialog: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/pythondialog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index d19fbd271164..4f54c5a8fad8 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pythondialog"; - version = "3.5.0"; + version = "3.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11ydvllwll23qmcd3saachcxzn1dj5if3kc36p37ncf06xc5c0m4"; + sha256 = "34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8"; }; patchPhase = '' From d641f7a2eb9d3bcf5daba474cf1c9eceec0a7704 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 414/684] python: pyunifi: 2.18 -> 2.19.0 --- pkgs/development/python-modules/pyunifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index f2395605d3aa..c87d9d465bc6 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.18"; + version = "2.19.0"; src = fetchPypi { inherit pname version; - sha256 = "0875b830db93ed3270aee38ea24d3da9328672f0c499f0e432c895e0b02eadc9"; + sha256 = "f022eb2135b88a9d391f4553fac1bf90f3808d660fd0058203f6f9e57214626b"; }; propagatedBuildInputs = [ requests ]; From a3d23680833ca47ac19c8498cc2c7714f6b8a0c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 415/684] python: pywbem: 0.14.6 -> 0.15.0 --- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d87d772db146..c5ffb79a5d68 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.14.6"; + version = "0.15.0"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "5ed6ac486a0a363848f2091a49ddc1c4e0871c6feb71766cc0e266e9c6fd084f"; + sha256 = "6f4304518b2ba89a97bd4f5f0decc8ad382b38a9303032ae17a1a601d95d24b8"; }; propagatedBuildInputs = [ From 7b0f103b1fedfdf4c86c97938def4429af43c710 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 416/684] python: pywinrm: 0.3.0 -> 0.4.1 --- pkgs/development/python-modules/pywinrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 3bdc5efaaa53..9ed44c83b602 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573"; + sha256 = "4ede5c6c85b53780ad0dbf9abef2fa2ea58f44c82256a84a63eae5f1205cea81"; }; checkInputs = [ mock pytest ]; From 6db132ccb202b8de991ce69ecb21c3376717bfcc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 417/684] python: pyxattr: 0.6.1 -> 0.7.1 --- pkgs/development/python-modules/pyxattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 7a137f5204ce..cba29c5cc9ed 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.6.1"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + sha256 = "965388dd629334e850aa989a67d2360ec8257cfe8f67d07c29f980d3152f2882"; }; # IOError: [Errno 95] Operation not supported (expected) From 1f629a9769d6562c126ab80446e1ebc9af56aaec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 418/684] python: pyxl3: 1.2 -> 1.3 --- pkgs/development/python-modules/pyxl3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 2f73a85db7b7..c30dd0f024fb 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyxl3"; - version = "1.2"; + version = "1.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f1fc74d2ab59073ef6bf0ce01b4f2891366bbf89a8187de85433486b284df758"; + sha256 = "23831c6d60b2ce3fbb39966f6fb21a5e053d6ce0bd08b00bb50fa388631b69ee"; }; checkInputs = [ unittest2 ]; From da5a7381609f82df8bf0fb477dc4a12f7028ba73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:21 +0100 Subject: [PATCH 419/684] python: PyYAML: 5.1.2 -> 5.2 --- pkgs/development/python-modules/pyyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index a5cf530a3003..316e9974cfe2 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.1.2"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4"; + sha256 = "c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"; }; # force regeneration using Cython From 6cb4d74fdb4cd2786e27160e04b6baea0ebac887 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 420/684] python: qiskit: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 4d84ac07a041..89d02f7b8034 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.13.0"; + version = "0.14.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e9c0f23dddb0af27e2bfb920f6ea8600516fa68ec9ae97639faf858ba5d28020"; + sha256 = "d086a21d0eee61bb12e1f2cd6148a7292005fd10584ca33d6c404dd5c53ba95f"; }; buildInputs = [ cmake ] From b38792892db6670d0057b13b9e8e21f9a68a3aa1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 421/684] python: qtconsole: 4.5.5 -> 4.6.0 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 95ee3a864e6c..885eee8d4b6b 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.5.5"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1nf64wl3ni0q69ihcm5y6zl12mmg7gvkhrb98hbgwv3yb09787mr"; + sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 7611bd4d62231338aabec103ce540e917d779d2e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 422/684] python: rainbowstream: 1.4.0 -> 1.5.2 --- pkgs/development/python-modules/rainbowstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index ca6e4614f33d..7fc7f057009a 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "rainbowstream"; - version = "1.4.0"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "16881d8bb15416389eeaf4ceee7a588069060c216b55e7602dbcff5134feb7cc"; + sha256 = "527d39778c55d88300fe2017913341bfa1b1f0ffdc1fe5eab57a82bf4cd2edb3"; }; patches = [ ./image.patch ]; From 63f1fbd34ec69a72207af49f5b55a7a12d28d9f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 423/684] python: regex: 2019.08.19 -> 2019.12.19 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index ec2b872c7f8c..765a42de14d2 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.08.19"; + version = "2019.12.19"; src = fetchPypi { inherit pname version; - sha256 = "587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849"; + sha256 = "8355eaa64724a0fdb010a1654b77cb3e375dc08b7f592cc4a1c05ac606aa481c"; }; postCheck = '' From 20ab906528d4483533ed48feaa9d34f6c7effd56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 424/684] python: responses: 0.10.7 -> 0.10.8 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 98cf19a8f0a0..e9fed28596be 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.7"; + version = "0.10.8"; src = fetchPypi { inherit pname version; - sha256 = "46d4e546a19fc6106bc7e804edd4551ef04690405e41e7e750ebc295d042623b"; + sha256 = "caa5f7afd14666f970ea54a4125a639f6491218b45a013c6dc2544f0473ae2b8"; }; propagatedBuildInputs = [ cookies mock requests six ]; From 9c308a0dee7150d6ce595ec6b43531d1c1a43dd8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 425/684] python: rlp: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/rlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index c8c4315b66bb..303a8bc6d7fd 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0742hdnhwcx1bm7pdk83290rxfcb0i2xskgl8yn6lg8fql1hms7b"; + sha256 = "27273fc2dbc3513c1e05ea6b8af28aac8745fb09c164e39e2ed2807bf7e1b342"; }; checkInputs = [ pytest hypothesis ]; From 3ca179ef901987de1cd090d33111744149799900 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 426/684] python: rpy2: 3.2.2 -> 3.2.4 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index bc4bc0bcb5b8..5a00b18557a6 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.2.2"; + version = "3.2.4"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "0b3jpn9x7m2pccriyzgfsdb68qp6nq4ffhvjy1q2ar8wdxvmf5xp"; + sha256 = "3daf1a4b28c4e354ef989093f03b066908bf6e5082a6f4af72cc3fd928a28dc6"; }; buildInputs = [ From 1f721073518795295261d334e5d2bca1ee1476bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 427/684] python: s3fs: 0.3.5 -> 0.4.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index f04274d6b506..5c0d34a3e903 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.3.5"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f1d8d80ae7789e6c95f8432e3ec12d1c28e624aecf8c84afed373fb182b505ab"; + sha256 = "504a41ecb9edf0bd7798847b61839954e50508c5235ec7ee48c539ce46b4fa18"; }; buildInputs = [ docutils ]; From 3492c777f28c14823ce412a953218d12377fd96f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 428/684] python: Scrapy: 1.7.4 -> 1.8.0 --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 14ab6e51582d..8fee4b6631ab 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.7.4"; + version = "1.8.0"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f0813d23a3f5659f403f469b11488ecd81e989e834205c4366cd231536496513"; + sha256 = "fe06576f9a4971de9dc0175c60fd92561e8275f2bad585c1cb5d65c5181b2db0"; }; postInstall = '' From 264c13bc0193b8ceb874509d5d0e1ee20284d6d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 429/684] python: shodan: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 8cad6885570e..a93ad8b6ebdd 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "163fbz06xg4ncvmgsg85x2689zd1bvycc3506xqvcgh8xcz3izif"; + sha256 = "eab999bca9d3b30e6fc549e609194ff2d6fac3caea252414e1d8d735efab8342"; }; propagatedBuildInputs = [ From 6519e3e92d90d5e37e114ccae48d1804796f8879 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 430/684] python: six: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 78e7a5f05389..8bfd32aa0934 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; + sha256 = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"; }; checkInputs = [ pytest ]; From f87becb9655ade4a1c6253aa5ff35a1f7ef3dca3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:22 +0100 Subject: [PATCH 431/684] python: slicedimage: 4.0.5 -> 4.1.1 --- pkgs/development/python-modules/slicedimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index edc21e3292df..3273e5fe3a33 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "slicedimage"; - version = "4.0.5"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "c8e8759a013a0936ec9f7ffcd37fc64df69af913b4f26342c2501b8c3663d9bb"; + sha256 = "7369f1d7fa09f6c9969625c4b76a8a63d2507a94c6fc257183da1c10261703e9"; }; propagatedBuildInputs = [ From c247ce887cb515e3fe46665e46a35aa4cabf5220 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 432/684] python: slither-analyzer: 0.3.0 -> 0.6.8 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 1619d9e112cd..f2aef6b1199e 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.3.0"; + version = "0.6.8"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10vrcqm371kqmf702xmqmzimv3xgrn3k3ip06nr1l6gnj3jk138g"; + sha256 = "8b3dda96f4938bbfc1d8a7775416dd480323603293c04212b59c5a35510d35c1"; }; nativeBuildInputs = [ makeWrapper ]; From 2d96754ac80bd6342bd743a4ba511d569b7bdd1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 433/684] python: sphinxcontrib-blockdiag: 1.5.5 -> 2.0.0 --- .../python-modules/sphinxcontrib-blockdiag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 1eeb40ddbc22..b8f23afabcd5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-blockdiag"; - version = "1.5.5"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1w7q2hhpzk159wd35hlbwkh80hnglqa475blcd9vjwpkv1kgkpvw"; + sha256 = "91fd35b64f1f25db59d80b8a5196ed4ffadf57a81f63ee207e34d53ec36d8f97"; }; buildInputs = [ mock sphinx-testing ]; From 8ecf415012866421465875a05f4a35d43b1cebae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 434/684] python: splinter: 0.11.0 -> 0.13.0 --- pkgs/development/python-modules/splinter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 274a5148d8a1..fac73dc8715a 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.11.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddv80dv54rraa18lg9v7m9z61wzfwv6ww9ld83mr32gy3a2238p"; + sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; }; propagatedBuildInputs = [ selenium ]; From b3369b8821e1b6daf1dccd6541ccc9aa032e04cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 435/684] python: spyder-kernels: 0.5.2 -> 1.8.1 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 86daec23d954..f4d57ce579e7 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.5.2"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; + sha256 = "a782fc5961a9dd48d520ddc1c868b960d54b8edb1116c21fc2e3c347fe5a4474"; }; propagatedBuildInputs = [ From 5c8cbf976231b06ac768c87d1dfe258164ead9ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 436/684] python: spyder: 3.3.6 -> 4.0.0 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index b707d4a0abc1..47094fcb9933 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "spyder"; - version = "3.3.6"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + sha256 = "f2bfece9743188e3d1da68f02271a7c6eb7f0a3b692c3df4952458ab96b037a8"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From bd1ccf2abe81cdd9d436207c69a624539d39f62c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 437/684] python: SQLObject: 3.7.3 -> 3.8.0 --- pkgs/development/python-modules/sqlobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 52b2fad62a21..05dab8d0265e 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.3"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0dgzmzdv3alfdqcrl4x0xf9161ls80h33rnqbz0yhmfpkjg99b9n"; + sha256 = "00fb93313067cdbe52fe436eef1e79038b42c969cf44016b24f9eae0511db2d7"; }; checkInputs = [ pytest ]; From d37f9a3575aed4eb3bef6b6037093768af562557 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 438/684] python: starfish: 0.1.9 -> 0.1.10 --- pkgs/development/python-modules/starfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 38934d9497ad..8fc0a23b065f 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "02002b908572fcd2c7471475936a6c375f143d15df871399ce86ced6d7aef865"; + sha256 = "0340e37b732e184081b150f21bbbd4eed3643ab49f74633b9c4d827bda663235"; }; propagatedBuildInputs = [ From 49dc13559942fc23592982bfe8f2740deaa17860 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 439/684] python: starlette: 0.12.13 -> 0.13.0 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6580a87b2fee..b0e99f796e77 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.12.13"; + version = "0.13.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9597bc28e3c4659107c1c4a45ec32dc45e947d78fe56230222be673b2c36454a"; + sha256 = "6bd414152d40d000ccbf6aa40ed89718b40868366a0f69fb83034f416303acef"; }; propagatedBuildInputs = [ From e64f7d5ebd3b07b76654479df15bca3442a10eb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 440/684] python: stripe: 2.37.2 -> 2.41.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index b60aa7666fb8..d564adbc6e25 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.37.2"; + version = "2.41.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7ad8ee6d9bdca86d6ed38c4eb48b1b67b9529ac4fee6c26d3f9aa4d5e98b50d6"; + sha256 = "2f0ec677136985ece9cca232f106c2a87193261cac1fe58d4e959215310a0da8"; }; propagatedBuildInputs = [ requests ]; From ec17623fb9f6e19d5cdd9273294d9712f40a2610 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 441/684] python: svg.path: 3.0 -> 4.0.2 --- pkgs/development/python-modules/svg-path/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 3a11bf67e13e..ac62b8b415d1 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; - version = "3.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "7b568f90f67fd25413c8da9f8bc9f9f8ab089425c20fa03330e97e77d13880ee"; + sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195"; }; meta = with stdenv.lib; { From 2b5606883254a1b69011710e0ebf80ff6a73a420 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 442/684] python: tblib: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/tblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 62e7faa121ff..55a164773cae 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1735ff8fd6217446384b5afabead3b142cf1a52d242cfe6cab4240029d6d131a"; + sha256 = "229bee3754cb5d98b4837dd5c4405e80cfab57cb9f93220410ad367f8b352344"; }; meta = with stdenv.lib; { From 3d89801d1317723ccca1268a49cee08d5c66e9a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:23 +0100 Subject: [PATCH 443/684] python: tenacity: 5.1.5 -> 6.0.0 --- pkgs/development/python-modules/tenacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 254b91891c71..fa039e7b1706 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.1.5"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e664bd94f088b17f46da33255ae33911ca6a0fe04b156d334b601a4ef66d3c5f"; + sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571"; }; nativeBuildInputs = [ pbr setuptools_scm ]; From 2ad8a567125030dc3ee797c5678b7c19a2759e1e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 444/684] python: thrift: 0.11.0 -> 0.13.0 --- pkgs/development/python-modules/thrift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index d5a83832cb27..7d80be987f70 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "thrift"; - version = "0.11.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b"; + sha256 = "9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89"; }; propagatedBuildInputs = [ six ]; From 99d664e2f841d505c3b45c34abf572a1a32150e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 445/684] python: tld: 0.9.8 -> 0.11.9 --- pkgs/development/python-modules/tld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 719ea78b7324..5e7380f7bb3b 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.9.8"; + version = "0.11.9"; src = fetchPypi { inherit pname version; - sha256 = "5963b22029e632a17bde87e35a19dc8c5b17266fb8c58e4d550d5593307e3a72"; + sha256 = "c5fe79df74b68ebc33406dfadc69f6484dee8005035a129fdb40b8fabfd06e9f"; }; propagatedBuildInputs = with python.pkgs; [ six ]; From f054f498400b285f0893727a2c039c802d771925 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 446/684] python: transaction: 2.4.0 -> 3.0.0 --- pkgs/development/python-modules/transaction/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 20f124854354..0ed6f84ff302 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "transaction"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "17wz1y524ca07vr03yddy8dv0gbscs06dbdywmllxv5rc725jq3j"; + sha256 = "3b0ad400cb7fa25f95d1516756c4c4557bb78890510f69393ad0bd15869eaa2d"; }; propagatedBuildInputs = [ zope_interface mock ]; From 47d5b8158973782a04c1e1c7f0bbfdaba6fc9827 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 447/684] python: trio: 0.12.1 -> 0.13.0 --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 458a580a170b..11f3c94aece3 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.12.1"; + version = "0.13.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0wnnrs36arvimrfgrlbpjw3nx7lppx43yvk2b380ivv69h52i6hl"; + sha256 = "f1cf00054ad974c86d9b7afa187a65d79fd5995340abe01e8e4784d86f4acb30"; }; checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; From 576e641d80c228570bf9a37695405301b09ab780 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 448/684] python: trustme: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 8784dad7ad16..42cbf23e56fa 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f0f96a21b430cc29661644d3569a1112a397ca9cc8595b964d4ae71e5e957529"; + sha256 = "9dfb18b568729d0219f758cddca1a91bab59f62ca41ee0e8acce5e657ec97b6c"; }; checkInputs = [ From 8f969f99da778dbacf55d0bae26f1e8c841aa203 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 449/684] python: twine: 2.0.0 -> 3.1.1 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 92288b6c774d..05febed4cb25 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "twine"; - version = "2.0.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9fe7091715c7576df166df8ef6654e61bada39571783f2fd415bdcba867c6993"; + sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"; }; propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; From c25c1bd662ed9526b60b24c66185b93df72f9a98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 450/684] python: Twisted: 19.7.0 -> 19.10.0 --- pkgs/development/python-modules/twisted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index a87cacdc29e2..5c4fea3f9b1b 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "19.7.0"; + version = "19.10.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d"; + sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; From 49235eba6d9a9425f608605d00ce53854b0d6b98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 451/684] python: typeguard: 2.5.1 -> 2.7.0 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index af9301571de4..952e5083594a 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.5.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "5269435c8c98f4c4861dd69f3de755aaab5e163991b7ce1e0eff7ae6472957dd"; + sha256 = "84f7f28bdf43efcf969e79ca2f8008fc176b0997137fc27f3625f103449cd25b"; }; buildInputs = [ setuptools_scm ]; From ca567bf690b40dacf2f17105f08125cff66e6496 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 452/684] python: uamqp: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/uamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index b4bbc84f372d..8e74c6460fe7 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "efb53d244bbe336557bad206f9e48159661934baeb0bfe0addfadc1f69796137"; + sha256 = "02d78242fcd0a58489aaf275964a6cf7581d7a2334ee240d2d547f8aca8607c6"; }; buildInputs = [ From 8162dd7848811c819a428d5b36479fe33ae428f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 453/684] python: uncompyle6: 3.5.1 -> 3.6.0 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index d4e8d1505d68..2fa777aab350 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.5.1"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "af6aea84ca42c889986f8baf86ccb9e3faae5ac1eaef470d2317dfe4131708b3"; + sha256 = "4d35a3f7224ab2ee08aa4db59a8ad808eb710ce3bf5dd3c6b0996373994d6447"; }; checkInputs = [ nose pytest hypothesis six ]; From eb98971bb04ac99e42cd2a59559486329aa6adef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 454/684] python: uproot-methods: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index b0caaf3d96a7..7bb8d4a16ea2 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.7.1"; + version = "0.7.2"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "d7bfcc84c28a0b61669232ad43b86bbb944504f6bf4612fd395f4e5cc45d0ba5"; + sha256 = "4382983e4e6c5e1aeb3013d04334907f87f62b0d7c19a29968e5a0aac1653ae1"; }; propagatedBuildInputs = [ numpy awkward ]; From c635c3efb71f09b09609cda2e9d7f1bf4e2e0918 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:24 +0100 Subject: [PATCH 455/684] python: uproot: 3.10.12 -> 3.11.0 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index f98b34112427..e822e56aae6c 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.12"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "34953903abe09bbab3ec1a9a4843b05c75b218daa6132c8275d871e88b6e3447"; + sha256 = "a9521786d0e16d00a457807e364229ba844ea5f8b0ac6653b00277351f12ab49"; }; nativeBuildInputs = [ pytestrunner ]; From fbf41d443bf87a3ded95ddf2e82e95833271a526 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 456/684] python: uritools: 2.2.0 -> 3.0.0 --- pkgs/development/python-modules/uritools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index cf3d36c3e5db..c99692fe1e2e 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uritools"; - version = "2.2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "80e8e23cafad54fd85811b5d9ba0fc595d933f5727c61c3937945eec09f99e2b"; + sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; }; propagatedBuildInputs = [ ipaddress ]; From 65f6f092c93a64d419b80fbe30d3b100c05f39bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 457/684] python: urwid: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/urwid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 885595ef6d4b..123ab73b752d 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1g6cpicybvbananpjikmjk8npmjk4xvak1wjzji62wc600wkwkb4"; + sha256 = "0896f36060beb6bf3801cb554303fef336a79661401797551ba106d23ab4cd86"; }; meta = with stdenv.lib; { From 58ed83a88a9329e7be4be2ceb3285b26381d942b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 458/684] python: vcrpy: 2.1.1 -> 3.0.0 --- pkgs/development/python-modules/vcrpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ef3e92f01a75..c518314d9649 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "2.1.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "27cc696df66d77703eab5cdfa041b2f9877bbf2b54bcd390de89a4be964ca536"; + sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; }; checkInputs = [ From e61ff423c9010458f927e43de26d88c563ca5078 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 459/684] python: vega_datasets: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/vega_datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index 2d3dda551fbc..f028f85f3ec5 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459"; + sha256 = "db8883dab72b6f414e1fafdbf1e8db7543bba6ed77912a4e0c197d74fcfa1c20"; }; propagatedBuildInputs = [ pandas ]; From 33f7172c0d8e0577a7746cb8a57c91ee4eb2186b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 460/684] python: venusian: 1.2.0 -> 3.0.0 --- pkgs/development/python-modules/venusian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index f420d88e816e..fe22b42716df 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venusian"; - version = "1.2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e"; + sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; checkInputs = [ pytest ]; From a56d2a67921b29e9db53a7fade9b078d7d68b851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 461/684] python: PyVirtualDisplay: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/virtual-display/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 130c94bc1701..1b56f0466106 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "0.2.4"; + version = "0.2.5"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "0nybvd7sajig6vya2v3fd20dls6f3nnf12x8anrfxnjs41chgx87"; + sha256 = "5b267c8ffc98fcbd084ba852ab4caef3f22e9362bc5d117e1697e767553eaf41"; }; # requires X server From b1aa99fdcc701770c33542da7f201d3ca8bd4e5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 462/684] python: virtualenv: 16.7.8 -> 16.7.9 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index cd434bb6e3b7..62c86567655b 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.7.8"; + version = "16.7.9"; src = fetchPypi { inherit pname version; - sha256 = "116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0"; + sha256 = "0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"; }; # Doubt this is needed - FRidh 2017-07-07 From ae3f44d7b39cc05cfe13c79069014bf561652f54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 463/684] python: vowpalwabbit: 8.7.0.post1 -> 8.8.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index b9fae7830748..d23f45b122f5 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.7.0.post1"; + version = "8.8.0"; src = fetchPypi{ inherit pname version; - sha256 = "de9529660858b380127b2bea335b41a29e8f264551315042300022eb4e6524ea"; + sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; }; # Should be fixed in next Python release after 8.5.0: From 599535f2ac7d213c443254329ba815b20ce32b6d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 464/684] python: whitenoise: 4.1.4 -> 5.0.1 --- pkgs/development/python-modules/whitenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 8d5f8b8813af..cfe8260ffefd 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "4.1.4"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "22f79cf8f1f509639330f93886acaece8ec5ac5e9600c3b981d33c34e8a42dfd"; + sha256 = "0f9137f74bd95fa54329ace88d8dc695fbe895369a632e35f7a136e003e41d73"; }; # No tests From beed19556d8b3f0686a8980074bbd5f5b7096014 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 465/684] python: xml2rfc: 2.35.0 -> 2.37.2 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 1a54b8b4049c..bf00062daeac 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.35.0"; + version = "2.37.2"; src = fetchPypi { inherit pname version; - sha256 = "0jpg9rxxw28n66wzznlhzdgv7b7gd1crcffjhlw7lam93ils4ah5"; + sha256 = "6f01f8b101eeead6de50d51411f5a58214bc156d59dadc4651b5b9a003e74db9"; }; propagatedBuildInputs = [ From 4e948683d55b86afbba199f5aea2b06e422ade3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:25 +0100 Subject: [PATCH 466/684] python: yapf: 0.28.0 -> 0.29.0 --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index abff04f23729..f4e154f2cbcd 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchPypi { inherit pname version; - sha256 = "06x409cgr5im9cppzypj1kqy1fsry906vn5slv7i9hd7fshvd53g"; + sha256 = "712e23c468506bf12cadd10169f852572ecc61b266258422d45aaf4ad7ef43de"; }; meta = with stdenv.lib; { From accc90080eaec242a9e0bf93492ddc125123ffc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 467/684] python: yappi: 1.0 -> 1.2.3 --- pkgs/development/python-modules/yappi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index c98bc1f303e0..f7a18bba903c 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1gs48c5sy771lsjhca3m4j8ljc6yhk5qnim3n5idnlaxa4ql30bz"; + sha256 = "b8db9bc607610d6da4e27e87ec828ebddec4bdaac89ca07ebfe9a153b0641580"; }; patches = [ ./tests.patch ]; From a4d3a973a29d8b03aa30acb485b5e81f881dfc35 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 468/684] python: yarl: 1.3.0 -> 1.4.2 --- pkgs/development/python-modules/yarl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index d07690503f30..19314e19611c 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9"; + sha256 = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"; }; checkInputs = [ pytest pytestrunner ]; From d6b6248fdeeefd372b876b69b5b7d52583a32937 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 469/684] python: yubico-client: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/yubico-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index e39b11f6200c..99aedd4e6811 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yubico-client"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c1d1c1f918c058932493c5a50341583e48487264129ed5b973c327ae48afed87"; + sha256 = "1d74c6341210c94b639f7c7c8930550e73d5c1be60402e418e9dc95e038f8527"; }; propagatedBuildInputs = [ requests ]; From c35488b7f53516d7593a2b5096221d485543b639 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 470/684] python: zeroconf: 0.23.0 -> 0.24.2 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index dbf84aa182b0..d23b84f2134e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.23.0"; + version = "0.24.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1xgfs38wv52a73p9gmyz0vxj6c49516isjn9bhp8p3y4cywk7hz0"; + sha256 = "b9a75094a79767e8351e6c4ebdf165fc790307c93dbcadd763d46067eb99ff47"; }; propagatedBuildInputs = [ ifaddr ] From c2b1cfabbce21c6c3160f032fc24e13b194d9977 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 471/684] python: zm-py: 0.3.3 -> 0.4.0 --- pkgs/development/python-modules/zm-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 72c32ef8277f..4cd5e9b1d208 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.3.3"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a"; + sha256 = "f9693ca046de4ea12c1afb5c67709ec0c2a48744566c0a1a9327348e1a1617b0"; }; disabled = !isPy3k; From d2bf84e877a43c3e16dab518f4aa2779b82fe769 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 472/684] python: zope.component: 4.5 -> 4.6 --- pkgs/development/python-modules/zope_component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index bbe635b712ff..25452fdd0707 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "4.5"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55"; + sha256 = "ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6"; }; propagatedBuildInputs = [ From e5680241c7f3783e8d415afacade856fa0f38f40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 473/684] python: zope.contenttype: 4.4 -> 4.5.0 --- pkgs/development/python-modules/zope_contenttype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index fc28a740d62b..6db39d6c5b5c 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.contenttype"; - version = "4.4"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "08c0408f515668e6f0c4fd492b66fbe87a074c1aa21cfc6be8c6292482d8b2f4"; + sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; }; meta = with stdenv.lib; { From f556c433bf2481d75a3bafde9e50ee6236f32805 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 474/684] python: zope.i18nmessageid: 4.3.1 -> 5.0.0 --- .../development/python-modules/zope_i18nmessageid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index cddcad007746..fe9a6b56ed8d 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "4.3.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e511edff8e75d3a6f84d8256e1e468c85a4aa9d89c2ea264a919334fae7081e3"; + sha256 = "03318270df5320c57b3416744f9cb2a85160a8d00345c07ac35d2b7ac01ff50c"; }; propagatedBuildInputs = [ six ]; From 57a78215a63214be612202fa8492034640b5eb07 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Dec 2019 20:31:26 +0100 Subject: [PATCH 475/684] python: zope.interface: 4.6.0 -> 4.7.1 --- pkgs/development/python-modules/zope_interface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index a5855697ad6f..d208d4a3529c 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.6.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5"; + sha256 = "4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487"; }; propagatedBuildInputs = [ zope_event ]; From d7bd4e4506f9ff1dadcca714fa57ab22543bbc1e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:29:35 -0800 Subject: [PATCH 476/684] pythonPackages.urwid: enable glibclocales for tests --- pkgs/development/python-modules/urwid/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 123ab73b752d..8e255dc69dc0 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "urwid"; @@ -9,6 +9,10 @@ buildPythonPackage rec { sha256 = "0896f36060beb6bf3801cb554303fef336a79661401797551ba106d23ab4cd86"; }; + # tests need to be able to set locale + LC_ALL = "en_US.UTF-8"; + checkInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; From c767c90fa9d4b02651cace48608f8592b94a82f2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:29:55 -0800 Subject: [PATCH 477/684] pythonPackages.urwidtrees: enable glibclocales for tests --- pkgs/development/python-modules/urwidtrees/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index b69bb62a875a..468420f0e5ce 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchFromGitHub +, glibcLocales , urwid }: @@ -17,6 +18,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ urwid ]; + checkInputs = [ glibcLocales ]; + LC_ALL="en_US.UTF-8"; + meta = with stdenv.lib; { description = "Tree widgets for urwid"; homepage = https://github.com/pazz/urwidtrees; From ef479b9db9a8ffc6c579d688c6e823fb5b3f6759 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:30:42 -0800 Subject: [PATCH 478/684] importlib-metadata: 0.23 -> 1.3.0 --- .../python-modules/importlib-metadata/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index bae5d232d0e9..5b7a249d65a7 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.23"; + version = "1.3.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a"; + sha256 = "0ibvvqajphwdclbr236gikvyja0ynvqjlix38kvsabgrf0jqafh7"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -28,9 +28,6 @@ buildPythonPackage rec { checkInputs = [ importlib-resources packaging ]; - # Two failing tests: https://gitlab.com/python-devs/importlib_metadata/issues/72 - doCheck = false; - meta = with lib; { description = "Read metadata from Python packages"; homepage = https://importlib-metadata.readthedocs.io/; From 63f26bc748a9452a03db1a7c8f3bfcb02b07e1f6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:31:14 -0800 Subject: [PATCH 479/684] pythonPackages.html5lib: use pytest_4 --- pkgs/development/python-modules/html5lib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 5a59b63cea41..82b481807099 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , flake8 -, pytest +, pytest_4 , pytest-expect , mock , six @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; }; - checkInputs = [ flake8 pytest pytest-expect mock ]; + checkInputs = [ flake8 pytest_4 pytest-expect mock ]; propagatedBuildInputs = [ six webencodings ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar prikhi ]; }; -} \ No newline at end of file +} From e27bf33c25c83c6ba2841cd1612d6307e2e8b673 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:31:45 -0800 Subject: [PATCH 480/684] pythonPackages.ecdsa: add six dependency --- pkgs/development/python-modules/ecdsa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index d6882b42e43f..aa69b7e2fcde 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pkgs +, six }: buildPythonPackage rec { @@ -13,6 +14,7 @@ buildPythonPackage rec { sha256 = "64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e"; }; + propagatedBuildInputs = [ six ]; # Only needed for tests checkInputs = [ pkgs.openssl ]; From 6a2ad503c07d999edaed6014f8f87bc99c388cdb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 08:33:02 -0800 Subject: [PATCH 481/684] pythonPackages.aiohttp: disable sandbox-incompatible test --- pkgs/development/python-modules/aiohttp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 6ac46b744a52..40dec3e1c1ee 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { and not connector \ and not client_disconnect \ and not handle_keepalive_on_closed_connection \ + and not proxy_https_bad_response \ and not partially_applied_handler \ and not middleware" \ --ignore=test_connector.py From be3f724ae9d280189bb17b6bd28bf2697aa417ae Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 09:00:37 -0800 Subject: [PATCH 482/684] pythonPackages.paramiko: fix build --- pkgs/development/python-modules/paramiko/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index a9a577b5a2e0..2fefbde74485 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -3,6 +3,7 @@ , fetchPypi , cryptography , bcrypt +, invoke , pynacl , pyasn1 , pytest @@ -19,14 +20,17 @@ buildPythonPackage rec { sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; }; - checkInputs = [ pytest mock pytest-relaxed ]; + checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; __darwinAllowLocalNetworking = true; # 2 sftp tests fail (skip for now) + # test_config relies on artifacts to be to downloaded checkPhase = '' - pytest tests --ignore=tests/test_sftp.py + pytest tests \ + --ignore=tests/test_sftp.py \ + --ignore=tests/test_config.py ''; meta = with pkgs.lib; { From e05e32ae047dcb686607ed2885ccb0c6fec1bfb0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 09:30:23 -0800 Subject: [PATCH 483/684] pythonPackages.backports_functools_lru_cache: fix tests --- .../backports_functools_lru_cache/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index b346b5c75030..8cb84c02b379 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -4,6 +4,9 @@ , setuptools_scm , isPy3k , pytest +, pytest-black +, pytest-flake8 +, pytestcov }: buildPythonPackage rec { @@ -15,12 +18,13 @@ buildPythonPackage rec { sha256 = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"; }; - buildInputs = [ setuptools_scm ]; - - checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' - pytest + rm backports/functools_lru_cache.py + pytest -k 'not format' ''; # Test fail on Python 2 @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = https://github.com/jaraco/backports.functools_lru_cache; license = lib.licenses.mit; }; -} \ No newline at end of file +} From 919fa169407cf9ad017d776d36340d9f144e203a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 09:31:05 -0800 Subject: [PATCH 484/684] pythonPackages.inflect: add importlib-metadata dependency --- pkgs/development/python-modules/inflect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 999ab17472ee..2b856b35f7c3 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six }: +{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata }: buildPythonPackage rec { pname = "inflect"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ee7c9b7c3376d06828b205460afb3c447b5d25dd653171db249a238f3fc2c18a"; }; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six importlib-metadata ]; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; } From ac00920f89d5267106071ee820db9299cc85064f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 09:31:35 -0800 Subject: [PATCH 485/684] pythonPackages.jaraco_classes: add more-itertools dependency --- .../python-modules/jaraco_classes/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 7c0831918ece..8e5458509c43 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,13 +1,16 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools_scm, six, more-itertools }: buildPythonPackage rec { pname = "jaraco.classes"; version = "3.0.0"; + src = fetchPypi { inherit pname version; sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six more-itertools ]; + doCheck = false; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; } From 0797536602b8f23bb32630ca02f75d58a29849ef Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 09:32:08 -0800 Subject: [PATCH 486/684] pythonPackages.natsort: ignore impure tests --- pkgs/development/python-modules/natsort/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 650d04c6487c..8bdfdb9d7200 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -30,9 +30,10 @@ buildPythonPackage rec { }; # testing based on project's tox.ini + # natsort_keygen has pytest mock issues checkPhase = '' pytest --doctest-modules natsort - pytest + pytest --ignore=tests/test_natsort_keygen.py ''; meta = { From e1b79e394ff01a5a90a0f0271a76ba9644be83b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 20:47:39 -0800 Subject: [PATCH 487/684] python3Packages.azure-core: init at 1.1.1 --- .../python-modules/azure-core/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/azure-core/default.nix diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix new file mode 100644 index 000000000000..ee1347621492 --- /dev/null +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, aiodns +, aiohttp +, msrest +, pytest +, pytestCheckHook +, requests +, six +, trio +, typing-extensions +}: + +buildPythonPackage rec { + version = "1.1.1"; + pname = "azure-core"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "00jm43gw89n446zdm18qziwd85lsx1gandxpmw62dc1bdnsfakxl"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + aiodns + aiohttp + msrest + pytest + pytestCheckHook + trio + typing-extensions + ]; + + pytestFlagsArray = [ "tests/" ]; + disabledTests = [ "response" "request" "timeout" ]; + + meta = with lib; { + description = "Microsoft Azure Core Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6cf3e8766e5..d09709ed0e40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -268,6 +268,8 @@ in { azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; From 9476c5a0b02be9e7c8713ef54404ad98dd89ade3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 21:01:41 -0800 Subject: [PATCH 488/684] python3Packages.azure-keyvault-keys: init at 4.0.0 --- .../azure-keyvault-keys/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/azure-keyvault-keys/default.nix diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix new file mode 100644 index 000000000000..34629e6eb48d --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -0,0 +1,47 @@ +{ lib, buildPythonPackage, isPy27, fetchPypi +, aiohttp +, azure-common +, azure-core +, azure-nspkg +, cryptography +, msrest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "azure-keyvault-keys"; + version = "4.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1l1fwm8plzr5zbv02nlvs0i8ssmd88cxm5lb19i54b3scci77hiq"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + cryptography + ]; + + # requires relative paths to utilities in the mono-repo + doCheck = false; + checkInputs = [ aiohttp pytestCheckHook ]; + + pythonImportsCheck = [ + "azure" + "azure.core" + "azure.common" + "azure.keyvault" + "azure.keyvault.keys" + ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Keys Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d09709ed0e40..d415010f2ae5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; + azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; From 4596a70fc48f3099c5540fe764fee98fe3884a80 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 21:09:23 -0800 Subject: [PATCH 489/684] python3Packages.azure-keyvault-secrets: init at 4.0.0 --- .../azure-keyvault-secrets/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/azure-keyvault-secrets/default.nix diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix new file mode 100644 index 000000000000..e2b40c29d850 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-keyvault-secrets"; + version = "4.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "066p4x2ixasz6qbxss2ilchl73w1kh2nc32lgh8qygl3d90059lp"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + # requires checkout from mono-repo + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Key Vault Secrets Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d415010f2ae5..a4936330ce4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -286,6 +286,8 @@ in { azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; + azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { }; + azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; From aaee618c2b91287c72722e9807b55b5c7157b2e0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 21:14:09 -0800 Subject: [PATCH 490/684] python3Packages.azure-keyvault: fix build --- .../python-modules/azure-keyvault/default.nix | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 006015646ee0..b6f7f1d70d49 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,18 +1,12 @@ -{ lib -, buildPythonPackage -, python -, isPy3k -, fetchPypi -, azure-common -, azure-nspkg -, msrest -, msrestazure -, cryptography +{ lib, buildPythonPackage, isPy27, fetchPypi +, azure-keyvault-keys +, azure-keyvault-secrets }: buildPythonPackage rec { pname = "azure-keyvault"; version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -21,24 +15,22 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - azure-common - azure-nspkg - msrest - msrestazure - cryptography + azure-keyvault-keys + azure-keyvault-secrets ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - ''; - - # has no tests + # this is just a meta package, which contains keys and secrets doCheck = false; + pythonImportsCheck = [ + "azure.keyvault.keys" + "azure.keyvault.secrets" + ]; + meta = with lib; { description = "This is the Microsoft Azure Key Vault Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ jonringer ]; }; } From 1283912c41ed1f1afa3ceb669448d5d245135f2b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 21:35:13 -0800 Subject: [PATCH 491/684] python3Packages.flask-caching: add missing pytestcache dependency --- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 02c19d8e95e1..64c3e3384dcc 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess }: +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest pytestcov pytest-xprocess ]; + checkInputs = [ pytest pytestcov pytest-xprocess pytestcache ]; # backend_cache relies on pytest-cache, which is a stale package from 2013 checkPhase = '' From e1bb62f9bc67f0be4372b067656d6b695e3aa774 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:04:51 -0800 Subject: [PATCH 492/684] azure-cli: 2.0.77 -> 2.0.78 --- pkgs/tools/admin/azure-cli/default.nix | 4 +-- .../tools/admin/azure-cli/python-packages.nix | 31 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index b28ef88ad992..69eae818c3bf 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.0.77"; + version = "2.0.78"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1qd6di8cqwhpcsqcx6g3scmwj90m15r695y5977q6a3qy13knisv"; + sha256 = "095dk5jbri3ydizs0fhfw1lhamvvxwx5smw8mj1bj78b2qsl5xh3"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 529bc4d50d3b..01355d48d5c4 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -114,8 +114,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.4.0" "zip" "0zssvzdip23yzaxlac9rlzg9mlyjl97fwr0gj8y27z8j58pwj72i"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "4.0.0" "zip" - "0gy89bi89ikg5hps8rvnq28r33lixci3sk2m86jvziv9fh9rz41b"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip" + "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip" "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg"; @@ -150,12 +150,18 @@ let azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip" "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij"; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" + "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; + azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.42.0" "zip" "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" + "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; + azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -177,6 +183,9 @@ let azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip" "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885"; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "3.1.0" "zip" + "1qvnksmvsg8cw1ac6vbdxjdqsm7s1sak27k8xy24hm7c9a8y1nqc"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc7" "zip" "1bzfpbz186dhnxn0blgr20xxnk67gkr8ysn2b3f1r41bq9hz97xp"; @@ -230,6 +239,24 @@ let }; }); + azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { + version = "1.1.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + extension = "zip"; + sha256 = "0jfxm8lx8dzs3v2b04ljizk8gfckbm5l2v86rm7k0npbfvryba1p"; + }; + + propagatedBuildInputs = with self; [ + azure-common azure-nspkg msrest msrestazure cryptography + ]; + postInstall = '' + rm -f $out/${self.python.sitePackages}/azure/__init__.py + ''; + pythonImportsCheck = [ ]; + }); + # part of azure.mgmt.datalake namespace azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { version = "0.2.1"; From 9b86ffa46ae13a534ac3453f020ad199da58ffc2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:09:43 -0800 Subject: [PATCH 493/684] python3Packages.pyfakefs: disable tests for python3.7 the glob mocks seem to be unable to handle compile_pattern --- pkgs/development/python-modules/pyfakefs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 97a0c3f50f84..c946b72f172c 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { version = "3.7"; @@ -24,6 +24,8 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); + # https://github.com/jmcgeheeiv/pyfakefs/issues/508 + doCheck = !isPy37; checkInputs = [ pytest glibcLocales ]; checkPhase = '' From 599fa2754bdf68d7b23260f2a1ce661dcc408ee1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:15:23 -0800 Subject: [PATCH 494/684] python3Packages.keyringer: add importlib-metadata dependency --- .../python-modules/keyring/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 9e3ac1781caa..1694b01b75ae 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,6 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 -, dbus-python, setuptools_scm, entrypoints, secretstorage -, pytest, pytest-flake8 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonOlder +, dbus-python +, entrypoints +, importlib-metadata +, pytest +, pytest-flake8 +, secretstorage +, setuptools_scm +}: buildPythonPackage rec { pname = "keyring"; @@ -16,12 +22,14 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; + propagatedBuildInputs = [ dbus-python entrypoints ] + ++ lib.optional stdenv.isLinux secretstorage + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # checks try to access a darwin path on linux doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; license = licenses.psfl; From 8b4996eac28aef0d292481f148f32f10e634e157 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:19:54 -0800 Subject: [PATCH 495/684] python3Packages.pgcli: remove prompt_tookit version bounds --- pkgs/development/tools/database/pgcli/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 03f0ae3c444f..4038ad7010f6 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -19,6 +19,11 @@ buildPythonApplication rec { pygments sqlparse pgspecial setproctitle keyring ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + ''; + checkInputs = [ pytest mock ]; # `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104 From 4f0ff75060e8ad0d1da9b073524071fb14fce3f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:23:33 -0800 Subject: [PATCH 496/684] python3Packages.bleach: disable network tests --- pkgs/development/python-modules/bleach/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 86b253a72c95..1033f9def76c 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -24,10 +24,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ",<3dev" "" ''; - # Disable a test - # https://github.com/mozilla/bleach/issues/467 + # Disable network tests checkPhase = '' - pytest -k "not test_only_text_is_cleaned" + pytest -k "not protocols" ''; meta = { From 2b1370a353be3826d69daf71b5d25f43e9161aff Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:26:35 -0800 Subject: [PATCH 497/684] python3Packages.venusian: add pytestcov test dependency --- pkgs/development/python-modules/venusian/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index fe22b42716df..fb81a79f10e3 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytest +, pytestcov }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytestcov ]; checkPhase = '' pytest From 62094862af271fd5299ad9c03c4d0cd3aa63be66 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:34:26 -0800 Subject: [PATCH 498/684] pythonPackages.cachetools: disable py2, abandoned upstream --- pkgs/development/python-modules/cachetools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index aac67a109cb1..dabd5cee60e9 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "cachetools"; version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 42a535b49cb7b383e5b721756927ba1bf40551ff Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 22:35:37 -0800 Subject: [PATCH 499/684] pythonPackages.squaremap: mark broken wxPython is unable to be detected by setuptools --- pkgs/development/python-modules/squaremap/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index f237d982abb8..fb339550062a 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , isPy3k , fetchPypi +, six +, wxPython }: buildPythonPackage rec { @@ -10,14 +12,18 @@ buildPythonPackage rec { disabled = isPy3k; src = fetchPypi { - inherit pname version; - sha256 = "b16ce5950cbfa63e3284015095293cd26ed5e26045fd14d488fb825b4f95e9a8"; + pname = "SquareMap"; + inherit version; + sha256 = "1a79jm7mp0pvi3a19za5c3idavnj7hlral01hhr3x9mz1jayav5i"; }; + propagatedBuildInputs = [ six wxPython ]; + meta = with stdenv.lib; { description = "Hierarchic visualization control for wxPython"; homepage = https://launchpad.net/squaremap; license = licenses.bsd3; + broken = true; # wxPython doesn't seem to be able to be detected by pip }; } From 046c4020a5ab572371f3beed1951455fe0d6198f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 23:05:35 -0800 Subject: [PATCH 500/684] python3Packages.hypothesis: 4.41.0 -> 4.56.1 --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9e3b0cdc894c..fdb5a69ddd79 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "4.41.0"; + version = "4.56.1"; pname = "hypothesis"; # Use github tarballs that includes tests From 16726326fe12df68ff4a6817b8ce5de55d436392 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 23:06:17 -0800 Subject: [PATCH 501/684] python3Packages.cymem: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/cymem/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index b3d4a40bf66f..1ca86f3d9d05 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -4,15 +4,16 @@ , cython , python }: + buildPythonPackage rec { pname = "cymem"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; rev = "v${version}"; - sha256 = "109i67vwgql9za8mfvgbrd6rgraz4djkvpzb4gqvzl13214s6ava"; + sha256 = "0cqz6whq4zginxjnh4cfqlsh535p4qz295ymvjchp71fv8mz11f6"; }; propagatedBuildInputs = [ From f92a1048f3c525006ecc7068040a15b2fca61959 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Dec 2019 23:58:02 -0800 Subject: [PATCH 502/684] python3Packages.ipykernel: 5.1.2 -> 5.1.3 --- pkgs/development/python-modules/ipykernel/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 215177d4b8ae..ec1707f64c14 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flaky , ipython , jupyter_client , traitlets @@ -14,14 +15,16 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.2"; + version = "5.1.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "04jx6ihj3zpj4c7acqa14gl37mpdnbgmfm4nvv97xkjc1cz920xm"; + sha256 = "1a08y677lpn80qzvv7z0smgggmr5m5ayf0bs6vds47xpxl9sss5k"; }; + checkInputs = [ flaky pytest nose ]; + propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; # https://github.com/ipython/ipykernel/pull/377 From 3f5448da60ac1746a23ddf6e8b98c84f64629146 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 00:00:39 -0800 Subject: [PATCH 503/684] python3Packages.logilab_common: 1.4.4 -> 1.5.2 --- pkgs/development/python-modules/logilab/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 99ff8d45e6a7..49ad11e806d7 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.4"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "8c1bf26431a3b487940cd4a7c0eefde328f5ff7098222ee695805752dae94aa6"; + sha256 = "1n20znamai7jksimbdshy03rgw235qwa9vbx3lyajzwysblq4s4d"; }; propagatedBuildInputs = [ unittest2 six ]; From d8307804ec13ffa844fc26bfa02834e80e1e3fed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 00:01:21 -0800 Subject: [PATCH 504/684] python3Packages.pysocks: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/pysocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index ae17ed351050..e8d853d625d4 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pysocks"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { pname = "PySocks"; inherit version; - sha256 = "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr"; + sha256 = "184sg65mbmih6ljblfsxcmq5js5l7dj3gpn618w9q5dy3rbh921z"; }; doCheck = false; From 2d11d4bdc597d57822772b318a42998d35a41d5d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 00:02:31 -0800 Subject: [PATCH 505/684] python3Packages.simplejson: 3.16.1 -> 3.17.0 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index abd4854c73fd..54e19d2e6045 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.16.1"; + version = "3.17.0"; doCheck = !stdenv.isDarwin; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq"; + sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z"; }; # Package does not need pytest, but its a bit easier debugging. From c9cafbf56e4e3a260b64ecad92aed130a39cbcf3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 00:04:27 -0800 Subject: [PATCH 506/684] pytphon3Packages.sphinx: 2.2.0 -> 2.2.2 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 307232903e89..6f0290294bc7 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { pname = "Sphinx"; inherit version; - sha256 = "0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845"; + sha256 = "1wjcm382824rq8ijls9mlqwl2h8l26s201v5fwprhnins671m72m"; }; LC_ALL = "en_US.UTF-8"; From 68f4f8804da4ad5e3a6e76cf6d763dc82e81f439 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 01:52:28 -0800 Subject: [PATCH 507/684] python3Packages.cfn-lint: fix build --- pkgs/development/python-modules/cfn-lint/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index d470dc7dea19..915ff85db11c 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,10 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pyyaml , six , requests , aws-sam-translator +, importlib-metadata +, importlib-resources , jsonpatch , jsonschema , pathlib2 @@ -29,7 +32,7 @@ buildPythonPackage rec { jsonschema pathlib2 setuptools - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; # No tests included in archive doCheck = false; From a792ed1e2b9d3dc401dc026c03b8b1ce9afcb6b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 01:53:46 -0800 Subject: [PATCH 508/684] pythonPackages.logilab_common: disable for python2 --- pkgs/development/python-modules/logilab/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 49ad11e806d7..8a23b69cf671 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, unittest2, six }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; version = "1.5.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; From cb740cbe815da2d36e935e52f9c5c1adf6c38aa9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 02:05:32 -0800 Subject: [PATCH 509/684] pythonPackages.munch: add missing pbr dependency --- pkgs/development/python-modules/munch/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 77c291d80b18..764523e0cf7a 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , six +, pbr }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six pbr ]; # No tests in archive doCheck = false; From 38f1f74324df7cf02eefce58360662b00470afa3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 14:34:15 -0800 Subject: [PATCH 510/684] python3Packages.pytest-services: add missing zc_lockfile dependency --- pkgs/development/python-modules/pytest-services/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 507cb4467bc1..c940dcadc7ea 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -6,6 +6,7 @@ , psutil , pytest , subprocess32 +, zc_lockfile }: buildPythonPackage rec { @@ -21,6 +22,7 @@ buildPythonPackage rec { requests psutil pytest + zc_lockfile ] ++ lib.optional (!isPy3k) subprocess32; # no tests in PyPI tarball From 82edff82077449b2e361c770215216e282519326 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 14:34:51 -0800 Subject: [PATCH 511/684] python3Packages.pytest-testmon: only run tests which don't import unittest_mixins --- pkgs/development/python-modules/pytest-testmon/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 3f8fb783408a..b8535da4c7ac 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { sha256 = "b823b03faf5778d1e15fb9f52e104df4da9c1021daeb313b339fccbbfb8dbd5f"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage ]; checkInputs = [ pytest ]; + # avoid tests which try to import unittest_mixins + # unittest_mixins doesn't seem to be very active checkPhase = '' - pytest --deselect=test/test_testmon.py::TestmonDeselect::test_dependent_testmodule + cd test + pytest test_{core,process_code,pytest_assumptions}.py ''; meta = with lib; { From 7942341ac0b3b85003728d345cac0557219f79d1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 14:46:23 -0800 Subject: [PATCH 512/684] pythonPackages.libcloud: fix build --- pkgs/development/python-modules/libcloud/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 0fd025e32d29..3d505166e4ac 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -1,12 +1,14 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 , mock , pycrypto , requests , pytestrunner , pytest , requests-mock +, typing }: buildPythonPackage rec { @@ -19,14 +21,14 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest pytestrunner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ]; + propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; # requires a certificates file doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A unified interface to many cloud providers"; homepage = http://incubator.apache.org/libcloud/; license = licenses.asl20; From 4e649e883adf277587789dcc0153f8b8432f234a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 17:16:05 -0800 Subject: [PATCH 513/684] python3Packages.argon2_cffi: fix src pname --- pkgs/development/python-modules/argon2_cffi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index c6a3decaf278..130a2c189170 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { version = "19.2.0"; src = fetchPypi { - inherit pname version; + pname = "argon2-cffi"; + inherit version; sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3"; }; From 310555b281d464ea68c0723af7edf77a07eb118d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 17:16:31 -0800 Subject: [PATCH 514/684] python3Packages.portend: fix test dependencies --- pkgs/development/python-modules/portend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index c7210265b139..6d7d7b2563dd 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora, pytest-black }: +, pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { pname = "portend"; @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black ]; + checkInputs = [ pytest pytest-black pytestcov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening From a7d6b1620bfda284f9322edbf646cd7793e765ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 21 Dec 2019 17:30:49 -0800 Subject: [PATCH 515/684] pythonPackages.keyrings-alt: disable tests They heavily rely on the keyring package test suite --- pkgs/development/python-modules/keyrings-alt/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index d9841776ffe1..c7ec617f4f2c 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -21,10 +21,16 @@ buildPythonPackage rec { checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; + # heavily relies on importing tests from keyring package + doCheck = false; checkPhase = '' py.test ''; + pythonImportsCheck = [ + "keyrings.alt" + ]; + meta = with stdenv.lib; { license = licenses.mit; description = "Alternate keyring implementations"; From d80f10eddbf8dd5ffb875a425837e7528690fb4d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 10:23:18 -0800 Subject: [PATCH 516/684] pythonPackages.pycurl: fix tests --- pkgs/development/python-modules/pycurl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index ce11b8497cfe..153a6e0377db 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests -k "not test_ssl_in_static_libs \ + HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ and not test_keyfunction_bogus_return \ and not test_libcurl_ssl_gnutls \ From 128d6068cb2c1951ed23f1fd962c0cd94cbc14e8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 10:37:16 -0800 Subject: [PATCH 517/684] pythonPackages.bonfire: mark broken arrow package now only allows for time attributes to be in the singular form (minute vs minutes). bonfire also does not seem to be actively maintained --- pkgs/tools/misc/bonfire/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a5e4a42ef3cd..12b0ad2abf1f 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -3,9 +3,8 @@ with python3Packages; buildPythonApplication rec { - version = "2017-01-19"; pname = "bonfire"; - name = "${pname}-unstable-${version}"; + version = "unstable-2017-01-19"; # use latest git version with --endpoint flag # https://github.com/blue-yonder/bonfire/pull/18 @@ -25,7 +24,7 @@ buildPythonApplication rec { # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ --replace "version=version," "version='${version}'," - # remove extraneous files + # remove extraneous files substituteInPlace setup.cfg \ --replace "data_files = *.rst, *.txt" "" ''; @@ -45,6 +44,6 @@ buildPythonApplication rec { license = licenses.bsd3; maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; + broken = true; # no longer compatible with new arrow package }; - } From 645e5ef1fddcd5c3d9ad99641f55e987948c565f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 10:44:49 -0800 Subject: [PATCH 518/684] pythonPackages.nibabel: disable python2 version --- pkgs/development/python-modules/nibabel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 895b2e9a1a31..979f12c8d985 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k +, isPy27 , bz2file , mock , nose @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "nibabel"; version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 3294887b2b8b0b80523a8f5ff46c9f73e43b046d Mon Sep 17 00:00:00 2001 From: Tyler Benster Date: Wed, 5 Jun 2019 22:23:38 -0700 Subject: [PATCH 519/684] pythonPackages.tifffile: add missing dependency (cherry picked from commit ba31a6835df40677095ffa952d3a2e07c95555a0) --- pkgs/development/python-modules/tifffile/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 8aafc39fc344..02ca26960d04 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,6 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 +{ lib, fetchPypi, buildPythonPackage, isPy27, isPy3k , numpy, enum34, futures, pathlib , pytest +, imagecodecs-lite }: buildPythonPackage rec { @@ -24,10 +25,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ] ++ lib.optionals isPy27 [ futures enum34 pathlib ]; + ++ lib.optionals isPy3k [ imagecodecs-lite ]; meta = with lib; { description = "Read and write image data from and to TIFF files."; - homepage = https://www.lfd.uci.edu/~gohlke/; + homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.lebastr ]; license = licenses.bsd3; }; From 8ad15f159ad6c116779e1cd0e2e348659aad6255 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 10:56:26 -0800 Subject: [PATCH 520/684] python3Packages.nbsmoke: add missing holoviews dependency --- pkgs/development/python-modules/nbsmoke/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 4af60ba9b9ed..6fff7857565d 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -4,6 +4,7 @@ , pytest , jupyter_client , ipykernel +, holoviews , nbformat , nbconvert , pyflakes @@ -22,6 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest + holoviews jupyter_client ipykernel nbformat From 79b2cc88030f2d971a0faa87dc03baf4d091dfc3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:15:46 -0800 Subject: [PATCH 521/684] pythonPackages.solo-python: mark disabled no longer compatible with latest fido2 --- pkgs/development/python-modules/solo-python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 829874f25ad5..52d7d7539f92 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -48,5 +48,6 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; + broken = true; # no longer compatible with fido2 }; } From 5d5c957cbdd5564eb6c24c6b6e404358c1ec7d0a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:28:21 -0800 Subject: [PATCH 522/684] pythonPackages.readme_renderer: disable flakey test --- pkgs/development/python-modules/readme_renderer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index df943cfcca41..8369c3df9438 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { checkPhase = '' # disable one failing test case - py.test -k "not test_invalid_link" + # fixtures test is failing for incorrect class name + py.test -k "not test_invalid_link and not fixtures" ''; meta = { From f4bfc4e3de5c467abbc39ddf38a13294a36580d6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:34:42 -0800 Subject: [PATCH 523/684] pythonPackages.celery: fix tests --- pkgs/development/python-modules/celery/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index de34ce5ba0cb..4522379fa64a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -19,9 +19,11 @@ buildPythonPackage rec { # ignore test that's incompatible with pytest5 # test_eventlet touches network + # test_mongodb requires pymongo checkPhase = '' - pytest -k 'not restore_current_app_fallback' \ - --ignore=t/unit/concurrency/test_eventlet.py + pytest -k 'not restore_current_app_fallback and not msgpack' \ + --ignore=t/unit/concurrency/test_eventlet.py \ + --ignore=t/unit/backends/test_mongodb.py ''; checkInputs = [ case pytest boto3 moto ]; From ee8247238259abb18256a98cc4188ad6d6784e17 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:34:59 -0800 Subject: [PATCH 524/684] pythonPackages.whitenoise: python2 no longer supported --- pkgs/development/python-modules/whitenoise/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index cfe8260ffefd..565032ad523b 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; version = "5.0.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From ba7cb82c0c2d1ddfe49ffaa18976b32f967e3af7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:38:29 -0800 Subject: [PATCH 525/684] pythonPackages.marshmallow: python2 no longer supported --- pkgs/development/python-modules/marshmallow/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 57956009a9ad..7b7cadc98894 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,10 +1,11 @@ { lib, buildPythonPackage, fetchPypi, - dateutil, simplejson + dateutil, simplejson, isPy27 }: buildPythonPackage rec { pname = "marshmallow"; version = "3.3.0"; + disabled = isPy27; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; From a2a8423fb52aa9bc980ac47f50afadb0c995b00a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:39:53 -0800 Subject: [PATCH 526/684] pythonPackages.gunicorn: python2 no longer supported --- pkgs/development/python-modules/gunicorn/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index c1fb010c6d35..75a3d745a3f5 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "gunicorn"; version = "20.0.4"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 54b0ae4aa3ecece05049acce6f45abbb782f1e3c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:41:32 -0800 Subject: [PATCH 527/684] pythonPackages.datadog: add missing freeze test dep --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 64ddae34e871..6dc19a17462d 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , decorator, requests, simplejson, pillow -, nose, mock, pytest }: +, nose, mock, pytest, freezegun }: buildPythonPackage rec { pname = "datadog"; @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator requests simplejson pillow ]; - checkInputs = [ nose mock pytest ]; + checkInputs = [ nose mock pytest freezegun ]; checkPhase = '' pytest tests/unit ''; From e3f435fa95e9fa7f61d32d879fe27e3774986d74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 11:50:24 -0800 Subject: [PATCH 528/684] python3Packages.twine: fix build deps --- .../python-modules/twine/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 05febed4cb25..762df433f973 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,13 +1,13 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, importlib-metadata +, keyring , pkginfo -, requests -, requests_toolbelt -, tqdm , pyblake2 , readme_renderer +, requests +, requests_toolbelt +, setuptools_scm +, tqdm }: buildPythonPackage rec { @@ -20,7 +20,16 @@ buildPythonPackage rec { sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + keyring + pkginfo + pyblake2 + readme_renderer + requests + requests_toolbelt + tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Requires network doCheck = false; From 0f096240ff03ee6137045972b3e2e7ba7f33011e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:01:23 -0800 Subject: [PATCH 529/684] python3Packages.pytest-mpl: add missing pillow dep --- pkgs/development/python-modules/pytest-mpl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index aa73d3ccaedc..d86647b7503a 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -4,6 +4,7 @@ , pytest , matplotlib , nose +, pillow }: buildPythonPackage rec { @@ -20,6 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib nose + pillow ]; checkInputs = [ From 2270bc7895c0d57b3f0b8afecb603cac48b5c2c1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:04:02 -0800 Subject: [PATCH 530/684] pythonPackages.audio-metadata: adjust more-itertools version range --- pkgs/development/python-modules/audio-metadata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index e21e04af6f5d..d1ccef1ece4e 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<5.0" "more-itertools" + --replace "more-itertools>=4.0,<8.0" "more-itertools" ''; propagatedBuildInputs = [ From 37f161014fee606afaa7253414f2b045ee61ea23 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:18:14 -0800 Subject: [PATCH 531/684] pythonPackages.xdis: mark broken Very specific to patch version of python interpreter, unfortunately doesn't support newest versions --- pkgs/development/python-modules/xdis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 533e8d8b577b..636b7c5045c5 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.1.3"; + version = "4.2.1"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0ixx9svyi0kw3z2i51cv1cyg4l5z8hy432kxgsvz20mr9a8z5c91"; + sha256 = "19mnx746k9ls2f1321fl8nkps7x9by80f753f3c5wh1j91zivq6b"; }; checkInputs = [ pytest ]; @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = https://github.com/rocky/python-xdis/; license = licenses.gpl2; + broken = true; # doesn't support latest python3 interpreters }; - } From 4984eb8b6376823bd6bfb12fc397a19fcffaaad5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:21:21 -0800 Subject: [PATCH 532/684] pythonPackages.mockito: disable tests no longer packaged on pypi --- pkgs/development/python-modules/mockito/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 43a512b85fd2..f0673b64ef3a 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -9,12 +9,11 @@ buildPythonPackage rec { sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb"; }; - # Failing tests due 2to3 - doCheck = !isPy3k; - propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; checkInputs = [ pytest numpy ]; + # tests are no longer packaged in pypi tarball + doCheck = false; checkPhase = '' pytest ''; From d64c5457f47f7d8c0620c0123c7718287c2dc896 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:23:12 -0800 Subject: [PATCH 533/684] python3Packages.uritools: python2 no longer supported --- pkgs/development/python-modules/uritools/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index c99692fe1e2e..570fc5dc7180 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,16 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, ipaddress }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; }; - propagatedBuildInputs = [ ipaddress ]; - meta = with stdenv.lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; license = licenses.mit; From 7917f24840dadd9fa12f2fca6e8b313824366df5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:25:58 -0800 Subject: [PATCH 534/684] pythonPackages.djangorestframework: python2 no longer supported --- .../python-modules/djangorestframework/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index e9668a27c1c7..60e5760b5244 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,7 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }: + buildPythonPackage rec { version = "3.11.0"; pname = "djangorestframework"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 90dd23566639665410cfb7beec832035854b09ae Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:37:58 -0800 Subject: [PATCH 535/684] pythonPackages.jupyter_console: fix prompt_toolkit vers bounds --- .../development/python-modules/jupyter_console/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index f8cf8b3076a7..9200e004d0c6 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -20,7 +20,6 @@ buildPythonPackage rec { sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ jupyter_client ipython @@ -28,6 +27,12 @@ buildPythonPackage rec { prompt_toolkit pygments ]; + checkInputs = [ nose ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.0,<2.1.0" "prompt_toolkit" + ''; # ValueError: underlying buffer has been detached doCheck = false; From fe058ee1ed7aaaac30c54386bd2aa0b2994d6160 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:50:38 -0800 Subject: [PATCH 536/684] awscli: fix build --- pkgs/tools/admin/awscli/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b3af7f9bd6e5..f38d4cd1a1d6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -7,13 +7,6 @@ let py = python3.override { packageOverrides = self: super: { - colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"; - }; - }); rsa = super.rsa.overridePythonAttrs (oldAttrs: rec { version = "3.4.2"; src = oldAttrs.src.override { @@ -21,6 +14,23 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81"; + }; + }); + + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.4.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ba247bx5pc60hcpbf3rjsqk0whilg241i9qdfnlcwij5qgdgvh5"; + }; + }); + }; }; From 8043df949b02f33eac69e6da5be46e1814203db3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 12:50:57 -0800 Subject: [PATCH 537/684] aws_shell: fix dep issues --- pkgs/tools/admin/aws_shell/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 95f1df395765..b9169691808f 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { pyyaml ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt-toolkit>=1.0.0,<1.1.0" "prompt-toolkit" + ''; + #Checks are failing due to missing TTY, which won't exist. doCheck = false; preCheck = '' From 9fdf16065c5e072da31a1b3704f581eb78f70b59 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 13:03:45 -0800 Subject: [PATCH 538/684] pythonPackages.ansible-lint: mark broken old versions of ansible-lint are broken due to setuptools no longer supporting their hacks. Current versions of ansible-lint require newest version of flit which isn't packaged yet --- pkgs/development/python-modules/ansible-lint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 1728563b5f51..757ece55ead7 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -42,5 +42,6 @@ buildPythonPackage rec { description = "Best practices checker for Ansible"; license = licenses.mit; maintainers = [ maintainers.sengaya ]; + broken = true; # requires new flit to build }; } From 6eb49c39cd739247d9668b7ca4ea0f127c6a0a48 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:29:18 -0800 Subject: [PATCH 539/684] pythonPackages.altair: python2 no longer supported --- pkgs/development/python-modules/altair/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 3cd944cad9a9..9cb362a7bd16 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "altair"; version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From eafae36fa7ae06e3deb26bc73366ace215d618de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:30:53 -0800 Subject: [PATCH 540/684] Revert "python: ase: 3.17.0 -> 3.18.1" This was a frozen version, wasn't meant to be bumped --- pkgs/development/python-modules/ase/3.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index dc251ac2ab22..3a466170c77c 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ase"; - version = "3.18.1"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "e21948dbf79011cc796d772885a8aafb255a6f365d112fe6a3bd26198c6cac7f"; + sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; From 2efeffb97b8d41457bc19ca74b03c43c816690fe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:32:29 -0800 Subject: [PATCH 541/684] pythonPackages.breathe: python2 no longer supported --- pkgs/development/python-modules/breathe/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index cb049b659430..d2b19ae8650f 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { version = "4.14.0"; pname = "breathe"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 1bf17675c9e84a0ed68f272dfef36ce6f8fb75c1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:33:40 -0800 Subject: [PATCH 542/684] pythonPackages.broadlink: add missing cryptography dep --- pkgs/development/python-modules/broadlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index af03e1ad6658..99d7641c07eb 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, pyaes, pycrc }: +, cryptography, pyaes, pycrc }: buildPythonPackage rec { pname = "broadlink"; @@ -15,7 +15,7 @@ buildPythonPackage rec { --replace pyaes==1.6.0 pyaes ''; - propagatedBuildInputs = [ pyaes pycrc ]; + propagatedBuildInputs = [ cryptography pyaes pycrc ]; # no tests available doCheck = false; From fddccdd8346317f675a4a78e81ae8c23fce404b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:36:27 -0800 Subject: [PATCH 543/684] pythonPackages.caldav: mark broken requires xandikos package, which isn't in nixpkgs --- pkgs/development/python-modules/caldav/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 1cb3c2070ecb..895775eb87f5 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -17,5 +17,6 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/caldav/"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; + broken = true; # missing xandikos package }; } From 8f9348d6cac63f3af5d9b3390a588f6fb845ac6f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:39:00 -0800 Subject: [PATCH 544/684] pythonPackages.clize: fix tests --- pkgs/development/python-modules/clize/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index ce1ad60a5321..72b6a2fa30ae 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -8,8 +8,9 @@ , od , docutils , repeated_test -, unittest2 , pygments +, unittest2 +, pytest }: buildPythonPackage rec { @@ -21,14 +22,15 @@ buildPythonPackage rec { sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187"; }; - checkInputs = [ + checkInputs = [ dateutil pygments repeated_test unittest2 + pytest ]; - - propagatedBuildInputs = [ + + propagatedBuildInputs = [ attrs docutils od @@ -36,6 +38,10 @@ buildPythonPackage rec { six ]; + checkPhase = '' + pytest + ''; + meta = with stdenv.lib; { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; From 3b9951127f5f8d7479d4f15806e67d867e913ae2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:47:24 -0800 Subject: [PATCH 545/684] pythonPackages.colorcet: update tests --- pkgs/development/python-modules/colorcet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 4ae6dd8e4795..e4288745d960 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc ln -s $HOME/.config/matplotlib $HOME/.matplotlib - pytest colorcet + # requires other backends to be available + pytest colorcet -k 'not matplotlib_default_colormap_plot' ''; meta = with stdenv.lib; { From 7f223d2f7a13965e683d55edc013b2b1276daf45 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 22 Dec 2019 15:47:49 -0800 Subject: [PATCH 546/684] pythonPackages.fonttools: python2 no longer supported --- pkgs/development/python-modules/fonttools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 604b09e4b03b..f85afa770210 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , numpy , pytest , pytestrunner @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "fonttools"; version = "4.2.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; From d5b0c114a3648078fe6422ac90c119d03a8f66aa Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 22 Dec 2019 21:15:56 -0500 Subject: [PATCH 547/684] pythonPackages.jedi: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 0df9404f1561..eb3cdfaadd87 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"; + sha256 = "e909527104a903606dd63bea6e8e888833f0ef087057829b89a18364a856f807"; }; postPatch = '' From 5c100b163d86e5e257f90aa2804aaae92f824b54 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:02:46 -0800 Subject: [PATCH 548/684] pythonPackages.azure-mgmt-servicefabric: fix build --- .../python-modules/azure-mgmt-servicefabric/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 9c849829a127..03084e11cf3f 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still needed for overriding to previous versions + # E.g azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From a1227914e1685b0660907c07e5b51dee84c9180d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:16:03 -0800 Subject: [PATCH 549/684] python3Packages.azure-mgmt-dns: fix build --- pkgs/development/python-modules/azure-mgmt-dns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 89ae5912b391..0f1527f688b8 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still needed for when the version is overrided + # to previous versions. E.g azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 3b27da9f3885cb391382d1035828340046ee4ae7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:18:47 -0800 Subject: [PATCH 550/684] python3Packages.azure-mgmt-keyvault: fix build --- .../python-modules/azure-mgmt-keyvault/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index e3529bda8d2f..26918fbd7db6 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still need when overriding to prevoius versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 4e8b34cc5e8951f4a4012fb42baf2df240b061d6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:19:00 -0800 Subject: [PATCH 551/684] devpi-server: fix tests --- pkgs/development/tools/devpi-server/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 0408c8ed01bd..4c8d0276d1ad 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -33,8 +33,11 @@ python3Packages.buildPythonApplication rec { ] ++ stdenv.lib.optionals isPy27 [ mock ]; # test_genconfig.py needs devpi-server on PATH + # root_passwd_hash tries to write to store checkPhase = '' - PATH=$PATH:$out/bin pytest ./test_devpi_server --slow -rfsxX + PATH=$PATH:$out/bin HOME=$TMPDIR pytest \ + ./test_devpi_server --slow -rfsxX \ + -k 'not root_passwd_hash_option' ''; meta = with stdenv.lib;{ From 4cf4be7ac60c9e63f86f75b425ce08b2882a9bbf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:21:39 -0800 Subject: [PATCH 552/684] python3Packages.azure-mgmt-consumption: fix build --- .../python-modules/azure-mgmt-consumption/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index b69e4b649deb..de4a1338611d 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -24,9 +24,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 0e700d79c8d355f6cb731398c02b613c8b6af680 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:21:55 -0800 Subject: [PATCH 553/684] python3Packages.azure-mgmt-datamigration: fix build --- .../python-modules/azure-mgmt-datamigration/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index dc889deba12a..93c294e4be95 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 3ecc1f94be821fbd7df39e044136914418fdc027 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:25:34 -0800 Subject: [PATCH 554/684] python3Packages.azure-mgmt-devtestlabs: fix build --- .../python-modules/azure-mgmt-devtestlabs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 546ec5ab8405..756af164a719 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From e23712ab688d92dbf4b66955ace49780f596d666 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:25:44 -0800 Subject: [PATCH 555/684] python3Packages.azure-mgmt-msi: fix build --- pkgs/development/python-modules/azure-mgmt-msi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 87e70c2fdcc9..328e81c8fe79 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 264211ecbf139e7ed89e2ee8b016d1ceb2a9dfeb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 09:26:30 -0800 Subject: [PATCH 556/684] python3Packages.azure-mgmt-relay: fix build --- pkgs/development/python-modules/azure-mgmt-relay/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 5046bf8740fd..b60a82a7b1ad 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -24,9 +24,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests From 0e29b98c1df908326d5b2a0e3b34c2944d1d1f02 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 23 Dec 2019 12:37:10 -0800 Subject: [PATCH 557/684] python3Packages.uproot: fix tests --- pkgs/development/python-modules/uproot/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e822e56aae6c..812ff15242cd 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -43,8 +43,11 @@ buildPythonPackage rec { ]; # skip tests which do network calls + # test_compression.py is missing zstandard package checkPhase = '' - pytest tests -k 'not hist_in_tree and not branch_auto_interpretation' + pytest tests -k 'not hist_in_tree \ + and not branch_auto_interpretation' \ + --ignore=tests/test_compression.py ''; meta = with lib; { From 0838e5c4ef424ba3b8ce26da26a3216b15b317d9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:14:00 -0800 Subject: [PATCH 558/684] pythonPackages.mozdevice: fix hash and build --- .../python-modules/marionette-harness/mozdevice.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 8954f579c7f6..9b5216899367 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, mozlog , moznetwork , mozprocess }: @@ -16,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; }; - propagatedBuildInputs = [ moznetwork mozprocess ]; + propagatedBuildInputs = [ mozlog moznetwork mozprocess ]; meta = { description = "Mozilla-authored device management"; From 03a750545b7bda721f996d4f17322ddc61c03c2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:18:05 -0800 Subject: [PATCH 559/684] pythonPackages.mozprofile: 2.3.0 -> 2.4.0 --- .../python-modules/marionette-harness/mozprofile.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 9c8e10c7fd01..dda9e07d5e5c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sha256 = "09l18x72vahq7il9nj6qj7la2d21vvbcn9szlm3vsvsbkz68w0yk"; }; - propagatedBuildInputs = [ mozlog mozfile mozhttpd wptserve ]; + propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; + + checkInputs = [ wptserve ]; meta = { description = "Mozilla application profile handling library"; From fc5373cbc287038d269eaae6489cca8b0efbde13 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:24:42 -0800 Subject: [PATCH 560/684] pythonPackages.keyring-alt: python2 no longer supported --- pkgs/development/python-modules/keyrings-alt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index c7ec617f4f2c..aa873b63ab91 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm }: buildPythonPackage rec { pname = "keyrings.alt"; version = "3.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 8ab3ba1f233790e5f3892df6ead2579fc9619b97 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:28:23 -0800 Subject: [PATCH 561/684] pythonPackages.ppft: disable tests tests are no longer packaged with pypi package --- pkgs/development/python-modules/ppft/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 5beed26cb200..101c10b1d12d 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -13,12 +13,11 @@ buildPythonPackage rec { sha256 = "9e2173042edd5cc9c7bee0d7731873f17fcdce0e42e4b7ab68857d0de7b631fc"; }; - checkPhase = '' - python -m ppft.tests - ''; - propagatedBuildInputs = [ six ]; + # tests no longer packages on pypi + doCheck = false; + meta = with stdenv.lib; { description = "Distributed and parallel python"; homepage = https://github.com/uqfoundation; From d149ed1d81892f0ff5c4a05517fd7c49e0846bad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:35:15 -0800 Subject: [PATCH 562/684] pythonPackages.partd: python2 no longer supported --- pkgs/development/python-modules/partd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 4d625f782001..e8a148edb231 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , locket , numpy @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "partd"; version = "1.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -32,4 +34,4 @@ buildPythonPackage rec { license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/dask/partd/; }; -} \ No newline at end of file +} From 53ec7111d8ddd1c15766b70eb0d9464f51c34388 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 01:46:14 -0800 Subject: [PATCH 563/684] pythonPackages.psd-tools: mark broken missing packbits from nixpkgs --- .../python-modules/psd-tools/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index b4d4783ced78..9b6baeebda93 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -1,21 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, - docopt, pillow +{ lib, buildPythonPackage, fetchPypi, isPy27 +, docopt +, pillow +, enum34 }: buildPythonPackage rec { pname = "psd-tools"; version = "1.8.34"; - meta = { - description = "Python package for reading Adobe Photoshop PSD files"; - homepage = https://github.com/kmike/psd-tools; - license = lib.licenses.mit; - }; - src = fetchPypi { inherit pname version; sha256 = "db471c867399f7a9cc31f9e83b1e6734411c44b26dcecaaefe04c1141f606707"; }; - propagatedBuildInputs = [ docopt pillow ]; + propagatedBuildInputs = [ + docopt + pillow + ] ++ lib.optionals isPy27 [ enum34 ]; + + meta = { + description = "Python package for reading Adobe Photoshop PSD files"; + homepage = https://github.com/kmike/psd-tools; + license = lib.licenses.mit; + broken = true; # missing packbits from nixpkgs + }; } From ec1dc42420b1640007a2a877c122cbbb23226a45 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 02:07:26 -0800 Subject: [PATCH 564/684] python35Packages.ipython: python35 not supported --- pkgs/development/python-modules/ipython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e18260d1aab2..6b9da6e882f2 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ipython"; version = "7.10.2"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 0d663fc5118189b268563da840dd77536908feed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:15:33 -0800 Subject: [PATCH 565/684] python35Packages.ipython: freeze at 7.9.0 --- .../python-modules/ipython/7.9.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/ipython/7.9.nix diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix new file mode 100644 index 000000000000..c097bdbe9e1d --- /dev/null +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +# Runtime dependencies +, jedi +, decorator +, pickleshare +, traitlets +, prompt_toolkit +, pexpect +, appnope +, backcall +, fetchpatch +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "7.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments ]; + + propagatedBuildInputs = [ + jedi + decorator + pickleshare + traitlets + prompt_toolkit + pygments + pexpect + backcall + ] ++ lib.optionals stdenv.isDarwin [appnope]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "IPython" + ]; + + meta = with lib; { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4936330ce4e..faa2b1695fcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3715,8 +3715,10 @@ in { ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - ipython = if pythonOlder "3.5" then + ipython = if isPy27 then callPackage ../development/python-modules/ipython/5.nix { } + else if isPy35 then + callPackage ../development/python-modules/ipython/7.9.nix { } else callPackage ../development/python-modules/ipython { }; From dd2a59047fef0842d0181be0f0d0e4b6a5c3349b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:21:47 -0800 Subject: [PATCH 566/684] pythonPackages.django-contrib-comments: add six dep --- .../python-modules/django_contrib_comments/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 9603929406c3..12d8c220affd 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , django +, six }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { homepage = https://github.com/django/django-contrib-comments; From 482a0813398a19c8907e5bda8518d614bebb9f8f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:34:15 -0800 Subject: [PATCH 567/684] pythonPackages.magic-wormhole-mailbox-server: disable python2 tests unable to load zope.interface module --- .../magic-wormhole-mailbox-server/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index e2662e7e5dd7..28d09672584c 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; @@ -10,10 +10,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ]; - checkInputs = [ treq mock ]; + # zope.interface import issue + doCheck = !isPy27; + checkInputs = [ treq mock pytest ]; checkPhase = '' - trial wormhole_mailbox_server + pytest ''; meta = with stdenv.lib; { From 976731dcaaabd52ab39b0331501d947eb829973a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:35:09 -0800 Subject: [PATCH 568/684] pythonPackages.magic-wormhole: disable python2 tests unable to load zope.interface --- pkgs/development/python-modules/magic-wormhole/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 557d3f157ed9..5db5c28a4cb5 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , spake2 , pynacl , six @@ -18,7 +19,6 @@ , mock , magic-wormhole-transit-relay , magic-wormhole-mailbox-server -, isPy27 }: buildPythonPackage rec { @@ -42,6 +42,8 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 ''; + # zope.interface issue + doCheck = !isPy27; preCheck = '' export PATH=$out/bin:$PATH export LANG="en_US.UTF-8" From b075a26597f27ac9db9650661fae7bea1a71c31d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:35:45 -0800 Subject: [PATCH 569/684] pythonPackages.txtorcon: disable python2 tests unable to load zope.interface --- pkgs/development/python-modules/txtorcon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index c2c0fb941fae..3b60c63d964d 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15"; }; + # zope.interface issue + doCheck = isPy3k; # Skip a failing test until fixed upstream: # https://github.com/meejah/txtorcon/issues/250 checkPhase = '' From 2ab313317bc6998c3be979ae20939fbbd14a7a98 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:51:16 -0800 Subject: [PATCH 570/684] pythonPackages.monty: python2 no longer supported --- pkgs/development/python-modules/monty/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 361be1bf184b..427f0af45730 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , nose , numpy , six @@ -15,6 +16,7 @@ buildPythonPackage rec { pname = "monty"; version = "3.0.2"; + disabled = isPy27; # uses type annotations # No tests in Pypi src = fetchFromGitHub { From 37070fcd116e560ac35effe7b172c13e072ae3b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 09:51:55 -0800 Subject: [PATCH 571/684] pythonPackages.remotecv: mark broken pillow no longer supports truncated images --- pkgs/development/python-modules/remotecv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index a4d1dcc485ec..5c401fe799b5 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -34,5 +34,6 @@ buildPythonPackage rec { homepage = https://github.com/thumbor/remotecv/wiki; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + broken = true; # no longer compatible with latest pillow }; } From cc3b6aa322f307580d48c975a3b86b4462b645d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Dec 2019 23:04:07 -0800 Subject: [PATCH 572/684] pythonPackages.nevow: fix build --- pkgs/development/python-modules/nevow/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 26d915c7e562..6054e6d3a732 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -10,14 +10,6 @@ buildPythonPackage rec { sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; }; - patches = [ - # Fix builds against recent Twisted. - (fetchpatch { - url = "https://github.com/twisted/nevow/commit/f1b366f1a73009b6a1df12fa6f4dc464c564c944.patch"; - sha256 = "147fibcbqh715in8cbkp7jlkh4b3qvn95v1mv9si0ln1747wbby2"; - }) - ]; - propagatedBuildInputs = [ twisted ]; checkInputs = [ twisted ]; From 1c39c144b100610e3d5fed8687787dc6c6b4903b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:05 +0100 Subject: [PATCH 573/684] python: annoy: 1.16.2 -> 1.16.3 --- pkgs/development/python-modules/annoy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index e3d32e6a0694..b836d4c93b5e 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.16.2"; + version = "1.16.3"; pname = "annoy"; src = fetchPypi { inherit pname version; - sha256 = "41348e813fe7125eda3e2229a075eba3d065173ba6c5f20c545bb9c2932633fa"; + sha256 = "fe2779664bd8846f2d67191a7e6010b8df890ac4586336748fd0697f31654379"; }; checkInputs = [ From 3a8b695f25732a2e34082292672dcb8b55148b3c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:05 +0100 Subject: [PATCH 574/684] python: astunparse: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/astunparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 8dbb4da70603..56570295dee7 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "astunparse"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67"; + sha256 = "5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872"; }; propagatedBuildInputs = [ six wheel ]; From 8a9e519503351d1615ef8e5e04a501e60c84c8bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:05 +0100 Subject: [PATCH 575/684] python: awkward1: 0.1.32 -> 0.1.38 --- pkgs/development/python-modules/awkward1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index e40148f720b7..a35a97c5e024 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.1.32"; + version = "0.1.38"; src = fetchPypi { inherit pname version; - sha256 = "3b3c8ef1382074807d67a0d0051a3a611452f4423b1d128a483eb5d2b0d1b347"; + sha256 = "1c87defa8c1661ffe36f8a785fa9a60ae3b70484984a935e710cd8cb1f763fd7"; }; nativeBuildInputs = [ cmake ]; From f061f21c4e1effac4b506681ad2b6eb116bde3ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:05 +0100 Subject: [PATCH 576/684] python: aws-adfs: 1.21.1 -> 1.21.2 --- pkgs/development/python-modules/aws-adfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 9772a14afd56..0f80b03811c2 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.21.1"; + version = "1.21.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "18c93a1a8c6462d042ad5dc204c7449766b8e13fe11db51da269ec9e1dc8091e"; + sha256 = "ba96e71404474350b2c3ae4d5cb2dd25e9267b6d0680933c5711a51ea364e3bc"; }; # Relax version constraint From 98e5b0289f478ad096d0a150d9da5bbcfa31da13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:05 +0100 Subject: [PATCH 577/684] python: aws-sam-translator: 1.19.0 -> 1.19.1 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index e3fa33cdb05b..732d5fba528e 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "28efbfa3df5382bf611366eeadfe2d49d8a82f2c2b6e537bce680b9eb0702ec5"; + sha256 = "a62f31ac81a9f36a89ba61b147c5df5819e73af3562859711191354d86836326"; }; # Tests are not included in the PyPI package From 9fb0efee1f706e20038f7fb19e42b7990c33ef9a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 578/684] python: azure-common: 1.1.23 -> 1.1.24 --- pkgs/development/python-modules/azure-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 0b46506960c1..b842a66cd278 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.23"; + version = "1.1.24"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "53b1195b8f20943ccc0e71a17849258f7781bc6db1c72edc7d6c055f79bd54e3"; + sha256 = "184ad6a05a3089dfdc1ce07c1cbfa489bbc45b5f6f56e848cac0851e6443da21"; }; propagatedBuildInputs = [ From 2e8908f441b845d71e8e2de5153d693bc42e65d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 579/684] python: beautifulsoup4: 4.8.1 -> 4.8.2 --- pkgs/development/python-modules/beautifulsoup4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index c8e8c100616c..1720738b169b 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.8.1"; + version = "4.8.2"; src = fetchPypi { inherit pname version; - sha256 = "6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931"; + sha256 = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a"; }; checkInputs = [ pytest ]; From 9ad9461844329674da7ecd91786c04f100aacc49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 580/684] python: browser-cookie3: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/browser-cookie3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index c0e53b8bb708..13eea3e21fd4 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "af5cb74fcee3a7b76391cd1eaf653a70b179ed6026cdeba2b3512f09c8ade568"; + sha256 = "42e73e0276083ff162080860cd039138760921a56a0f316775cecee37d444c3f"; }; disabled = !isPy3k; From d6719b9645c798d26c3bcd4c3b78bdbe3e66eced Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 581/684] python: CacheControl: 0.12.5 -> 0.12.6 --- pkgs/development/python-modules/cachecontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 7fedf8c5461b..693646c80a4d 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.12.5"; + version = "0.12.6"; pname = "CacheControl"; src = fetchPypi { inherit pname version; - sha256 = "cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"; + sha256 = "be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"; }; checkInputs = [ pytest ]; From 49b345a0a1f6fa462269f1d5bf4c34097fabcc54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 582/684] python: cfn-lint: 0.26.1 -> 0.26.2 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 915ff85db11c..7b1ef63767d9 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.26.1"; + version = "0.26.2"; src = fetchPypi { inherit pname version; - sha256 = "648c9fc70abc479183c63e53eebaae5a9d5236480b55e7fae033a727c21592fd"; + sha256 = "5449313b5f176024bd5fd6ebe69ce986a2d9b8a9d6a147b2d442c8d9fa99a6c5"; }; propagatedBuildInputs = [ From f40e896b32d00121e5e896ade0879ce806bbe181 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 583/684] python: dask: 2.9.0 -> 2.9.1 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index a857925d7b76..5a3302945967 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dask"; - version = "2.9.0"; + version = "2.9.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1w1hqr8vyx6ygwflj2737dcy0mmgvrc0s602gnny8pzlcbs9m76b"; + sha256 = "eec200032922b2249f7f1061f8701eaf3e68488cfa78ff2b47c3262f442bede7"; }; checkInputs = [ pytest ]; From 1fd606b5bafe1ff5205b527dd0b3ac601360ca37 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 584/684] python: distributed: 2.9.0 -> 2.9.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 97c2caabac8c..951593bac972 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.9.0"; + version = "2.9.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "b66a15d6c02c28dd07e815d09cd77dab8484004533d38895714a5f10c7e7e325"; + sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; From 2a2b9801073d6f34b67e72f759c6102d3c735c72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 585/684] python: django-pglocks: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/django-pglocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index cb8c5f526306..da1dfe21df27 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-pglocks"; - version = "1.0.3"; + version = "1.0.4"; meta = { description = "PostgreSQL locking context managers and functions for Django."; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "daa3323de355b9057d8f37143e2ae8d283925fd25128ab66bb8c700d000111d9"; + sha256 = "3c47c66fbfbd268ef46269673a0516a039539b0972b8ed2ec9cfee44c4b65523"; }; buildInputs = [ django ]; From d244fd1f622c469474f031f0192b608dd53c93e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:06 +0100 Subject: [PATCH 586/684] python: django-treebeard: 4.3 -> 4.3.1 --- pkgs/development/python-modules/django_treebeard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 5c45b18be640..d4b3464b6aeb 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.3"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c21db06a8d4943bf2a28d9d7a119058698fb76116df2679ecbf15a46a501de42"; + sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a"; }; buildInputs = [ pytest ]; From 59ba17fc7158a0213fceaf625b6020d52e4035f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 587/684] python: dnslib: 0.9.10 -> 0.9.12 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 65f45ca86f6b..e6ec04bb79e2 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.10"; + version = "0.9.12"; src = fetchPypi { inherit pname version; - sha256 = "666bf55274a630a2925411c4ea9ca724529299bbe70f91979ad99c72c5e5099e"; + sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; From ffc8cce90de059a2642e695829748012088d99b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 588/684] python: eyeD3: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/eyed3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 8ac7b597a4cb..47602afa07d7 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -13,13 +13,13 @@ }: buildPythonPackage rec { - version = "0.8.11"; + version = "0.8.12"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0e4c9b9b42257deb9c38c112dbe44e1203dea686d454dc76adb72ded25ac878c"; + sha256 = "e54eec0a03fb8e7e9e8b509546c6d92efbc871ea7597611fe2c16f03e1c94b6d"; }; # https://github.com/nicfit/eyeD3/pull/284 From 5c8b97b96099fc0b8cc3cec4b5a3a0cd0a7f082f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 589/684] python: foolscap: 0.13.1 -> 0.13.2 --- pkgs/development/python-modules/foolscap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 8680ff2d2aad..a9ab0db1ed92 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.13.1"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "0sqxp4fshnpcv69c2j04v8c22pjak28iwscxv998h2s3054knxz2"; + sha256 = "8498c7e9eaecb5b19be74b18d55c2086440be08de29f2bb507f9b505757467ff"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; From 1ae98eeaed1bc6fbc90b33360cc1d50e80f8eb07 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 590/684] python: gym: 0.15.3 -> 0.15.4 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 52171470c271..d90ded1fb5fa 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.15.3"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc"; + sha256 = "3b930cbe1c76bbd30455b5e82ba723dea94159a5f988e927f443324bf7cc7ddd"; }; postPatch = '' From 68450a1070eb3eb584713ef28d91f1403a62ca2b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 591/684] python: holidays: 0.9.11 -> 0.9.12 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 3909651ff26f..ebde21a48217 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.9.11"; + version = "0.9.12"; src = fetchPypi { inherit pname version; - sha256 = "1g0irhh4kq3zy1disc9i5746p72a72s5j1q1cxhbdkwnnn9dnpwi"; + sha256 = "3182c4a6fef8d01a829468362ace9c3bba7645873610535fef53454dbb4ea092"; }; propagatedBuildInputs = [ six dateutil ]; From ae33d2b920b3b0d94f935419f2518c74c4b4ab26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 592/684] python: identify: 1.4.8 -> 1.4.9 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index e5822349bac1..bfe039382aca 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.8"; + version = "1.4.9"; src = fetchPypi { inherit pname version; - sha256 = "7782115794ec28b011702815d9f5e532244560cd2bf0789c4f09381d43befd90"; + sha256 = "6f44e637caa40d1b4cb37f6ed3b262ede74901d28b1cc5b1fc07360871edd65d"; }; # Tests not included in PyPI tarball From a918f5def510c0603aabca21a3fc0a62681327f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 593/684] python: isbnlib: 3.9.9 -> 3.9.10 --- pkgs/development/python-modules/isbnlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 7ad81da27d23..af12ba587d44 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.9"; + version = "3.9.10"; src = fetchPypi { inherit pname version; - sha256 = "ba2d5a86a70db0f1951df479205e9144d9e55b8af4995b3857a79a30c6ff16ab"; + sha256 = "1a389556cc5cf82b7ad95924710101e3bd06d809d6f889a3f437975b275af944"; }; checkInputs = [ From 33c0793d1aba6228b9fb7924a2df17d27d58ea58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 594/684] python: jupytext: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index b5b010688542..961eb43f03b5 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "e0b23c566dd3cf3a3a3bdcd880383d7fab79a5bbf0da6e5396818ac23a1ecf8a"; + sha256 = "132bad60c63debfb371a691cb6668a19938ec268599e9c49f1531a3bf0be7b1c"; }; propagatedBuildInputs = [ From ef13eb60ee74cba486c4b02ae14fcdda47ff9508 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 595/684] python: keyring: 20.0.0 -> 20.0.1 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 1694b01b75ae..8f7ae56de049 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "20.0.0"; + version = "20.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fc9cadedae35b77141f670f84c10a657147d2e526348698c93dd77f039979729"; + sha256 = "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"; }; nativeBuildInputs = [ setuptools_scm ]; From a435bdbb3ce80a0996ba3f29e180a22650581709 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 596/684] python: maxminddb: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/maxminddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 645ecddd1635..6556ade818a2 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.1"; + version = "1.5.2"; pname = "maxminddb"; src = fetchPypi { inherit pname version; - sha256 = "0y9giw81k4wdmpryr4k42w50z292mf364a6vs1vxf83ksc9ig6j4"; + sha256 = "d0ce131d901eb11669996b49a59f410efd3da2c6dbe2c0094fe2fef8d85b6336"; }; propagatedBuildInputs = [ ipaddress ]; From 77d6cfce327eee7d2c9250050acf305af59914d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 597/684] python: mecab-python3: 0.996.2 -> 0.996.3 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index df691fb05c80..263a71254ed6 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.996.2"; + version = "0.996.3"; src = fetchPypi { inherit pname version; - sha256 = "a80383fba343dad247b486a9afa486b7f0ec6244cb8bbf2d6a24d2fab5f19180"; + sha256 = "1cedc968ef5bcbb2a6ece3bb4eb26e9569d89f3277dc2066ea0ce1341ab7d3b9"; }; nativeBuildInputs = [ From 2c0f1c1f19a70036bd268c42df40f7313170b911 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 598/684] python: mechanize: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/mechanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 9669bcc30e70..1d63a6e2b6a1 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "9fff89e973bdf1aee75a351bd4dde53ca51a7e76944ddeae3ea3b6ad6c46045c"; + sha256 = "6355c11141f6d4b54a17fc2106944806b5db2711e60b120d15d83db438c333fd"; }; propagatedBuildInputs = [ html5lib ]; From 18bb25dbca61bc94b9556a82c14b07125990abeb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:07 +0100 Subject: [PATCH 599/684] python: multidict: 4.7.1 -> 4.7.2 --- pkgs/development/python-modules/multidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 1cb24edac213..4673f841ee34 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.7.1"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "d7b6da08538302c5245cd3103f333655ba7f274915f1f5121c4f4b5fbdb3febe"; + sha256 = "d4dafdcfbf0ac80fc5f00603f0ce43e487c654ae34a656e4749f175d9832b1b5"; }; checkInputs = [ pytest pytestrunner pytestcov ]; From 0c3047777e84da46709c6a5d0f022e6007a78153 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 600/684] python: ncclient: 0.6.6 -> 0.6.7 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 58d88e8dbf89..ca0a9d34b3ec 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.6"; + version = "0.6.7"; src = fetchPypi { inherit pname version; - sha256 = "2b367354d1cd25b79b8798a0b4c1949590d890057f2a252e6e970a9ab744e009"; + sha256 = "efdf3c868cd9f104d4e9fe4c233df78bfbbed4b3d78ba19dc27cec3cf6a63680"; }; checkInputs = [ nose rednose ]; From f2e4ea0d7dddbe3da0b8ca59d7776ddb27a93a65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 601/684] python: numpydoc: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/numpydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index e965f332fc95..fb3b9af76f60 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname; inherit version; - sha256 = "09x6l1a4dcvj7001bvcmcayg1nwqwhaxlwbp6kzj9qrk57lqx3z0"; + sha256 = "9140669e6b915f42c6ce7fef704483ba9b0aaa9ac8e425ea89c76fe40478f642"; }; checkInputs = [ nose pytest ]; From f6e327b50c964d22d0f2321b4d2e95d2d28df3cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 602/684] python: phonopy: 2.4.1.post5 -> 2.4.2 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e38c24087343..e67932f4a880 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.4.1.post5"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "8a393ed79a600fe6371677890198a2d05ad27c37935aa83977f5244dfe3eac96"; + sha256 = "6e6ce41ce8a51723b94d974adfee032cddce5b9300984dd23b59e101ed0a2861"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; From 7f8576939aa1817d8d3e9a76c6cf14fbf78c3d62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 603/684] python: psd-tools: 1.8.34 -> 1.8.35 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 9b6baeebda93..edf502171e78 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.8.34"; + version = "1.8.35"; src = fetchPypi { inherit pname version; - sha256 = "db471c867399f7a9cc31f9e83b1e6734411c44b26dcecaaefe04c1141f606707"; + sha256 = "379211cf98ebafbe129088a5c92f575e1ccd7987c40bad9520c209e51008df00"; }; propagatedBuildInputs = [ From 3a7d95c2afd0bfb1ab42d7ad4037e16e0b1f0f36 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 604/684] python: py: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 9c5ada22b146..7b84d72fde48 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"; + sha256 = "5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa"; }; # Circular dependency on pytest From 375f1f897372b0dfb5d942f8baf9cc70188becce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 605/684] python: pybullet: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index d0fc6709c2e3..d7b46f07749d 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "5a75a4fc828f59a538e6b6381cfb37019193829beca4da2acf8cd0a749cf63b8"; + sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403"; }; buildInputs = [ From 4d6c3ba137bbf41c14a54e8be120c429b36ddeda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 606/684] python: pyfakefs: 3.7 -> 3.7.1 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index c946b72f172c..6bc2be39fd36 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { - version = "3.7"; + version = "3.7.1"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "74cb0c53959f185f6b0fe6c9f6882359b2390df861d4857a9f1a95481b466ace"; + sha256 = "1eb68bb250cc14310a6e33c197cbe2c8d93832b543f534e29b58286712f7e2b2"; }; postPatch = '' From ddd9bbc8280eedb0f408c734b8b5528f046c650a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 607/684] python: pymatgen: 2019.12.3 -> 2019.12.22 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 0d0f1d36f4f9..ecc35d357360 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.12.3"; + version = "2019.12.22"; src = fetchPypi { inherit pname version; - sha256 = "cb2d10d2dad9f4949a34f8b96a9ff06aaa6df45f9faa75307068a35992ac67a9"; + sha256 = "0ffc6efcc2ba15bff22cca29c07b93b01fac400f649c41d5dd01bfff7915f80b"; }; nativeBuildInputs = [ glibcLocales ]; From c3792becb2da0fd6a4d107108a5d40ac824d0bae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 608/684] python: pymavlink: 2.4.2 -> 2.4.3 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 56a5bf079893..b909886ddb5b 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.2"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0vxqn36wldvpzag399a54r37bdgx052gv1k7akbnddcwry0n9vl0"; + sha256 = "332d3d0291b4482641a5b3cd97e879817f50eb9c2b2ddcc30d51d619bad01b51"; }; propagatedBuildInputs = [ future lxml ]; From d3f6e045512ac7b547b7bf1193d4026c97eefa93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 609/684] python: PyMuPDF: 1.16.9 -> 1.16.10 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index c3f36c9c2193..4ff50ad7b96c 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.9"; + version = "1.16.10"; src = fetchPypi { inherit pname version; - sha256 = "09h960ns42bbrv10bg99fad193yvg64snhw8x7d78wg3qqvnnicc"; + sha256 = "d7893954f97fa6087629f3875f3be066dab51302e7c73f4c98c0516a8e2893fb"; }; patchPhase = '' From fc939d5385a3199fb4e32b863ab73b8c64854b13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 610/684] python: pyodbc: 4.0.27 -> 4.0.28 --- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 8064d9b6d575..bef4969d7d2e 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.27"; + version = "4.0.28"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib"; + sha256 = "510643354c4c687ed96bf7e7cec4d02d6c626ecf3e18696f5a0228dd6d11b769"; }; buildInputs = [ unixODBC ]; From e6a3eeba8ad7dd55e4a77b3aa47a2213d75d513d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:08 +0100 Subject: [PATCH 611/684] python: pyparsing: 2.4.5 -> 2.4.6 --- pkgs/development/python-modules/pyparsing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 854ca4d90eeb..a47c271b76fd 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.5"; + version = "2.4.6"; src = fetchPypi { inherit pname version; - sha256 = "4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"; + sha256 = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f"; }; # Not everything necessary to run the tests is included in the distribution From b95c9a3bfd6d82f7aada81a688815728a806ad8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 612/684] python: pytest: 4.6.7 -> 4.6.8 --- pkgs/development/python-modules/pytest/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 1148c87f0ba4..2524dc61afdc 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.7"; + version = "4.6.8"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9ea149066f566c943d3122f4b1cf1b577cab73189d11f490b54703fa5fa9df50"; + sha256 = "6192875be8af57b694b7c4904e909680102befcb99e610ef3d9f786952f795aa"; }; checkInputs = [ hypothesis mock ]; From aae6fe2c2c47bca15a61d42532e6f9882c76d6f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 613/684] python: pyvcd: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/pyvcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 0f97616e640e..aff3280e86ce 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -6,12 +6,12 @@ , pytest }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.1.6"; pname = "pyvcd"; src = fetchPypi { inherit pname version; - sha256 = "9e796f8d00d8392716bef9759f118231f5d77d2fff79d8a32151e3bb5579ff25"; + sha256 = "285fcd96c3ee482e7b222bdd01d5dd19c2f5a0ad9b8e950baa98d386a2758c8f"; }; buildInputs = [ setuptools_scm ]; From 21c8fc476b4a52108cbaf0dea7e31095f906b6bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 614/684] python: qimage2ndarray: 1.8 -> 1.8.2 --- pkgs/development/python-modules/qimage2ndarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 73a0004e6546..646d326fede3 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8"; + version = "1.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7b9eb08a9be27f5439289d90d7d5a5942aad403d5634fe336eb915678c65db48"; + sha256 = "0f792693a0f1cd5f93fbf73bc3fb2d511fb9cceed3c9308bfb200f38c19a5545"; }; checkInputs = [ From f53276a00cd0b3ac67dfbd934574c9451b39c7bd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 615/684] python: regex: 2019.12.19 -> 2019.12.20 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 765a42de14d2..5a0cb50903a7 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.12.19"; + version = "2019.12.20"; src = fetchPypi { inherit pname version; - sha256 = "8355eaa64724a0fdb010a1654b77cb3e375dc08b7f592cc4a1c05ac606aa481c"; + sha256 = "106e25a841921d8259dcef2a42786caae35bc750fb996f830065b3dfaa67b77e"; }; postCheck = '' From 4cac0fd11238e2d335ff31426977332f5b99d2a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 616/684] python: responses: 0.10.8 -> 0.10.9 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index e9fed28596be..e98aad824b64 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.8"; + version = "0.10.9"; src = fetchPypi { inherit pname version; - sha256 = "caa5f7afd14666f970ea54a4125a639f6491218b45a013c6dc2544f0473ae2b8"; + sha256 = "8ce8cb4e7e1ad89336f8865af152e0563d2e7f0e0b86d2cf75f015f819409243"; }; propagatedBuildInputs = [ cookies mock requests six ]; From 165c03b691772d27a1fda7f0fe7ab85a7ea044e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 617/684] python: runway-python: 0.5.4 -> 0.5.7 --- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index c54c5d73cf6d..5c60b6379e93 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.5.4"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "c5293bca6589747db687c593b81f52dc9df8155367ffa57ddc1993a6f9d95bde"; + sha256 = "06e0138cc4cf2ddb7304502f5c7b53269ce73679c5784c8d6b423db04d179c18"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; From 24f93ef64bc78ee91e29f4499f030c552e3a027a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 618/684] python: semantic_version: 2.8.3 -> 2.8.4 --- pkgs/development/python-modules/semantic-version/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index 66499224564d..f2df3c99b2a5 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.8.3"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "9dcc6fbad58da3c4d5eee2287025e226bb05c39463f14b741357801baae9dcce"; + sha256 = "352459f640f3db86551d8054d1288608b29a96e880c7746f0a59c92879d412a3"; }; # ModuleNotFoundError: No module named 'tests' From d8118c4d3fbf63ab740f93565b33c965698533f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 619/684] python: shodan: 1.21.0 -> 1.21.1 --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index a93ad8b6ebdd..52dc89e3a962 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.21.0"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "eab999bca9d3b30e6fc549e609194ff2d6fac3caea252414e1d8d735efab8342"; + sha256 = "834dfd084fed290b2b445545b0d1cac7822f3c0ed6ba09707efb1716bb485ede"; }; propagatedBuildInputs = [ From c46d9c0e923c263ef26854175ea48750e98f740e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 620/684] python: slither-analyzer: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index f2aef6b1199e..0f12dbb8850c 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.6.8"; + version = "0.6.9"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8b3dda96f4938bbfc1d8a7775416dd480323603293c04212b59c5a35510d35c1"; + sha256 = "fb057eb7f5416ac76b6ab03bb5c20c39cb7b97c7689ce1e7244c9088bd28f513"; }; nativeBuildInputs = [ makeWrapper ]; From c69f61d71a1de7e56c44f6bcefcb37f4a97299d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 621/684] python: SPARQLWrapper: 1.8.4 -> 1.8.5 --- pkgs/development/python-modules/sparqlwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index 0a51bb5f9e84..fe400630507b 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SPARQLWrapper"; - version = "1.8.4"; + version = "1.8.5"; src = fetchPypi { inherit pname version; - sha256 = "21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9"; + sha256 = "d6a66b5b8cda141660e07aeb00472db077a98d22cb588c973209c7336850fb3c"; }; # break circular dependency loop From 0152b154c2c87c409350d4ffbcafe1be5e1ddde5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 622/684] python: tox: 3.14.2 -> 3.14.3 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 87dc5130a9c4..5cec769deccc 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.14.2"; + version = "3.14.3"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7efd010a98339209f3a8292f02909b51c58417bfc6838ab7eca14cf90f96117a"; + sha256 = "06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"; }; meta = with lib; { From 1d729f8e5ebbe9ac1eaf228dd0491c3ba4837f5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:09 +0100 Subject: [PATCH 623/684] python: typeguard: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 952e5083594a..51dc35552506 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "84f7f28bdf43efcf969e79ca2f8008fc176b0997137fc27f3625f103449cd25b"; + sha256 = "2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2"; }; buildInputs = [ setuptools_scm ]; From d6306480be86b752ff6f2a25fb2c9ceb9ebf7a70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:10 +0100 Subject: [PATCH 624/684] python: uncompyle6: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 2fa777aab350..366af37c20ea 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "4d35a3f7224ab2ee08aa4db59a8ad808eb710ce3bf5dd3c6b0996373994d6447"; + sha256 = "f8c7ba2fd486d40d9a9fc1d6ab438588d7ce1be123aabf488736ff68a05f57f7"; }; checkInputs = [ nose pytest hypothesis six ]; From 68db5205559117bb3980f78710af1ef7c70e1a91 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:10 +0100 Subject: [PATCH 625/684] python: uritemplate: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/uritemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index c469fd8dd1cc..64a2fd51ee3b 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uritemplate"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; + sha256 = "5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"; }; propagatedBuildInputs = [ simplejson ]; From 1c15acf9e53596ab9dcef506c8c529d9c0738bf5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:10 +0100 Subject: [PATCH 626/684] python: xml2rfc: 2.37.2 -> 2.37.3 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index bf00062daeac..cf4eadd99d89 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.37.2"; + version = "2.37.3"; src = fetchPypi { inherit pname version; - sha256 = "6f01f8b101eeead6de50d51411f5a58214bc156d59dadc4651b5b9a003e74db9"; + sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad"; }; propagatedBuildInputs = [ From 85fcbaeb1e20be660c4865340e43dd2b22894f31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:10 +0100 Subject: [PATCH 627/684] python: zeroconf: 0.24.2 -> 0.24.3 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index d23b84f2134e..ef45f663ceb3 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.2"; + version = "0.24.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b9a75094a79767e8351e6c4ebdf165fc790307c93dbcadd763d46067eb99ff47"; + sha256 = "de62e5067ea7ab356f7168a3562d79fececa8632ed0fad0e82f505e01fafbc6d"; }; propagatedBuildInputs = [ ifaddr ] From 70fff171045e2e0ea3a49913b7bff52cdd0820cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:28:10 +0100 Subject: [PATCH 628/684] python: zha-quirks: 0.0.28 -> 0.0.30 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 1f490fea05f9..d819a881f9f1 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.28"; + version = "0.0.30"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "021z5f5dm74amxkqnz4s1690ydprciqg23jz3n4mpjlxyxbdfj73"; + sha256 = "00731a9b9c58c4e59f6765ac0cec5e2301bdda28ef19e00e2ba752be457a61b9"; }; meta = with stdenv.lib; { From dc8444005526cdbaa86ba71f724ae29f4540c2e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Dec 2019 10:59:08 +0100 Subject: [PATCH 629/684] pythonPackages.sphinx: remove sqlalchemy Not a mandatory dependency so remove it. --- pkgs/development/python-modules/sphinx/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 6f0290294bc7..d9f64a93813d 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -16,7 +16,6 @@ , Babel , snowballstemmer , six -, sqlalchemy , whoosh , imagesize , requests @@ -56,7 +55,6 @@ buildPythonPackage rec { setuptools snowballstemmer six - sqlalchemy whoosh imagesize requests From f4e74edd8c14f82f5e145f5b7d29e64d39f1e0aa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Dec 2019 18:12:51 +0100 Subject: [PATCH 630/684] python.pkgs.wrapPython: get rid of warning When `makeWrapperArgs` variable is not set, `declare -p makeWrapperArgs` will return with 1 and print an error message to stderr. I did not handle the non-existence case in b0633406cb70e0e4ae3470a6b49e32b38d99ac16 because I thought `mk-python-derivation` will always define `makeWrapperArgs` but `wrapProgram` can be called independently. And even with `mk-python-derivation`, `makeWrappers` will not be set unless explicitly declared in the derivation because of https://github.com/NixOS/nix/issues/1461. I was lead to believe that because the builds were succeeding and I confirmed that the mechanism fails when the variable is not defined and `-o nounset` is enabled. It appears that `wrapPython` setup hook is not running under `-o nounset`, though, invaldating the assumption. Now we are checking that the variable exists before checking its type, which will get rid of the warning and also prevent future error when `-o nounset` is enabled in the setup hook. For more information, see the discussion at https://github.com/NixOS/nixpkgs/commit/a6bb2ede232940a96150da7207a3ecd15eb6328 --- pkgs/development/interpreters/python/wrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 030b3d2b6d85..f10ba003432b 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -84,10 +84,10 @@ wrapPythonProgramsIn() { # 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 + if [[ "${makeWrapperArgs+defined}" == "defined" && "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then local -a user_args=("${makeWrapperArgs[@]}") else - local -a user_args="($makeWrapperArgs)" + local -a user_args="(${makeWrapperArgs:-})" fi local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") From 296b2ab3c437a75636d3d659b7cdbdaa569dac84 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Dec 2019 10:03:10 +0100 Subject: [PATCH 631/684] pythonPackages.Babel: remove glibcLocales and don't set LC_ALL as we already set LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; in `buildPythonPackage`. This is related to issue https://github.com/NixOS/nixpkgs/issues/74904 --- pkgs/development/python-modules/Babel/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 97b352578209..ef86aedc527b 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -11,14 +11,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytest freezegun glibcLocales ]; + checkInputs = [ pytest freezegun ]; doCheck = !stdenv.isDarwin; - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; - meta = with lib; { homepage = http://babel.edgewall.org; description = "A collection of tools for internationalizing Python applications"; From fca435937687a670d190a8f6195e07e24f704aff Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 29 Dec 2019 23:04:28 -0800 Subject: [PATCH 632/684] nbstripout: fix build --- pkgs/applications/version-management/nbstripout/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index b0a7108ac07f..797bc7824962 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,6 +1,6 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python, git, mercurial, coreutils}: -with python2Packages; +with python.pkgs; buildPythonApplication rec { version = "0.3.6"; pname = "nbstripout"; @@ -8,7 +8,7 @@ buildPythonApplication rec { # Mercurial should be added as a build input but because it's a Python # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests - checkInputs = [ pytest pytest-flake8 pytest-cram git ]; + checkInputs = [ pytest pytest-flake8 git ]; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa648c356e10..2194fcbc56c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20194,7 +20194,7 @@ in clerk = callPackage ../applications/audio/clerk { }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; + nbstripout = callPackage ../applications/version-management/nbstripout { python = python3; }; ncmpc = callPackage ../applications/audio/ncmpc { }; From 226b6c7935b90501e4133771802d055cf6f264b4 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 29 Dec 2019 20:05:01 -0500 Subject: [PATCH 633/684] pythonPackages.sqlalchemy-utils: 0.35.0 -> 0.36.0 --- pkgs/development/python-modules/sqlalchemy-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3db00057c90e..c58ec72498a0 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.35.0"; + version = "0.36.0"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0phsdcnm21qvxd00zmjd6yxbm1s0i7b1q8zrgfy8cqv9xpmz1w01"; + sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; }; propagatedBuildInputs = [ From 164408fcd43e460c30c73aa85c73b630dc5de2b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Dec 2019 18:17:23 +0100 Subject: [PATCH 634/684] pythonPackages.tifffile: fix syntax error --- pkgs/development/python-modules/tifffile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 02ca26960d04..1f0e89d03ace 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ numpy ] - ++ lib.optionals isPy27 [ futures enum34 pathlib ]; + ++ lib.optionals isPy27 [ futures enum34 pathlib ] ++ lib.optionals isPy3k [ imagecodecs-lite ]; meta = with lib; { From 99de1a8ebb9df72642c259de63c4f0d2d1c770e7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Dec 2019 18:17:34 +0100 Subject: [PATCH 635/684] pythonPackages.ipykernel: remove duplicate checkInputs --- pkgs/development/python-modules/ipykernel/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index ec1707f64c14..f4e7a1090745 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { sha256 = "1a08y677lpn80qzvv7z0smgggmr5m5ayf0bs6vds47xpxl9sss5k"; }; - checkInputs = [ flaky pytest nose ]; - propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; # https://github.com/ipython/ipykernel/pull/377 From 2093fa784a02b45628ed360d66cab75e5022eb96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2019 20:51:31 +0100 Subject: [PATCH 636/684] libreoffice: fix eval --- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/src-fresh/override.nix | 5 ++++- pkgs/applications/office/libreoffice/src-still/override.nix | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70b439a5f778..c8bb58d29213 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 = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"); + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index fb5a82b1aa8f..464965121d97 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1 +1,4 @@ -args: f: {} +{ stdenv, ... }: +attrs: { + NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 9edf76849e34..7192af019496 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,7 +1,6 @@ { stdenv, ... }: attrs: { - NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE; configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; } From 21280e418da32bb309be0ce5b97afac8efdbad1c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2019 22:01:39 +0100 Subject: [PATCH 637/684] virtualbox: fix eval --- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 66d165d09a72..6c15b2ea2ced 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -31,7 +31,7 @@ let 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" ]; + NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation"; }); in stdenv.mkDerivation { pname = "virtualbox"; From 4db0860814e820212fedd78ae08ba9998f2e0a3a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 28 Oct 2019 10:17:49 +0100 Subject: [PATCH 638/684] cri-o: fix *Flags --- pkgs/applications/virtualization/cri-o/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 29111399ae96..483c6f8b3379 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,7 +15,10 @@ , pkgconfig }: -buildGoPackage rec { +let + makeFlags = "BUILDTAGS=\"apparmor seccomp selinux + containers_image_ostree_stub\""; +in buildGoPackage rec { project = "cri-o"; version = "1.16.1"; name = "${project}-${version}${flavor}"; @@ -35,9 +38,6 @@ buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; - makeFlags = ''BUILDTAGS="apparmor seccomp selinux - containers_image_ostree_stub"''; - buildPhase = '' pushd go/src/${goPackagePath} From e5ded57aabe97617a7ca2b67494cdbc1d0fdedba Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 00:53:51 +0100 Subject: [PATCH 639/684] treewide: NIX_CFLAGS_COMPILE -> string --- pkgs/development/libraries/gdbm/default.nix | 3 --- pkgs/development/libraries/glib/default.nix | 2 +- .../libraries/libglvnd/default.nix | 4 ++-- pkgs/development/libraries/libpfm/default.nix | 2 +- .../libraries/libvdpau/default.nix | 2 +- .../libraries/openal-soft/default.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/os-specific/linux/libselinux/default.nix | 2 +- pkgs/os-specific/linux/libsepol/default.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 20 +++++++++---------- pkgs/tools/misc/fontforge/default.nix | 2 +- 11 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 972e9022235a..830a311db706 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -4,9 +4,6 @@ stdenv.mkDerivation rec { pname = "gdbm"; version = "1.18.1"; - # FIXME: remove on update to > 1.18.1 - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; - src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 67d3c35609e6..0febed9f9c96 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-Ddevbindir=${placeholder ''dev''}/bin" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=nonnull" # Default for release buildtype but passed manually because # we're using plain diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index c2a5cfbed744..55b801b0b0d5 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { --replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker" ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" "-Wno-error=array-bounds" - ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; + ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index f48c605dafd6..3398d3feb94f 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { "SYS=${stdenv.hostPlatform.uname.system}" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 792a31bcf9f9..e6a57f1e38c4 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isLinux "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; - NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 76f2861428d6..20528ac9284f 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ++ optional pulseSupport libpulseaudio ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - NIX_LDFLAGS = [] + NIX_LDFLAGS = toString ([] ++ optional alsaSupport "-lasound" - ++ optional pulseSupport "-lpulse"; + ++ optional pulseSupport "-lpulse"); meta = { description = "OpenAL alternative"; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5837361e01bc..d904637fcd38 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" "-DSQLITE_ENABLE_JSON1" diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index d8a2298f3d3f..39e97f8473c8 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 03bd0252c5ca..b31554d6cee4 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "SHLIBDIR=$(out)/lib" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; passthru = { inherit se_release se_url; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3cc976a909dd..3462801c07c4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -180,18 +180,18 @@ in stdenv.mkDerivation { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + NIX_CFLAGS_COMPILE = toString [ + # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; doCheck = false; # fails a bunch of tests diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index e012d40271b5..6239e8395981 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; buildInputs = [ From 981ae25113c13b7989e89b8b57be25d9e186a63e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 01:12:09 +0100 Subject: [PATCH 640/684] treewide: NIX_*_COMPILE -> string --- pkgs/development/compilers/openjdk/8.nix | 8 ++++---- pkgs/development/compilers/rust/rustc.nix | 4 ++-- pkgs/development/interpreters/love/0.10.nix | 2 +- pkgs/development/libraries/gtk/3.x.nix | 5 +---- pkgs/development/libraries/ilmbase/default.nix | 2 +- pkgs/development/libraries/libcaca/default.nix | 4 ++-- pkgs/development/libraries/smpeg/default.nix | 2 +- pkgs/development/python-modules/cffi/default.nix | 3 ++- pkgs/development/tools/documentation/doxygen/default.nix | 2 +- pkgs/tools/misc/timidity/default.nix | 2 +- pkgs/tools/networking/dhcp/default.nix | 2 +- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4debf10c0cb4..c6b3644fecca 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -140,7 +140,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "-Wno-error=deprecated-declarations" @@ -151,13 +151,13 @@ let "-fno-delete-null-pointer-checks" "-std=gnu++98" "-Wno-error" - ]; + ]); - NIX_LDFLAGS= lib.optionals (!headless) [ + NIX_LDFLAGS= toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 49eaeef0d9c0..44bbd05aec73 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - NIX_LDFLAGS = + NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 6a3aa9f648f4..e1ca3ded2083 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = http://love2d.org; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7f09b52d51ff..5a2d9159cac2 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -88,10 +88,7 @@ stdenv.mkDerivation rec { # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = [ - "-DG_ENABLE_DEBUG" - "-DG_DISABLE_CAST_CHECKS" - ]; + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' files=( diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index a25a590b3705..00cdda1e5708 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ automake autoconf libtool which ]; - NIX_CFLAGS_LINK = [ "-pthread" ]; + NIX_CFLAGS_LINK = "-pthread"; patches = [ ./bootstrap.patch diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8949ea8e390e..7773fe46c0ce 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext]; + ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index a7ffc146f414..4d74ee7ca063 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { homepage = http://icculus.org/smpeg/; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 15d15c23a8d2..b05aeebf9d4d 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -29,7 +29,8 @@ if isPyPy then null else buildPythonPackage rec { ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + "-Wno-unused-command-line-argument -Wno-unreachable-code"; doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate checkPhase = '' diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 0e20d690fd72..af73ce25d422 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = - stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; + stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; enableParallelBuilding = true; doCheck = false; # fails diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 318ad6e3a9dc..c307c96199f2 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; - NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; + NIX_LDFLAGS = "-ljack -L${libjack2}/lib"; instruments = fetchurl { url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index f6c204d26b7d..5e552da98dfe 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { (lib.optional stdenv.isLinux "--with-randomdev=/dev/random") ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" From ab0cfd9e036ca83bdffb8790f7cf45179441cd93 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 01:40:49 +0100 Subject: [PATCH 641/684] treewide: NIX_*_COMPILE -> string --- pkgs/applications/audio/audacity/default.nix | 2 +- .../applications/graphics/ahoviewer/default.nix | 4 +--- .../graphics/gimp/plugins/default.nix | 4 ++-- .../networking/browsers/firefox/common.nix | 4 ++-- pkgs/applications/science/logic/avy/default.nix | 4 ++-- pkgs/applications/video/aegisub/default.nix | 4 +--- pkgs/applications/video/mplayer/default.nix | 4 ++-- .../core/gnome-settings-daemon/default.nix | 8 +++----- .../libraries/argp-standalone/default.nix | 2 +- .../libraries/aws-c-common/default.nix | 6 ++---- pkgs/development/libraries/glm/default.nix | 4 +--- pkgs/development/libraries/gpgme/default.nix | 4 ++-- pkgs/development/libraries/gsl/default.nix | 2 +- pkgs/development/libraries/gsl/gsl-1_16.nix | 2 +- .../development/libraries/libbluray/default.nix | 2 +- .../development/libraries/libunique/default.nix | 2 +- pkgs/development/libraries/opencv/3.x.nix | 2 +- .../libraries/qt-4.x/4.8/default.nix | 4 ++-- .../development/libraries/qt-5/mkDerivation.nix | 4 ++-- .../libraries/qt-5/modules/qtbase.nix | 17 +++++++---------- pkgs/development/libraries/tinyxml/2.6.2.nix | 2 +- pkgs/development/libraries/usbredir/default.nix | 2 +- .../libraries/wxwidgets/2.8/default.nix | 2 +- pkgs/games/airstrike/default.nix | 4 +--- pkgs/games/armagetronad/default.nix | 2 +- pkgs/servers/mail/archiveopteryx/default.nix | 2 +- pkgs/servers/nosql/arangodb/default.nix | 2 +- pkgs/servers/sql/postgresql/default.nix | 2 +- pkgs/tools/graphics/appleseed/default.nix | 2 +- pkgs/tools/graphics/asymptote/default.nix | 2 +- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/tools/networking/altermime/default.nix | 3 ++- pkgs/tools/networking/atinout/default.nix | 2 +- pkgs/tools/video/mjpegtools/default.nix | 2 +- 34 files changed, 51 insertions(+), 65 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 2fd3e5c27fe7..57e0c52e6406 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ # LAME "-lmp3lame" # ffmpeg diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index fb06266cdc59..87bddf9099ee 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ] ++ stdenv.lib.optional useUnrar unrar; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postPatch = ''patchShebangs version.sh''; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fa29c979b050..0a06c42b5fc0 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -48,7 +48,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; patchPhase = '' sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure @@ -141,7 +141,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; src = fetchurl { url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d9dc0a4f7887..7b73027f203d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-I${glib.dev}/include/gio-unix-2.0" ] ++ lib.optionals (!isTorBrowserLike) [ @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68" && lib.versionOlder ffversion "69") - "-Wno-error=format-security"; + "-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' diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 9b59828ddab7..b43e0c6fbf1a 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation { }; buildInputs = [ cmake zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ] + NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" "-Wno-tautological-compare" "-Wc++11-compat-deprecated-writable-strings" "-Wno-deprecated" - ]; + ]); prePatch = '' sed -i -e '1i#include ' abc/src/bdd/dsd/dsd.h diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 83f7ebc29d19..123308babeae 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -108,9 +108,7 @@ stdenv.mkDerivation # this is fixed upstream though not yet in an officially released version, # should be fine remove on next release (if one ever happens) - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a75a7a11d67a..f5559e3fb6c0 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -195,11 +195,11 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - NIX_LDFLAGS = with stdenv.lib; + NIX_LDFLAGS = with stdenv.lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] - ; + ); installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 36da3349c46a..c388c4f7211b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -99,11 +99,9 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; - NIX_CFLAGS_COMPILE = [ - # Default for release buildtype but passed manually because - # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + # Default for release buildtype but passed manually because + # we're using plain + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper postFixup = '' diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 8fe3bd287c10..6544c4811875 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0"; + patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0"; preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 4286eedc87b2..b10797d3d56f 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -13,10 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ - "-Wno-nullability-extension" - "-Wno-typedef-redefinition" - ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-Wno-nullability-extension -Wno-typedef-redefinition"; meta = with lib; { description = "AWS SDK for C common core"; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 88b33601ee70..d39d6f0d7a36 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -27,9 +27,7 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ - "-DGLM_COMPILER=0" - ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; postInstall = '' mkdir -p $doc/share/doc/glm diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 63072273c2ed..ed2b5563bd37 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { # fit in the limit. https://github.com/NixOS/nix/pull/1085 ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"); checkInputs = [ which ]; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 1fd086ca23c7..966d6a8ffd5d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index e5772c8772ec..ae102ac60307 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 517251e137ef..daa349ca6309 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional withAACS libaacs; - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ (optionalString withAACS "-L${libaacs}/lib -laacs") (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") ]; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index e0022411221d..d6566978a6bb 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; # Patches from Gentoo portage patches = [ diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 97df84637ef7..642facf166a6 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; 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 632b5fc1fd5e..25953949eb76 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -206,13 +206,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # with gcc7 the warnings blow the log over Hydra's limit [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin) [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"); NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 95357c096dfd..2c6333cb0204 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -12,9 +12,9 @@ let qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] ++ (args.qmakeFlags or []); - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or []); + ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); cmakeFlags = (args.cmakeFlags or []) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index c7cb6d509dc2..cd426884d12d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -200,20 +200,17 @@ stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = - [ - "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields - ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' - ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' - ] - - ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields + ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' + ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' ] - ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"; + ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index cc7c996f7c3a..0cc4038b64e7 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = - stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; + stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; buildInputs = [ unzip ]; buildPhase = '' diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 2eee80a76969..8e43135196c9 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 38ee4376ac2d..73dac47307a9 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 19d2a01b4729..408f2817854a 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper SDL SDL_image ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; installPhase = '' ls -l diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index edb739125c01..57373d39b54c 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; }; - NIX_LDFLAGS = [ "-lSDL_image" ]; + NIX_LDFLAGS = "-lSDL_image"; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 3443a508aea4..55cc4c121f0f 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; # fix build on gcc7+ - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=builtin-declaration-mismatch" "-Wno-error=implicit-fallthrough" "-Wno-error=deprecated-copy" diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index ef75dad91517..e41930a2f485 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -17,7 +17,7 @@ let # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = lib.versionAtLeast version "3.5"; - NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast version "3.5") "-Wno-error"; preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 440375db841d..3f05b3e36c19 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -44,7 +44,7 @@ let buildFlags = [ "world" ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index d45c28528e72..cafe0bb7b11a 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { osl seexpr makeWrapper ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${openexr.dev}/include/OpenEXR" "-I${ilmbase.dev}/include/OpenEXR" "-I${openimageio.dev}/include/OpenImageIO" diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 14b15686d720..31bdba26783e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--with-context=$out/share/texmf/tex/context/third" ]; - NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ]; + NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' mv $out/share/info/asymptote/*.info $out/share/info/ diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9a071e6150f9..7610b4e56fb0 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Disable assertions which include -dev QtBase file paths. - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; configureFlags = [ "--without-python" diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index e9091086ed98..b1481b2208c6 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format" + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=format" "-Wno-error=format-truncation" "-Wno-error=pointer-compare" "-Wno-error=memset-elt-size" diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 175ba3960eef..16b3ee668da6 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "atinout-${version}"; version = "0.9.2-alpha"; - NIX_CFLAGS_COMPILE = [ "-Werror=implicit-fallthrough=0" ]; + NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0"; LANG = "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 31d26a6c72a3..3e72d8b8af59 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; - NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; + NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${SDL.dev}/include/SDL"; postPatch = '' sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure From 5f2b92e3eca8bd2d34d98e82d63783f281363f8f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 02:29:30 +0100 Subject: [PATCH 642/684] treewide: NIX_*_COMPILE -> string --- pkgs/applications/audio/chuck/default.nix | 4 ++-- pkgs/applications/audio/freewheeling/default.nix | 3 ++- pkgs/applications/audio/svox/default.nix | 2 +- pkgs/applications/misc/doomseeker/default.nix | 2 +- pkgs/applications/misc/getxbook/default.nix | 2 +- pkgs/applications/networking/irc/bip/default.nix | 2 +- pkgs/applications/science/math/calculix/default.nix | 4 +--- .../git-and-tools/svn-all-fast-export/default.nix | 4 +--- pkgs/applications/version-management/rcs/default.nix | 2 +- pkgs/applications/virtualization/docker/default.nix | 4 +--- pkgs/applications/virtualization/tini/default.nix | 5 +---- pkgs/applications/virtualization/xen/4.8.nix | 2 +- pkgs/applications/window-managers/compton/default.nix | 2 +- pkgs/desktops/enlightenment/efl.nix | 2 +- pkgs/desktops/gnome-2/platform/gtkhtml/default.nix | 2 +- pkgs/development/compilers/chez/default.nix | 2 +- pkgs/development/compilers/eql/default.nix | 2 +- pkgs/development/compilers/gerbil/build.nix | 2 +- pkgs/development/compilers/graalvm/default.nix | 5 +---- pkgs/development/compilers/openjdk/11.nix | 6 +++--- pkgs/development/compilers/openjdk/openjfx/11.nix | 2 +- pkgs/development/libraries/bamf/default.nix | 4 +--- pkgs/development/libraries/belle-sip/default.nix | 2 +- pkgs/development/libraries/buddy/default.nix | 4 +--- pkgs/development/libraries/cpp-hocon/default.nix | 2 +- pkgs/development/libraries/cppdb/default.nix | 2 +- pkgs/development/libraries/crc32c/default.nix | 2 +- pkgs/development/libraries/cwiid/default.nix | 4 +--- pkgs/development/libraries/flatpak/default.nix | 4 +--- pkgs/development/libraries/gdal/gdal-1_11.nix | 4 +--- pkgs/development/libraries/geis/default.nix | 2 +- pkgs/development/libraries/gperftools/default.nix | 5 ++--- pkgs/development/libraries/leatherman/default.nix | 2 +- pkgs/development/libraries/libmemcached/default.nix | 2 +- pkgs/development/libraries/liboping/default.nix | 2 +- pkgs/development/libraries/libqtav/default.nix | 2 +- pkgs/development/libraries/libwhereami/default.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/phonon/backends/gstreamer.nix | 2 +- pkgs/development/libraries/science/math/osi/default.nix | 6 +++--- pkgs/development/python-modules/pivy/default.nix | 2 +- pkgs/development/python-modules/protobuf/default.nix | 5 +++-- pkgs/development/tools/diesel-cli/default.nix | 2 +- pkgs/games/eboard/default.nix | 7 ++----- pkgs/games/eduke32/default.nix | 5 +---- pkgs/games/egoboo/default.nix | 4 +--- pkgs/games/exult/default.nix | 2 +- pkgs/games/globulation/default.nix | 4 +--- pkgs/games/xpilot/bloodspilot-client.nix | 2 +- pkgs/os-specific/linux/dropwatch/default.nix | 5 +---- pkgs/os-specific/linux/firmware/fwupdate/default.nix | 2 +- pkgs/servers/http/nginx/generic.nix | 4 ++-- pkgs/servers/uwsgi/default.nix | 2 +- pkgs/servers/web-apps/fileshelter/default.nix | 4 +--- pkgs/tools/filesystems/blobfuse/default.nix | 2 +- pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +- pkgs/tools/graphics/fim/default.nix | 2 +- pkgs/tools/networking/bwm-ng/default.nix | 4 ++-- pkgs/tools/networking/network-manager/iodine/default.nix | 2 +- pkgs/tools/system/gdmap/default.nix | 4 +--- pkgs/tools/system/opencl-info/default.nix | 2 +- 61 files changed, 73 insertions(+), 111 deletions(-) diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 692485d0dcfd..04b31ae2c0b3 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./darwin-limits.patch ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/core/makefile.x/makefile.osx \ diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index a2588093309d..34494871f29c 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = toString + (makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]); hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 8acd8e0b88b1..3e9fe4725afd 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp lang/*.bin $out/share/pico/lang ''; - NIX_CFLAGS_COMPILE = [ "-include stdint.h" ]; + NIX_CFLAGS_COMPILE = "-include stdint.h"; meta = with stdenv.lib; { description = "Text-to-speech engine"; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 1332b265d54c..fbe21dd9a5b2 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 56f1ec747ca2..aa901a7ba513 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" "-Wno-error=stringop-overflow" diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 5a56c0867dd8..43ec0910cc2b 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 24d5f99ec32a..6f2d61cd80f0 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack spooles openblas ]; - NIX_CFLAGS_COMPILE = [ - "-I${spooles}/include/spooles" - ]; + NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; patches = [ ./calculix.patch diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 3c7784e85062..45b427341a21 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation { "SVN_INCLUDE=${subversion.dev}/include/subversion-1" ]; - NIX_LDFLAGS = [ - "-lsvn_fs-1" - ]; + NIX_LDFLAGS = "-lsvn_fs-1"; meta = with stdenv.lib; { homepage = https://github.com/svn-all-fast-export/svn2git; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 862b9eacd628..3283a3c046a4 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { make $checkFlags check || print_logs_and_fail ''; - NIX_CFLAGS_COMPILE = [ "-std=c99" ]; + NIX_CFLAGS_COMPILE = "-std=c99"; hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7b4e7787985f..603aa68207a7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -53,9 +53,7 @@ rec { patchPhase = '' ''; - NIX_CFLAGS_COMPILE = [ - "-DMINIMAL=ON" - ]; + NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); in stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 39508412333c..fcc599b451f0 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -13,10 +13,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i /tini-static/d CMakeLists.txt"; - NIX_CFLAGS_COMPILE = [ - "-DPR_SET_CHILD_SUBREAPER=36" - "-DPR_GET_CHILD_SUBREAPER=37" - ]; + NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; buildInputs = [ cmake glibc glibc.static ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 822575d85b9e..1d0e01fcb822 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -167,7 +167,7 @@ callPackage (import ./generic.nix (rec { xenpmdpatch ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24 "-Wno-error=deprecated-declarations" # Fix build with GCC8 diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 0941329bdbe5..3f7cfd4864d6 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxdg_basedir ]; - NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; + NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; mesonFlags = [ "-Dbuild_docs=true" diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 355cc58f348f..183e72565d3d 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { source "$setupHook" ''; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 postInstall = '' # fix use of $out variable diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 5ff687adcf6f..3c89f9ff0fcc 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ]; - NIX_LDFLAGS = [ "-lgthread-2.0" ]; + NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index a0fc30c85868..c0fd742082f3 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index cb960227bebe..aac619126896 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + NIX_CFLAGS_COMPILE = "-fPIC"; postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b5ccbca6f7e6..e2ab09764827 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gambit rsync bash ] ++ buildInputs_libraries ++ buildInputs_staticLibraries; - NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 11a94ebcce59..438c899f5168 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -242,10 +242,7 @@ in rec { 'method->name_and_sig_as_C_string(), p2i(method->native_function()), p2i(entry)' || exit -1 ''; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format-overflow" # newly detected by gcc7 - "-Wno-error=nonnull" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=nonnull"; buildPhase = '' export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index e365b9b28b35..b8381feef095 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -61,13 +61,13 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; - NIX_LDFLAGS = lib.optionals (!headless) [ + NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 43fe8ed83876..c6bff3961088 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -84,7 +84,7 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; stripDebugList = [ "." ]; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 1bce315878d0..60322f530166 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -88,9 +88,7 @@ stdenv.mkDerivation rec { doCheck = false; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; meta = with stdenv.lib; { description = "Application matching framework"; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 1745614f741c..0d3df37d8e09 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index fb25b0a58108..9b722602a65c 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; doCheck = true; meta = { diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index d172ab55fa3c..dc742a5c051a 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index a21b3cc93faa..bb521ba3ec0c 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; - NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = http://cppcms.com/sql/cppdb/; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 916ec5b703bb..a7313c205536 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; meta = with stdenv.lib; { homepage = https://github.com/google/crc32c; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 246dd009820c..d9a17aff9418 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - NIX_LDFLAGS = [ - "-lbluetooth" - ]; + NIX_LDFLAGS = "-lbluetooth"; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 945f1d4931fb..c0a3d3718f34 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { doCheck = false; # TODO: some issues with temporary files - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index a65740534146..6a086d9c998d 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; # Allow use of old proj_api.h - NIX_CFLAGS_COMPILE = [ - "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" - ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; # Prevent this: # diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 97b9ba087e28..1b3d5ba4b7c0 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index bc10c9f9bdd6..0e9857549850 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ - "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable" - ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 44c393baf8e8..b7b9b019b639 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 57053103417a..5655bfe968b9 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = with stdenv.lib; { homepage = https://libmemcached.org; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index ff8f200a3bba..b2594d7c1d70 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 22245f5fa2ab..dd6318444e78 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { # Make sure libqtav finds its libGL dependency at both link and run time # by adding libGL to rpath. Not sure why it wasn't done automatically like # the other libraries as `libGL` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"]; + NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; preFixup = '' mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 84bd1847faa2..8e190f998d56 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index db8a5e5a41bb..ad27742d0b4c 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 20723322c1db..d79078c28369 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gst-plugins-bad gst-libav ]); - in [ + in toString [ # This flag should be picked up through pkgconfig, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 1cc80e78a100..6dc7e746fd35 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; NIX_LDFLAGS = - lib.optional withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; + lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; - # Compile errors - NIX_CFLAGS_COMPILE = [ "-Wno-cast-qual" ]; + # Compile errors + NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; hardeningDisable = [ "format" ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 93aa5ad144cf..f7ec55bba05e 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { libXi libXext libSM libICE libX11 ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${pkgs.qt5.qtbase.dev}/include/QtCore" "-I${pkgs.qt5.qtbase.dev}/include/QtGui" "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 73216f63f82b..e414dff8aa17 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -9,10 +9,11 @@ buildPythonPackage { inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # work around python distutils compiling C++ with $CC optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" - ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; + ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" + ); propagatedBuildInputs = [ google_apputils ]; propagatedNativeBuildInputs = [ protobuf ]; # For protoc. diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index f6a67b051146..e5f7a50476e6 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { # Fix the build with mariadb, which otherwise shows "error adding symbols: # DSO missing from command line" errors for libz and libssl. - NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto"; + NIX_LDFLAGS = lib.optionalString mysqlSupport "-lz -lssl -lcrypto"; meta = with lib; { description = "Database tool for working with Rust projects that use Diesel"; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 206ed02e69ce..af6bc4be3936 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -19,11 +19,8 @@ stdenv.mkDerivation { patchShebangs ./configure ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; - - NIX_LDFLAGS = [ - "-ldl" - ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + NIX_LDFLAGS = "-ldl"; meta = { homepage = http://www.bergo.eng.br/eboard/; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e305505d62cb..242e0930db3b 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -41,10 +41,7 @@ in stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2.dev}/include/SDL2" - "-I${SDL2_mixer}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 3cd2dc5827b3..c8a5f380900a 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { ''; */ - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = { description = "3D dungeon crawling adventure"; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 58fdaeb8f740..07f84d7a151a 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; postInstall = '' diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index b953aad606d6..45c5013705f3 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -41,9 +41,7 @@ stdenv.mkDerivation rec { sconsFlags+=" DATADIR=$out/share/globulation2/glob2" ''; - NIX_LDFLAGS = [ - "-lboost_system" - ]; + NIX_LDFLAGS = "-lboost_system"; meta = with stdenv.lib; { description = "RTS without micromanagement"; diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 257b00102458..4a1c25ee12e0 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libX11 SDL SDL_ttf SDL_image libGLU libGL expat zlib ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { description = ''A multiplayer space combat game (client part)''; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 061dce048607..69acfa9682b6 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -16,10 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libbfd libnl ncurses readline zlib ]; # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: - NIX_CFLAGS_COMPILE = [ - "-DPACKAGE=${pname}" - "-DPACKAGE_VERSION=${version}" - ]; + NIX_CFLAGS_COMPILE = "-DPACKAGE=${pname} -DPACKAGE_VERSION=${version}"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 60b87d2dd9aa..c14e04dc3440 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" "-Wno-error=address-of-packed-member" ]; + 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" ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2c0dbc7d6654..2d1b994faab6 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -73,10 +73,10 @@ stdenv.mkDerivation { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 556c44b61a75..7669053d2294 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; + NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); meta = with stdenv.lib; { homepage = https://uwsgi-docs.readthedocs.org/en/latest/; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 47184fe9c96b..928d80b1297a 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libzip boost wt4 libconfig ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = '' ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index 6fc0e3a7f210..3c6f62283293 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 33fc5ce2ab6b..af7ef8b8215b 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 296ba43a5ed7..3fc82a9c72a0 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ optional pngSupport libpng; - NIX_CFLAGS_COMPILE = stdenv.lib.optional x11Support "-lSDL"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString x11Support "-lSDL"; meta = with stdenv.lib; { description = "A lightweight, highly customizable and scriptable image viewer"; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 4637a39e6e90..8e766cdeeb5c 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { void sigint(int sig) FUNCATTR_NORETURN; -inline void init(void); +static inline void init(void); - + /* clear stuff and exit */ --- a/src/options.c +++ b/src/options.c @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89"; meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 1b41a176723e..29c0d550fe2f 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool pkgconfig ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 0c254bb28545..4adc81608293 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { homepage = http://gdmap.sourceforge.net; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index 60175d27f151..d1c3d0ec6c0c 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ opencl-clhpp ocl-icd ]; - NIX_LDFLAGS = [ "-lOpenCL" ]; + NIX_LDFLAGS = "-lOpenCL"; installPhase = '' install -Dm755 opencl-info $out/bin/opencl-info From f9f46dc327c7e659e84d558f1309e16e16e8245a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 03:23:29 +0100 Subject: [PATCH 643/684] treewide: NIX_*_FLAGS -> string --- pkgs/applications/audio/jack-rack/default.nix | 6 +----- pkgs/applications/audio/jamin/default.nix | 2 +- pkgs/applications/audio/lash/default.nix | 6 +----- .../display-managers/lightdm/gtk-greeter.nix | 2 +- pkgs/applications/gis/grass/default.nix | 2 +- pkgs/applications/graphics/gnuclad/default.nix | 2 +- pkgs/applications/graphics/goxel/default.nix | 4 +--- pkgs/applications/graphics/gqview/default.nix | 4 +--- pkgs/applications/graphics/k3d/default.nix | 4 +--- pkgs/applications/misc/golden-cheetah/default.nix | 2 +- pkgs/applications/misc/grip/default.nix | 2 +- pkgs/applications/misc/gxneur/default.nix | 2 +- pkgs/applications/misc/k2pdfopt/default.nix | 4 +--- pkgs/applications/office/gnucash/default.nix | 2 +- pkgs/applications/video/handbrake/default.nix | 4 ++-- pkgs/applications/video/kino/default.nix | 5 +---- pkgs/development/compilers/openjdk/default.nix | 6 +++--- pkgs/development/compilers/openjdk/openjfx/12.nix | 2 +- .../haskell-modules/configuration-nix.nix | 6 +++--- pkgs/development/interpreters/gnu-apl/default.nix | 4 ++-- pkgs/development/interpreters/jimtcl/default.nix | 2 +- pkgs/development/interpreters/love/0.8.nix | 2 +- pkgs/development/interpreters/love/11.1.nix | 2 +- pkgs/development/libraries/libcbor/default.nix | 2 +- pkgs/development/libraries/libdynd/default.nix | 2 +- pkgs/development/libraries/libfakekey/default.nix | 4 +--- pkgs/development/libraries/libfpx/default.nix | 2 +- pkgs/development/libraries/libmatchbox/default.nix | 4 +--- pkgs/development/libraries/libwps/default.nix | 2 +- .../libraries/mediastreamer/default.nix | 2 +- pkgs/development/libraries/mlt/qt-5.nix | 2 +- pkgs/development/libraries/xmlsec/default.nix | 2 +- pkgs/development/tools/misc/hydra/default.nix | 2 +- pkgs/development/tools/parsing/ragel/default.nix | 2 +- pkgs/games/gnujump/default.nix | 4 +--- pkgs/games/gzdoom/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 4 ++-- pkgs/os-specific/linux/kernel/perf.nix | 14 +++++++------- pkgs/os-specific/linux/lttng-modules/default.nix | 2 +- pkgs/os-specific/linux/pktgen/default.nix | 2 +- pkgs/os-specific/linux/sysdig/default.nix | 5 +---- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/filesystems/irods/default.nix | 7 ++----- pkgs/tools/misc/ldmtool/default.nix | 2 +- pkgs/tools/security/gpgstats/default.nix | 4 ++-- pkgs/tools/text/sgml/jade/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 4 ++-- 47 files changed, 63 insertions(+), 94 deletions(-) diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 26a717dbd6e4..41b40223b87f 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -7,11 +7,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; - NIX_LDFLAGS = [ - "-ldl" - "-lm" - "-lpthread" - ]; + NIX_LDFLAGS = "-ldl -lm -lpthread"; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 3511a08682c3..818630585cfd 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); - NIX_LDFLAGS = [ "-ldl" ]; + NIX_LDFLAGS = "-ldl"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index e96972b0d1b1..0dbe60b6a615 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -18,11 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper pkgconfig readline ]; propagatedBuildInputs = [ libuuid ]; - NIX_LDFLAGS = [ - "-lm" - "-lpthread" - "-luuid" - ]; + NIX_LDFLAGS = "-lm -lpthread -luuid"; postInstall = '' for i in lash_control lash_panel diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 91fe3e5b22f2..be586bdac9bc 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; installFlags = [ "localstatedir=\${TMPDIR}" diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 4000c834602b..8734fabfdcf9 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; postInstall = '' wrapProgram $out/bin/grass76 \ diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2535f7514f1d..5b6dd42e09e5 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index e4ab5639ba66..e870df4bc6ef 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' make release diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 205376b1257c..d82238f925b3 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { description = "A fast image viewer"; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index d3bc8deb05e0..31085cd8023d 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -39,9 +39,7 @@ stdenv.mkDerivation rec { #doCheck = false; - NIX_CFLAGS_COMPILE = [ - "-Wno-deprecated-declarations" - ]; + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index dde1c32e805f..3dffc5c77c2a 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -31,7 +31,7 @@ in mkDerivation rec { ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; - NIX_LDFLAGS = [ "-lz" ]; + NIX_LDFLAGS = "-lz"; qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 36ca31707c8a..4416e1e62c2d 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; meta = { description = "GTK-based audio CD player/ripper"; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 6e6145e79086..c44523a8b751 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index aedfff40d702..69d78575e2a3 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -65,9 +65,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; installPhase = '' install -D -m 755 k2pdfopt $out/bin/k2pdfopt diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d8fbd4392bdb..4373278adab0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; patches = [ ./cmake_check_symbol_exists.patch ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 4341055d084b..59a8c2377ce9 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -100,9 +100,9 @@ stdenv.mkDerivation rec { ]; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ "-lx265" - # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 + # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 "-ldl" ]; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 1b9f0d0997a0..2a0af3ed59e4 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -71,10 +71,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lavcodec" - "-lavutil" - ]; + NIX_LDFLAGS = "-lavcodec -lavutil"; patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 03121daf961f..b2d511173c45 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -69,13 +69,13 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; - NIX_LDFLAGS = lib.optionals (!headless) [ + NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 356ac4800d9f..30c8d36fdfca 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -84,7 +84,7 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; stripDebugList = [ "." ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6886a35c0a80..9eedb0fed855 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -115,18 +115,18 @@ self: super: builtins.intersectAttrs super { hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; + configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; }); haskakafka = overrideCabal super.haskakafka (drv: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; }); # library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32 hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; })); # Foreign dependency name clashes with another Haskell package. diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 94ec02443823..c2a3556cfea2 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 8 - NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [ "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" - ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"; + ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 09d7fa622fc1..d803fe43fd7a 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--ipv6" ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]); enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 57c1a6ce5641..3a6c385ee5fc 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { } || true ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${SDL.dev}/include/SDL" "-I${freetype.dev}include/freetype2" "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2 diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 0a60a4cacfe7..3629345baf6a 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = http://love2d.org; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 4d56c0f1403b..4949d657669b 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - NIX_CFLAGS_COMPILE = [ "-fno-lto" ]; + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index bc4928153397..c02a6f9a5025 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; # added to fix build with gcc7+ - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" "-Wno-error=tautological-compare" diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 196f0e50bef8..3c2431915433 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; - NIX_LDFLAGS = [ - "-lX11" - ]; + NIX_LDFLAGS = "-lX11"; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index f4863eb33f26..97df5107409a 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 3786c5e77d3a..98875e48f57f 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXft libICE pango libjpeg ]; propagatedBuildInputs = [ libX11 libXext libpng ]; - NIX_LDFLAGS = [ - "-lX11" - ]; + NIX_LDFLAGS = "-lX11"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index e8f397548853..61b777a52433 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost librevenge zlib ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; # newly detected by gcc-7 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index ca62391e7815..0204223d127c 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ortp libv4l libpcap srtp bctoolbox libXext libmatroska ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f017e4452a64..0e3750df415a 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # mlt is unable to cope with our multi-prefix Qt build # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = [ "-I${getDev qtsvg}/include/QtSvg" ]; + NIX_CFLAGS_COMPILE = "-I${getDev qtsvg}/include/QtSvg"; CXXFLAGS = "-std=c++11"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 25c5bf458887..a8c751330b7c 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-soap" ]; # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 - NIX_LDFLAGS = [ "-lgcrypt" ]; + NIX_LDFLAGS = "-lgcrypt"; postInstall = '' moveToOutput "bin/xmlsec1-config" "$dev" diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e0ebba4c0516..3e5c12e183aa 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - NIX_CFLAGS_COMPILE = [ "-pthread" ]; + NIX_CFLAGS_COMPILE = "-pthread"; shellHook = '' PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2f4db7982b71..12c9b9d57f8f 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -21,7 +21,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 4bf460836d98..af2e924960a1 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_image SDL_mixer ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { homepage = https://jump.gnu.sinusoid.es/index.php?title=Main_Page; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 288d3369dfb7..5cafe045fa6a 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; + NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; preConfigure = '' sed -i \ diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 057615a79a14..0b6eab70263f 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath " + path) ( + NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) - ); + )); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index faf6dabc2276..9f32e3e37ddb 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation { # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = - [ "-Wno-error=cpp" - "-Wno-error=bool-compare" - "-Wno-error=deprecated-declarations" - "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" - "-Wno-error=stringop-truncation" - ]; + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cpp" + "-Wno-error=bool-compare" + "-Wno-error=deprecated-declarations" + "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" + "-Wno-error=stringop-truncation" + ]; doCheck = false; # requires "sparse" doInstallCheck = false; # same diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index d4b3f374c5bc..46c8dec8889f 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index fd57fa6e37ce..aec347ff3751 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { RTE_TARGET = "x86_64-native-linuxapp-gcc"; GUI = stdenv.lib.optionalString withGtk "true"; - NIX_CFLAGS_COMPILE = [ "-msse3" ]; + NIX_CFLAGS_COMPILE = "-msse3"; postPatch = let dpdkMajor = lib.versions.major dpdk.version; in '' substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0d85e6e3a57f..4008045938ee 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -28,10 +28,7 @@ stdenv.mkDerivation rec { ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; # needed since luajit-2.1.0-beta3 - NIX_CFLAGS_COMPILE = [ - "-DluaL_reg=luaL_Reg" - "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" - ]; + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; preConfigure = '' cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index c66c6bc1f7e0..9029eb38b06f 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = [ "-D_POSIX_C_SOURCE" ]; + NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; meta = { description = "A simple and lightweight volume icon that sits in your system tray"; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 56fc2e40ba2f..b6099c099f32 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -30,11 +30,8 @@ in rec { # but we don't use /usr with nix, so remove only 2 items. patches = [ ./irods_root_path.patch ]; - NIX_CFLAGS_COMPILE = [ - # fix build with recent llvm versions - "-Wno-deprecated-register" - "-Wno-deprecated-declarations" - ]; + # fix build with recent llvm versions + NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; preConfigure = common.preConfigure + '' patchShebangs ./test diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index d1d3996bd620..734586fb1ab3 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureScript = "sh autogen.sh"; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index 34e8c7bd6796..c3a14f62c766 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit) - [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) + "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; meta = with stdenv.lib; { description = "Calculates statistics on the keys in your gpg key-ring"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index b7f8bd6df381..2cc40510121b 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnum4 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ]; + NIX_CFLAGS_COMPILE = "-Wno-deprecated"; preInstall = '' install -d -m755 "$out"/lib diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9571032053f..48d368c92ca7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19245,7 +19245,7 @@ let sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 - NIX_CFLAGS_COMPILE = [ "-DHAS_VPRINTF" ]; + NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF"; }; TextUnidecode = buildPerlPackage { @@ -20332,7 +20332,7 @@ let AUTOMATED_TESTING = false; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; - NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; + NIX_CFLAGS_LINK = "-lxcb -lxcb-util -lxcb-xinerama -lxcb-icccm"; doCheck = false; # requires an X server meta = { description = "XCB bindings for X"; From 313da176d35efefbcf36b41ec348c38403581e83 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 12:34:47 +0100 Subject: [PATCH 644/684] treewide: NIX_*_FLAGS -> string --- pkgs/applications/audio/lsp-plugins/default.nix | 2 +- pkgs/applications/audio/pianobooster/default.nix | 2 +- pkgs/applications/audio/timemachine/default.nix | 4 +--- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/xournal/default.nix | 4 ++-- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/applications/misc/mysql-workbench/default.nix | 4 +--- pkgs/applications/misc/navit/default.nix | 4 ++-- pkgs/applications/misc/netsurf/libcss/default.nix | 2 +- pkgs/applications/misc/osm2xmap/default.nix | 2 +- pkgs/applications/misc/tangogps/default.nix | 2 +- pkgs/applications/misc/xsw/default.nix | 2 +- .../networking/feedreaders/newsboat/default.nix | 4 ++-- .../pidgin-plugins/purple-matrix/default.nix | 2 +- .../pidgin-plugins/telegram-purple/default.nix | 2 +- .../skype-call-recorder/default.nix | 2 +- .../instant-messengers/swift-im/default.nix | 2 +- .../networking/irc/quassel/default.nix | 2 +- .../networking/remote/putty/default.nix | 2 +- pkgs/applications/office/planner/default.nix | 2 +- pkgs/applications/radio/gnuradio/default.nix | 4 +--- pkgs/applications/radio/xlog/default.nix | 2 +- .../virtualization/open-vm-tools/default.nix | 2 +- pkgs/applications/virtualization/xen/4.10.nix | 2 +- .../elementary-settings-daemon/default.nix | 4 +--- .../xfce4-pulseaudio-plugin/default.nix | 2 +- pkgs/development/compilers/nim/default.nix | 8 +------- pkgs/development/compilers/yap/default.nix | 2 +- pkgs/development/interpreters/pure/default.nix | 2 +- pkgs/development/libraries/mps/default.nix | 2 +- pkgs/development/libraries/ntrack/default.nix | 2 +- pkgs/development/libraries/opencv/4.x.nix | 2 +- .../libraries/prometheus-cpp/default.nix | 2 +- pkgs/development/libraries/qoauth/default.nix | 4 ++-- .../libraries/science/benchmark/papi/default.nix | 2 +- .../libraries/spatialite-tools/default.nix | 2 +- pkgs/development/libraries/spdk/default.nix | 2 +- .../libraries/unixODBCDrivers/default.nix | 10 +++++----- pkgs/development/libraries/uri/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/libraries/zeroc-ice/default.nix | 2 +- .../development/libraries/zookeeper_mt/default.nix | 2 +- pkgs/development/ocaml-modules/curses/default.nix | 2 +- .../python-modules/python-uinput/default.nix | 2 +- .../python-modules/tensorflow/default.nix | 2 +- .../tools/database/sqlitebrowser/default.nix | 4 +--- pkgs/development/tools/misc/openocd/default.nix | 4 ++-- pkgs/development/tools/nrpl/default.nix | 4 +--- pkgs/development/tools/tora/default.nix | 9 ++------- pkgs/games/0ad/game.nix | 2 +- pkgs/games/macopix/default.nix | 2 +- pkgs/games/minetest/default.nix | 2 +- pkgs/games/onscripter-en/default.nix | 2 +- pkgs/games/opendungeons/default.nix | 4 +--- pkgs/games/openspades/default.nix | 2 +- pkgs/games/pokerth/default.nix | 2 +- pkgs/games/rogue/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/tdm/default.nix | 2 +- pkgs/games/tome4/default.nix | 6 +----- pkgs/games/xbill/default.nix | 2 +- pkgs/games/zoom/default.nix | 14 ++++---------- pkgs/misc/drivers/utsushi/default.nix | 6 +----- pkgs/os-specific/linux/tiptop/default.nix | 2 +- pkgs/os-specific/linux/usermount/default.nix | 2 +- pkgs/servers/amqp/qpid-cpp/default.nix | 2 +- pkgs/servers/computing/torque/default.nix | 4 +--- pkgs/servers/http/openresty/default.nix | 2 +- pkgs/servers/http/tengine/default.nix | 6 ++---- pkgs/servers/mail/opensmtpd/extras.nix | 7 +++---- pkgs/servers/mail/postfix/default.nix | 2 +- pkgs/servers/nosql/mongodb/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 4 +--- pkgs/tools/misc/osm2pgsql/default.nix | 2 +- pkgs/tools/misc/parcellite/default.nix | 2 +- pkgs/tools/misc/qjoypad/default.nix | 2 +- pkgs/tools/misc/snapper/default.nix | 4 +--- pkgs/tools/misc/wyrd/default.nix | 2 +- pkgs/tools/networking/libreswan/default.nix | 2 +- .../networking/network-manager/strongswan.nix | 2 +- pkgs/tools/networking/ntopng/default.nix | 4 ++-- pkgs/tools/networking/ssmtp/default.nix | 2 +- pkgs/tools/networking/tracebox/default.nix | 2 +- pkgs/tools/networking/wrk/default.nix | 6 +++--- pkgs/tools/package-management/xbps/default.nix | 2 +- pkgs/tools/system/netdata/default.nix | 2 +- pkgs/tools/system/rowhammer-test/default.nix | 2 +- pkgs/tools/system/stress-ng/default.nix | 2 +- pkgs/tools/text/multitran/libmtquery/default.nix | 4 +--- 89 files changed, 108 insertions(+), 158 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d5d893891ffe..b146fcecc8ec 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder ''out''}" ]; - NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ]; + NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; doCheck = true; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index fee456ae717c..f2130fe55590 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preConfigure = "cd src"; buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ]; - NIX_LDFLAGS = [ "-lGL" "-lpthread" ]; + NIX_LDFLAGS = "-lGL -lpthread"; postInstall = '' wrapProgram $out/bin/pianobooster \ diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 8c7ed20e7482..48dd3f39e88f 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = { description = "JACK audio recorder"; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 8ca3f8cb2a9d..91e2427a6c84 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { git python3 ]; - NIX_LDFLAGS = [ "-lz" ]; + NIX_LDFLAGS = "-lz"; postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index cd9d068b8acf..6d10a7cae231 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lz" ] - ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; + NIX_LDFLAGS = "-lz" + + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e643c212225b..08643577b49e 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; postInstall = '' wrapProgram $out/bin/merkaartor \ diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 443fe2f1d6c8..531f8d851f1c 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -62,10 +62,8 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - NIX_CFLAGS_COMPILE = [ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - "-Wno-error=deprecated-declarations" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 29e768c257f1..2263dfc1fbc0 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { patches = [ ./CMakeLists.txt.patch ]; - NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); # we choose only cmdline and speech-dispatcher speech options. # espeak builtins is made for non-cmdline OS as winCE diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 55538925abd7..ed0b7b12e984 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 1c19238541c4..e5838dc1bbe6 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" ]; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; buildInputs = [ libroxml proj libyamlcpp boost ]; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 08bea18d8e9a..10b487828ea5 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index aa851e14ab5f..c7c10254c0ca 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]; + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); patches = [ ./parse.patch # Fixes compilation error by avoiding redundant definitions. diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index e24e47f2fe7f..e01e4c4fc44f 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -31,8 +31,8 @@ rustPlatform.buildRustPackage rec { make ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ] - ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 44133e777c76..e9a0812e925b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ # glib-2.62 deprecations "-DGLIB_DISABLE_DEPRECATION_WARNINGS" # override "-O0 -Werror" set by build system diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index ef298883b1b4..c38ff8f454e9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 3ac2b567a8cb..8093f91feb3e 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./conference.patch ]; buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ]; - NIX_LDFLAGS = [ "-lvorbis" ]; + NIX_LDFLAGS = "-lvorbis"; meta = { homepage = http://atdot.ch/scr/; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index d1d69b3d837b..d47b7d00af92 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ GConf ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${libxml2.dev}/include/libxml2" "-I${miniupnpc}/include/miniupnpc" "-I${qtwebkit.dev}/include/QtWebKit" diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d1b950a7757c..f78053bdc37b 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -46,7 +46,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { enableParallelBuilding = true; # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; buildInputs = [ cmake makeWrapper qtbase ] diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 8c2d9ac36e9e..49182ec182fe 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index f454d8830cba..6189132d0f94 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = ''./autogen.sh''; configureFlags = [ diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 016540c1e67a..f5c89ae51cef 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -50,9 +50,7 @@ stdenv.mkDerivation rec { Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 3434c0624ed5..2268cdf725db 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; buildInputs = [ glib pkgconfig gtk2 hamlib ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e4db7ea5994e..cf160d8af53e 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ # igrone glib-2.62 deprecations # Drop in next stable release. "-DGLIB_DISABLE_DEPRECATION_WARNINGS" diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 92df54d6e83b..f15a7ef0f9d4 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24. "-Wno-error=deprecated-declarations" # Fix build with GCC 8 diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d29178b220d8..582793ff5906 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -148,11 +148,9 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; - NIX_CFLAGS_COMPILE = [ # Default for release buildtype but passed manually because # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 59f282d74117..83778aa8fffd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -9,7 +9,7 @@ mkXfceDerivation { nativeBuildInputs = [ automakeAddFlags ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0" ]; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index dee0b351a609..bdb16c922071 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -14,13 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ - "-lcrypto" - "-lpcre" - "-lreadline" - "-lgc" - "-lsqlite3" - ]; + NIX_LDFLAGS = "-lcrypto -lpcre -lreadline -lgc -lsqlite3"; # we could create a separate derivation for the "written in c" version of nim # used for bootstrapping, but koch insists on moving the nim compiler around diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 1cc96455be7a..e6fdd03bb678 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tabling=yes" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 188058a73b52..9c35fc354976 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex makeWrapper ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; - NIX_LDFLAGS = [ "-lLLVMJIT" ]; + NIX_LDFLAGS = "-lLLVMJIT"; postPatch = '' for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index ec3b4e201477..8c1f3aea4667 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; # needed for 1.116.0 to build with gcc7 - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-implicit-fallthrough" "-Wno-error=clobbered" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b79f940affa3..803906b13437 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 408368b89c40..9fffd3d94770 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index b047322c35e6..0403c7ad10c9 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" ]; - NIX_LDFLAGS = [ "-ldl" ]; + NIX_LDFLAGS = "-ldl"; meta = { description = "Prometheus Client Library for Modern C++"; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 0d9ae21e87e3..83e904e53eb2 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ qt5.qtbase qca2-qt5 ]; nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; - NIX_LDFLAGS = [ "-lqca-qt5" ]; + NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 35d0914e3f76..53ae70f5bf8a 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; preConfigure = '' cd src diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 2708e49eb2b6..83eef355f2db 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ "-lsqlite3" ]; + NIX_LDFLAGS = "-lsqlite3"; meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index a18edc0a6dff..f9f5beb5b65b 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" ]; - NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. + NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. enableParallelBuilding = true; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 78f85afca917..6cfaef5ef993 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -100,16 +100,16 @@ sqlite = stdenv.mkDerivation rec { pname = "sqlite-connector-odbc"; version = "0.9993"; - + src = fetchurl { url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; }; - + buildInputs = [ unixODBC sqlite zlib libxml2 ]; - + configureFlags = [ "--with-odbc=${unixODBC}" ]; - + installTargets = [ "install-3" ]; # move libraries to $out/lib where they're expected to be @@ -117,7 +117,7 @@ mkdir -p "$out/lib" mv "$out"/*.* "$out/lib" ''; - + passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 61246748ac73..5e5f4c9e8ca6 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4e9336172ad9..a02e540173d8 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit # to be exceeded - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; nativeBuildInputs = [ gn ninja pkgconfig python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 945ba59cf3df..3a5b1690f2d0 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" "-Wno-error=deprecated-copy" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; prePatch = lib.optional stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index ba53e8e54451..127ea4f7162b 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 = stdenv.lib.optionals (!stdenv.isDarwin) [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation"; buildInputs = [ zookeeper bash ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index dc6b17512837..9bcf4fc411ff 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ba5a527fdb08..8f6c7c54cb2e 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ udev ]; - NIX_CFLAGS_LINK = [ "-ludev" ]; + NIX_CFLAGS_LINK = "-ludev"; meta = with stdenv.lib; { description = "Pythonic API to Linux uinput kernel module"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index cc64e49e1b7a..34282a5ec937 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -266,7 +266,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 8cdcdd6f79d5..0ec4b1510e91 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -16,9 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; - NIX_LDFLAGS = [ - "-lQt5PrintSupport" - ]; + NIX_LDFLAGS = "-lQt5PrintSupport"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index eea27b3e51ff..88f75a3081b9 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" "-Wno-error=tautological-compare" "-Wno-error=array-bounds" - ]; + ]); postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 068028c7da91..d8dab6b03587 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation { }) ]; - NIX_LDFLAGS = [ - "-lpcre" - ]; + NIX_LDFLAGS = "-lpcre"; buildPhase = '' HOME=$TMPDIR diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 931c00ecce58..213c926521fe 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -40,14 +40,9 @@ mkDerivation { ]; # these libraries are only searched for at runtime so we need to force-link them - NIX_LDFLAGS = [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - ]; + NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl"; - NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ]; + NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; qtWrapperArgs = [ ''--prefix PATH : ${lib.getBin graphviz}/bin'' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 8102235d88eb..42464f71ae33 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 2639765c5d15..7879b68c857d 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { description = "Mascot Constructive Pilot for X"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 4654456bd6cd..c26536c5c2aa 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -40,7 +40,7 @@ let "-DOpenGL_GL_PREFERENCE=GLVND" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 618e78553a54..2ad23a72368b 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { configureFlags = [ "--no-werror" ]; # Without this libvorbisfile.so is not getting linked properly for some reason. - NIX_CFLAGS_LINK = [ "-lvorbisfile" ]; + NIX_CFLAGS_LINK = "-lvorbisfile"; preBuild = '' sed -i 's/.dll//g' Makefile diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index d59afc330a79..f6841abb1d07 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ogre cegui boost sfml openal ois ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index de05e1944f39..b00524461a49 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" ]; + NIX_CFLAGS_LINK = "-lopenal"; meta = with stdenv.lib; { description = "A compatible client of Ace of Spades 0.75"; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index e32bc06b8f5e..2e4ce270b828 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "pokerth.pro" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; enableParallelBuilding = true; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index c8af2331b080..1e27d67eb03e 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; meta = with stdenv.lib; { homepage = http://rogue.rogueforge.net/rogue-5-4/; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index a2859c11712e..c86df396ff15 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fftw=${fftwSinglePrec.dev}" ]; - NIX_LDFLAGS = [ "-lopenal" ]; + NIX_LDFLAGS = "-lopenal"; meta = with stdenv.lib; { homepage = http://scorched3d.co.uk/; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index fef3350a061d..949f5a3e2ab9 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -91,7 +91,7 @@ EOF enableParallelBuilding = true; sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; - NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; meta = with stdenv.lib; { description = "The Dark Mod - stealth FPS inspired by the Thief series"; homepage = "http://www.thedarkmod.com"; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 2d9ef45a9e08..b31b53922ffe 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -41,11 +41,7 @@ in stdenv.mkDerivation rec { # disable parallel building as it caused sporadic build failures enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2.dev}/include/SDL2" - "-I${SDL2_image}/include/SDL2" - "-I${SDL2_ttf}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; makeFlags = [ "config=release" ]; diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index 119cd8f08769..8a6d4cf14cdc 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXpm libXt motif ]; - NIX_CFLAGS_LINK = [ "-lXpm" ]; + NIX_CFLAGS_LINK = "-lXpm"; configureFlags = [ "--with-x" diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 449d7ae6e2d5..827fb351f1de 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -4,21 +4,15 @@ stdenv.mkDerivation rec { name = "zoom-1.1.5"; - + src = fetchurl { url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - - buildInputs = [ perl expat xlibsWrapper freetype ]; - - NIX_CFLAGS_COMPILE = [ - # Zoom doesn't add the right directory in the include path. - "-I" (freetype + "/include/freetype2") - # for gcc5; c11 inline semantics breaks the build - "-fgnu89-inline" - ]; + buildInputs = [ perl expat xlibsWrapper freetype ]; + + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; meta = with stdenv.lib; { description = "Player for Z-Code, TADS and HUGO stories or games"; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 8a8556b63dfe..ad7659d060a3 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -26,11 +26,7 @@ stdenv.mkDerivation rec { libusb.dev ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=parentheses" - "-Wno-error=unused-variable" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; postPatch = '' # remove vendored dependencies diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 47b89f138c52..bfcf58a35307 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; buildInputs = [ libxml2 ncurses ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; meta = with stdenv.lib; { description = "Performance monitoring tool for Linux"; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 5cb49485c5ba..ec58d513b095 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; - NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; + NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index bb7f7def077e..97c1ec90ed12 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -33,7 +33,7 @@ let sed -i '/management/d' CMakeLists.txt ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=int-in-bool-context" "-Wno-error=maybe-uninitialized" diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 5e78fe742ac3..8eb12a1b8112 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = [ - "-Wno-error" "-fpermissive" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; postPatch = '' substituteInPlace Makefile.am \ diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 53773302963d..328db9ec9861 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; nativeBuildInputs = [ perl ]; - NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; preConfigure = '' patchShebangs . diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 379a5c242f74..1467b1577f99 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -84,10 +84,8 @@ stdenv.mkDerivation rec { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ - "-I${libxml2.dev}/include/libxml2" - "-Wno-error=implicit-fallthrough" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" + + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index f7ed6382a7be..5a5fc537d6eb 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -76,11 +76,10 @@ stdenv.mkDerivation rec { "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = - stdenv.lib.optional enableRedis + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - ++ stdenv.lib.optional enableMysql - "-L${libmysqlclient}/lib/mysql"; + + stdenv.lib.optionalString enableMysql + " -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index b3345f9420cb..c0e6252a5518 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; - NIX_LDFLAGS = lib.optional withLDAP "-llber"; + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; installTargets = [ "non-interactive-package" ]; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 4c4ac4c5cb63..c2ae83f3e8af 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; sconsFlags = [ "--release" diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index ffede7d58b22..da7bfb445a97 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -60,10 +60,8 @@ in buildPythonApplication rec { ipaddress idna ]; - NIX_CFLAGS_COMPILE = [ # error: 'import_cairo' defined but not used - "-Wno-error=unused-function" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; setupPyBuildFlags = [ "--with-Xdummy" diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 007ae348bc2f..54da1a164011 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; meta = with stdenv.lib; { description = "OpenStreetMap data to PostgreSQL converter"; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 8dcaed706c13..46606e3b43be 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; buildInputs = [ gtk2 hicolor-icon-theme ]; - NIX_LDFLAGS = [ "-lgio-2.0" ]; + NIX_LDFLAGS = "-lgio-2.0"; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 4428bf1e625a..3e7e3870959b 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXtst qt4 ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; patchPhase = '' cd src substituteInPlace config --replace /bin/bash ${stdenv.shell} diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index ee47c17065f0..466a5f3faf1c 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ - "-I${libxml2.dev}/include/libxml2" - ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; postInstall = '' rm -r $out/etc/cron.* diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index ec516555273a..6a5ec8672224 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; }; - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; preConfigure = '' substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index e48f2d7aa5bd..4c8b926b5827 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; # These flags were added to compile v3.18. Try to lift them when updating. - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" # these flags were added to build with gcc7 "-Wno-error=implicit-fallthrough" "-Wno-error=format-truncation" diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 8d16f71c4af7..843985bfa3e4 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 0c693ac6288f..68f801060310 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ] - ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = "-fpermissive" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 4ed0c3393bc8..81da427a52cf 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional tlsSupport openssl; - NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ]; + NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 4062fc0fd585..1d3c4190e388 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-lua=yes" ]; - NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ]; + NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so"; preAutoreconf = '' substituteInPlace Makefile.am --replace "noinst" "" diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 9c8f46bef07b..98705430c2f0 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + installPhase = '' mkdir -p $out/bin cp wrk $out/bin ''; - + meta = with stdenv.lib; { description = "HTTP benchmarking tool"; homepage = https://github.com/wg/wrk; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 2be1db764e12..7ff079c0116c 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; postPatch = '' # fix unprefixed ranlib (needed on cross) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ff6a6e03cc88..487d6541b5f6 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./no-files-in-etc-and-var.patch ]; - NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 5a3ba8b66196..64c184a61229 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index c8748efc3023..7d3e62d7beb5 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 8b2032dcaba5..baccdfdedba5 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation { buildInputs = [ libmtsupport libfacet libbtree multitrandata ]; - NIX_LDFLAGS = [ - "-lbtree" - ]; + NIX_LDFLAGS = "-lbtree"; patchPhase = '' sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ From 65712df184aaa6da1030e872a122c16f7d52585e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 3 Nov 2019 23:10:08 +0100 Subject: [PATCH 645/684] treewide: installTargets is a list --- pkgs/tools/system/pciutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 22154796b317..b773529a0d77 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "DNS=yes" ]; - installTargets = "install install-lib"; + installTargets = [ "install" "install-lib" ]; # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; From ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 3 Nov 2019 22:57:05 +0100 Subject: [PATCH 646/684] stdenv: installTargets is a list --- pkgs/development/compilers/gcc/8/default.nix | 5 +---- pkgs/development/tools/misc/texinfo/common.nix | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index c9302cc4f740..c6b785f84a4e 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -208,10 +208,7 @@ stdenv.mkDerivation ({ dontStrip = !stripped; - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 7741f2d4ffbc..df0a889bd20a 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -30,10 +30,8 @@ stdenv.mkDerivation { configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; + installFlags = [ "TEXMF=$(out)/texmf-dist" ]; + installTargets = [ "install" "install-tex" ]; checkInputs = [ procps ]; From 755db0b68937dd97e74f427b03a811fceaeba59f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 4 Nov 2019 12:23:53 +0100 Subject: [PATCH 647/684] treewide: installTargets is a list --- pkgs/applications/editors/emacs/25.nix | 2 +- pkgs/applications/office/antiword/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 5 +---- pkgs/development/compilers/gcc/4.9/default.nix | 5 +---- pkgs/development/compilers/gcc/5/default.nix | 5 +---- pkgs/development/compilers/gcc/6/default.nix | 5 +---- pkgs/development/compilers/gcc/7/default.nix | 5 +---- pkgs/development/compilers/gcc/9/default.nix | 5 +---- pkgs/development/interpreters/erlang/generic-builder.nix | 4 ++-- pkgs/development/libraries/crypto++/default.nix | 2 +- pkgs/development/libraries/libscrypt/default.nix | 2 +- pkgs/development/ocaml-modules/functory/default.nix | 2 +- pkgs/development/tools/misc/dialog/default.nix | 2 +- pkgs/misc/drivers/foomatic-filters/default.nix | 2 +- pkgs/servers/gpsd/default.nix | 2 +- pkgs/tools/misc/bibtool/default.nix | 2 +- pkgs/tools/system/fcron/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 4 ++-- 18 files changed, 20 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index 42edb7c707e1..e4643102f0ef 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { done ''; - installTargets = "tags install"; + installTargets = [ "tags" "install" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 96a518a7a28f..e6c939b277ea 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; - installTargets = "global_install"; + installTargets = [ "global_install" ]; meta = { homepage = http://www.winfield.demon.nl/; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ae96d5a1ef90..ef697b74bbe3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -225,10 +225,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5194f607f3b6..2f85fc4b7e8c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -231,10 +231,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index cddfd58aa53b..f68ddc81f81f 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,10 +242,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3ac4fa7032a7..b1a981cfdf7f 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -250,10 +250,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 237cb455f9fa..22d772cff6d6 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -221,10 +221,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9698f4db2861..7ff8d7529ca3 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -207,10 +207,7 @@ stdenv.mkDerivation ({ dontStrip = !stripped; - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 76f71745f355..c0203e5915f7 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -24,7 +24,7 @@ , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , buildPhase ? "", preBuild ? "", postBuild ? "" , installPhase ? "", preInstall ? "", postInstall ? "" -, installTargets ? "install install-docs" +, installTargets ? [ "install" "install-docs" ] , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" , meta ? {} @@ -141,7 +141,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (installTargets != "") { inherit installTargets; } +// optionalAttrs (installTargets != []) { inherit installTargets; } // optionalAttrs (preInstall != "") { inherit preInstall; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index b472733f8ee6..3fe277481553 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store - installTargets = "install-lib"; + installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index b9ae1f829a1b..3083136526bf 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = if stdenv.isDarwin then "install-osx" else "install"; + installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index c8b29759b97c..18b5fb39776b 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ]; - installTargets = "ocamlfind-install"; + installTargets = [ "ocamlfind-install" ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 378cc4683b41..b82429cdac5f 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" ]; - installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}"; + installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; meta = { homepage = https://invisible-island.net/dialog/dialog.html; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index dbcc17820ec2..9bee05bfb254 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; - installTargets = "install-cups"; + installTargets = [ "install-cups" ]; installFlags = [ "CUPS_FILTERS=$(out)/lib/cups/filter" diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index f205b600dd95..a05b37e9d2ca 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out/lib/udev/rules.d" ''; - installTargets = "install udev-install"; + installTargets = [ "install" "udev-install" ]; postFixup = '' wrapPythonProgramsIn $out/bin "$out $pythonPath" diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 7664b96563b2..df7564a4b848 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Perl for running test suite. buildInputs = [ perl ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; doCheck = true; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 6ef39a647f72..3dd84aa8a9cc 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--disable-checks" ]; - installTargets = "install-staged"; # install does also try to change permissions of /etc/* files + installTargets = [ "install-staged" ]; # install does also try to change permissions of /etc/* files # fcron tries to install pid into system directory on install installFlags = [ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48d368c92ca7..94ef32249981 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11242,7 +11242,7 @@ let outputs = [ "out" "dev" ]; # no "devdoc" - installTargets = "install"; + installTargets = [ "install" ]; meta = with stdenv.lib; { homepage = "https://www.mhonarc.org/"; @@ -20609,7 +20609,7 @@ let }; propagatedBuildInputs = [ XMLParser XMLSAX ]; # Avoid creating perllocal.pod, which contains a timestamp - installTargets = "pure_install"; + installTargets = [ "pure_install" ]; meta = { description = "SAX Driver for Expat"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From aa6c89479fa04d8f55a6eb15675def7fdd0caef7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Dec 2019 15:43:06 -0800 Subject: [PATCH 648/684] libreoffice: make NIX_CFLAGS_COMPILE a list A string is no longer allowed --- pkgs/applications/office/libreoffice/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70b439a5f778..c01048cdb3e4 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,7 +57,9 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"); + NIX_CFLAGS_COMPILE = [ + "-I${librdf_rasqal}/include/rasqal" + ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch From 95526382bed30813145aa9648a6d32e15d553a7b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 5 Nov 2019 00:23:36 +0100 Subject: [PATCH 649/684] polymake: fix for structured attrs --- pkgs/applications/science/math/polymake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index fdc4de7b0286..d4f13f84f81c 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeWrapper ninja ant perl ]; - ninjaFlags = "-C build/Opt"; + ninjaFlags = [ "-C" "build/Opt" ]; postInstall = '' for i in "$out"/bin/*; do From 9126911ba55b95d9e6bcfb71b7c501f245743169 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 5 Nov 2019 00:44:20 +0100 Subject: [PATCH 650/684] ruby: installFlags is a list --- pkgs/development/interpreters/ruby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a87131ff40bb..58ccf5ae9b41 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -151,7 +151,7 @@ let export GEM_HOME="$out/${passthru.gemPath}" ''; - installFlags = stdenv.lib.optionalString docSupport "install-doc"; + installFlags = stdenv.lib.optional docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Remove unnecessary groff reference from runtime closure, since it's big From bb2a6f739679a5fdf42f2b78d621ae18b95cbaa0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 5 Nov 2019 21:19:11 +0100 Subject: [PATCH 651/684] treewide: structured attrs fixes --- pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index aaa3a1ebe327..afa5dc1c08cb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -81,8 +81,8 @@ appleDerivation ({ export DSTROOT=$out ''; - buildFlags = lib.optionalString headersOnly "exporthdrs"; - installTargets = lib.optionalString headersOnly "installhdrs"; + buildFlags = lib.optional headersOnly "exporthdrs"; + installTargets = lib.optional headersOnly "installhdrs"; postInstall = lib.optionalString headersOnly '' mv $out/usr/include $out From cbbba87b98efb6e3924965ebb6629d13efa6f671 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Nov 2019 20:31:37 +0100 Subject: [PATCH 652/684] libgdiplus: fix for structured attrs --- pkgs/development/libraries/libgdiplus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 1a690ca7aa1f..54bf091e5ea9 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - configureFlags = stdenv.lib.optionalString stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; buildInputs = [ glib cairo fontconfig libtiff giflib From a012d5eebba466d778945573295b22b2a0a1f3fd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 9 Nov 2019 22:18:05 +0100 Subject: [PATCH 653/684] ldc: fix for structured attrs --- pkgs/development/compilers/ldc/default.nix | 68 ++++++++-------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 03e6fa82b9d0..fff6435b29ea 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; postUnpack = '' - patchShebangs . + patchShebangs . '' + stdenv.lib.optionalString (!bootstrapVersion) '' @@ -76,47 +76,31 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - - ++ stdenv.lib.optional (!bootstrapVersion) [ - bootstrapLdc python lit - ] - - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [ - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ] - - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ - llvm_8 - ] - - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - gdb - ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig llvm_5 - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); + ++ stdenv.lib.optionals (!bootstrapVersion) [ + bootstrapLdc python lit + ] + ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) + llvm_8 + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ++ stdenv.lib.optionals (bootstrapVersion) [ + libconfig llvm_5 + ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin + darwin.apple_sdk.frameworks.Foundation; buildInputs = [ curl tzdata ]; - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" "-DCMAKE_BUILD_TYPE=Release" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; + ]; postConfigure = '' export DMD=$PWD/bin/ldmd2 @@ -124,7 +108,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DMD=$DMD" ]; - fixNames = if stdenv.hostPlatform.isDarwin then '' + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames() { local flags=() @@ -141,15 +125,11 @@ stdenv.mkDerivation rec { fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") export DYLD_LIBRARY_PATH=$(pwd)/lib - '' - else - ""; + ''; # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = if stdenv.hostPlatform.isDarwin then - "|druntime-test-shared" - else - ""; + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; doCheck = !bootstrapVersion; From 8a227a2341e8900b0fc7f8646c7102ef02515564 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 9 Nov 2019 23:14:38 +0100 Subject: [PATCH 654/684] treewide: fix nested lists in *buildInputs --- pkgs/development/compilers/ghc/8.6.5.nix | 2 +- pkgs/development/libraries/gtk/2.x.nix | 2 +- pkgs/development/libraries/gtk/3.x.nix | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index f285e271c624..c5f48940dac6 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 4286d6a73fb7..932527eed092 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./hooks/drop-icon-theme-cache.sh ]; - nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ]; patches = [ ./patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 5a2d9159cac2..60432614433b 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -115,8 +115,7 @@ stdenv.mkDerivation rec { pkgconfig python3 sassc - setupHooks - ] ++ optionals withGtkDoc [ + ] ++ setupHooks ++ optionals withGtkDoc [ docbook_xml_dtd_43 docbook_xsl gtk-doc From 5ed6a9c70dcf847687481848d02774bcf52b0b51 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Nov 2019 23:50:03 +0100 Subject: [PATCH 655/684] firefox: fix for structured attrs --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 7b73027f203d..66d499e779e7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] - ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") python3 ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; From 01e8c649889a0a9493a38505023f7e33d98d8446 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 01:00:46 +0100 Subject: [PATCH 656/684] flint: fix for structured attrs --- pkgs/development/libraries/flint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 20a80119b136..462d186c72df 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CXXSTDLIB_COMPILE = [ "-std=c++11" ]; + NIX_CXXSTDLIB_COMPILE = "-std=c++11"; patches = [ (fetchpatch { From 760e23136acfc192fd9a51b6b3c63fbc0a0c999d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 10 Nov 2019 00:52:53 +0100 Subject: [PATCH 657/684] treewide: *inputs are lists --- pkgs/applications/audio/clementine/default.nix | 2 +- pkgs/applications/audio/cmus/default.nix | 2 +- .../editors/emacs-modes/libgenerated.nix | 2 +- pkgs/applications/editors/yi/wrapper.nix | 2 +- pkgs/applications/misc/gollum/default.nix | 14 +++++++------- .../instant-messengers/mikutter/default.nix | 16 ++++++++-------- .../deepin/deepin-icon-theme/default.nix | 2 +- pkgs/development/compilers/elm/makeDotElm.nix | 3 --- pkgs/development/compilers/ghc/8.8.1.nix | 2 +- pkgs/development/interpreters/php/default.nix | 14 +++++++------- pkgs/development/libraries/java/swt/default.nix | 4 ++-- .../mobile/androidenv/build-tools.nix | 2 +- .../mobile/androidenv/platform-tools.nix | 2 +- .../python-modules/buildbot/default.nix | 5 ++--- pkgs/development/python-modules/treq/default.nix | 4 ++-- pkgs/os-specific/linux/brillo/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 5 +---- pkgs/tools/admin/fastlane/default.nix | 14 +++++++------- 18 files changed, 45 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0a374c26142a..3fdf98da325c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -77,7 +77,7 @@ let inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks - buildInputs = buildInputs ++ [ makeWrapper gst_plugins ]; + buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b88951c0fc5b..023e35bd7870 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.cc.isClang clangGCC ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] - ++ concatMap (a: a.deps) opts; + ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 0529fce2b16d..57bccc608183 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -77,7 +77,7 @@ in { url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}"; inherit sha256; }; - packageRequires = lib.optional (! isNull deps) + packageRequires = lib.optionals (! isNull deps) (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 0f3cd7d136a7..243690bc2632 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; # For hacking purposes - env = yiEnv; + passthru.env = yiEnv; meta = with stdenv.lib; { description = "Allows Yi to find libraries and the compiler easily"; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index e9a177ee1937..251e84f04c36 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - inherit pname ruby; - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 5778a2dea3b0..7d2037d16a77 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -27,13 +27,6 @@ stdenv.mkDerivation rec { sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g"; }; - env = bundlerEnv { - name = "mikutter-${version}-gems"; - gemdir = ./.; - - inherit ruby; - }; - buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ]; nativeBuildInputs = [ wrapGAppsHook ]; @@ -44,7 +37,14 @@ stdenv.mkDerivation rec { rm -rf vendor ''; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "mikutter-${version}-gems"; + gemdir = ./.; + + inherit ruby; + }; + in '' install -v -D -m644 README $out/share/doc/mikutter/README install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE rm -v README LICENSE diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index f8258a1d8cdc..b6b9feb410b5 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; buildTargets = "all hicolor-links"; - installTargets = "install-icons install-cursors"; + installTargets = [ "install-icons" "install-cursors" ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 3ceaae450f01..0831d382c4b2 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -11,13 +11,10 @@ ver: deps: inherit (info) sha256; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out cp -r * $out ''; - }; in '' mkdir -p .elm/${ver}/packages/${name} diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 6872cea4e2a2..9e95ba0de2bb 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 26798d676e04..0fa605a4cac7 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -95,8 +95,8 @@ let ++ optional postgresqlSupport postgresql ++ optional pdo_odbcSupport unixODBC ++ optional pdo_pgsqlSupport postgresql - ++ optional pdo_mysqlSupport mysqlBuildInputs - ++ optional mysqliSupport mysqlBuildInputs + ++ optionals pdo_mysqlSupport mysqlBuildInputs + ++ optionals mysqliSupport mysqlBuildInputs ++ optional gmpSupport gmp ++ optional gettextSupport gettext ++ optional intlSupport icu @@ -109,14 +109,14 @@ let ++ optional libzipSupport libzip ++ optional valgrindSupport valgrind; - CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11"; configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ] - ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" - ++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}" - ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}" + ++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ] + ++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] + ++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] ++ optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ optional withSystemd "--with-fpm-systemd" ++ optionals imapSupport [ @@ -129,7 +129,7 @@ let "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" ] - ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" + ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" ++ optional embedSupport "--enable-embed" ++ optional mhashSupport "--with-mhash" diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 6eb5a1f53553..b0fdca112186 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -38,8 +38,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ unzip pkgconfig ]; buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; - NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++ - [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; + NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) + + " -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0"; buildPhase = '' unzip src.zip -d src diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 976ef1416275..9e273468cd3f 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 5b4cad1f264f..c39d966959a3 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 7385a3295518..e627667f3ec2 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -44,10 +44,9 @@ let autobahn pyjwt pyyaml - + ] # tls - twisted.extras.tls - ]; + ++ twisted.extras.tls; checkInputs = [ treq diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index f49c7a0d2430..1d488eed4e1b 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { incremental service-identity twisted + ] # twisted [tls] requirements (we should find a way to list "extras") - twisted.extras.tls - ]; + ++ twisted.extras.tls; checkInputs = [ pep8 diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 6d51907ea166..1262260664cd 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "AADIR=$(out)/etc/apparmor.d" ]; - installTargets = "install-dist"; + installTargets = [ "install-dist" ]; meta = with stdenv.lib; { description = "Backlight and Keyboard LED control tool"; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 638617141457..d5da6df8d689 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -44,10 +44,6 @@ stdenv.mkDerivation rec { # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = [ "--with-apr=${apr.dev}" "--with-apr-util=${aprutil.dev}" @@ -60,6 +56,7 @@ stdenv.mkDerivation rec { "--enable-cern-meta" "--enable-imagemap" "--enable-cgi" + "--includedir=${placeholder "dev"}/include" (stdenv.lib.enableFeature proxySupport "proxy") (stdenv.lib.enableFeature sslSupport "ssl") (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index afb044ad583a..1cdc969ea2e6 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - inherit pname ruby; - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/fastlane $out/bin/fastlane \ --set FASTLANE_SKIP_UPDATE_CHECK 1 From 839c0ea7a551b48db68a4f666b9b493bcc2a044b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Nov 2019 01:12:23 +0100 Subject: [PATCH 658/684] treewide: *Inputs are flat lists --- pkgs/applications/misc/ranger/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/development/libraries/qtkeychain/default.nix | 6 +++--- pkgs/development/python-modules/msrestazure/default.nix | 2 +- pkgs/tools/admin/salt/default.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7045228d6a2f..adfa6b16bbfb 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ] - ++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; + ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' py.test tests diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d47797a30463..4fae93aa1a18 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -179,7 +179,7 @@ in stdenv.mkDerivation { ++ lib.optional udevSupport udev ++ lib.optional usbSupport libusb ++ lib.optional vdpauSupport libvdpau - ++ lib.optional useWayland [ + ++ lib.optionals useWayland [ wayland waylandpp # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev @@ -192,7 +192,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - ] ++ lib.optional useWayland [ wayland-protocols ]; + ] ++ lib.optionals useWayland [ wayland-protocols ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 4951670f8964..5b963255b65f 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret ; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ] + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) - ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]) ; diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index a820dd89f512..04f7428e6b61 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ adal msrest ]; checkInputs = [ httpretty mock pytest ] - ++ lib.optional isPy3k [ pytest-asyncio ]; + ++ lib.optionals isPy3k [ pytest-asyncio ]; checkPhase = '' pytest tests/ diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 13bba0860c49..c94686c93c16 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ + ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ futures ] ++ extraInputs; From 81ffabdf4f228732607796fc3c58148c8d62affe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Nov 2019 02:08:01 +0100 Subject: [PATCH 659/684] treewide: use flat lists for *Inputs, fix env usage --- pkgs/development/libraries/gegl/4.0.nix | 2 +- pkgs/misc/emulators/retroarch/cores.nix | 2 +- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 1bdf557f399d..75897b036bfa 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # TODO: Fix missing math symbols in gegl seamless clone. # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = [ "-lm" ]; + NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8171f6c2337..45ed31168f00 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -720,7 +720,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; }).override { - cmakeFlags = "-DLIBRETRO=ON"; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; buildPhase = '' make \ diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 34e3961250cf..0333e0fec2ae 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ] - ++ optional withVulkan [ makeWrapper ]; + ++ optionals withVulkan [ makeWrapper ]; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit - ++ optional withVulkan [ vulkan-loader ] + ++ optionals withVulkan [ vulkan-loader ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev ]; From 5aff75d32d9d59801e7e8ec7ecff4ee3f8d8e73a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Dec 2019 16:17:08 -0800 Subject: [PATCH 660/684] iasl: make NIX_CFLAGS_COMPILE a list strings are no longer supported for this attribute. --- pkgs/development/compilers/iasl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index e98d7cc27dbf..36d402ee71f4 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h"; }; - NIX_CFLAGS_COMPILE = "-O3"; + NIX_CFLAGS_COMPILE = [ "-O3" ]; buildFlags = [ "iasl" ]; From 006242fd5ac679889ff3f9bc074ffad95a43041f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 10 Nov 2019 02:13:39 +0100 Subject: [PATCH 661/684] treewide: fix types for mkDerivation params --- pkgs/applications/audio/moc/default.nix | 2 +- pkgs/applications/office/trilium/default.nix | 2 +- .../applications/video/obs-studio/default.nix | 8 ++- pkgs/development/compilers/ghc/8.4.4.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- .../python-modules/scapy/default.nix | 14 ++--- .../tools/misc/watson-ruby/default.nix | 17 +++--- pkgs/misc/emulators/retroarch/default.nix | 4 +- pkgs/os-specific/linux/sysdig/default.nix | 2 +- pkgs/shells/zsh/grml-zsh-config/default.nix | 2 +- pkgs/tools/backup/lvmsync/default.nix | 25 ++++----- pkgs/tools/misc/ldmtool/default.nix | 52 +++++++++---------- pkgs/tools/misc/pws/default.nix | 18 +++---- pkgs/tools/networking/maphosts/default.nix | 16 +++--- pkgs/tools/security/fwknop/default.nix | 4 +- pkgs/tools/system/testdisk/default.nix | 2 +- pkgs/tools/text/mdcat/default.nix | 2 +- pkgs/tools/text/reckon/default.nix | 14 ++--- 18 files changed, 90 insertions(+), 98 deletions(-) diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 89d062d584e5..5615f4cace3d 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ++ opt midiSupport timidity ++ opt modplugSupport libmodplug ++ opt mp3Support libmad - ++ opt musepackSupport [ libmpc libmpcdec taglib ] + ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index d44b51861dc5..28548091f6ea 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -48,7 +48,7 @@ in { wrapGAppsHook ]; - buildInputs = [ atomEnv.packages gtk3 ]; + buildInputs = atomEnv.packages ++ [ gtk3 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fdcfd7e0bec3..82462f4e2c28 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -34,7 +34,7 @@ }: let - optional = stdenv.lib.optional; + inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; version = "24.0.4"; @@ -46,9 +46,7 @@ in mkDerivation rec { sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q"; }; - nativeBuildInputs = [ cmake - pkgconfig - ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -68,7 +66,7 @@ in mkDerivation rec { makeWrapper mbedtls ] - ++ optional scriptingSupport [ luajit swig python3 ] + ++ optionals scriptingSupport [ luajit swig python3 ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 73c7e4708d5c..aa29635fee0d 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -69,7 +69,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8d22c0a674bc..e9ecdedf3716 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -74,7 +74,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 8f51b1eda212..4f058a0761bd 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -34,13 +34,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ pycrypto ecdsa ] - ++ lib.optional withOptionalDeps [ tcpdump ipython ] - ++ lib.optional withCryptography [ cryptography ] - ++ lib.optional withVoipSupport [ sox ] - ++ lib.optional withPlottingSupport [ matplotlib ] - ++ lib.optional withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ] - ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ] - ++ lib.optional doCheck [ mock ]; + ++ lib.optionals withOptionalDeps [ tcpdump ipython ] + ++ lib.optional withCryptography cryptography + ++ lib.optional withVoipSupport sox + ++ lib.optional withPlottingSupport matplotlib + ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ] + ++ lib.optional (isPy3k && pythonOlder "3.4") enum34 + ++ lib.optional doCheck mock; # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate) doCheck = if isPy3k then false else true; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index e1726efc40c1..64e04455abe6 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,20 +1,19 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: - stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - env = bundlerEnv { - name = "watson-ruby-gems-${version}"; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "watson-ruby-gems-${version}"; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + }; + in '' mkdir -p $out/bin ln -s ${env}/bin/watson $out/bin/watson ''; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 0333e0fec2ae..3f14258b0c01 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ] - ++ optionals withVulkan [ makeWrapper ]; + ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit - ++ optionals withVulkan [ vulkan-loader ] + ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4008045938ee..61a51afa3a75 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc - ] ++ optional (kernel != null) kernel.moduleBuildDependencies; + ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 80f51dbb763f..d23999abf3da 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zsh coreutils txt2tags procps ] - ++ optional stdenv.isLinux [ inetutils ]; + ++ optional stdenv.isLinux inetutils; buildPhase = '' cd doc diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 8c23d804d0b8..a52c6bf1ba7c 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -1,27 +1,22 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: -let - +stdenv.mkDerivation rec { pname = "lvmsync"; version = (import ./gemset.nix).${pname}.version; -in stdenv.mkDerivation rec { - - name = "${pname}-${version}"; - - env = bundlerEnv { - name = "${pname}-${version}-gems"; - ruby = ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; - buildInputs = [ makeWrapper ]; phases = ["installPhase"]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + ruby = ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync ''; diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 734586fb1ab3..2ec683484958 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -3,15 +3,15 @@ , fetchpatch }: stdenv.mkDerivation rec { - pname = "ldmtool"; - version = "0.2.4"; + pname = "ldmtool"; + version = "0.2.4"; - src = fetchFromGitHub { - owner = "mdbooth"; - repo = "libldm"; - rev = "libldm-${version}"; - sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; - }; + src = fetchFromGitHub { + owner = "mdbooth"; + repo = "libldm"; + rev = "libldm-${version}"; + sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; + }; patches = [ # Remove useage of deprecrated G_PARAM_PRIVATE @@ -21,26 +21,26 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = '' - sed -i docs/reference/ldmtool/Makefile.am \ - -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' - ''; + preConfigure = '' + sed -i docs/reference/ldmtool/Makefile.am \ + -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' + ''; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - configureScript = "sh autogen.sh"; + configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin - libtool readline gobject-introspection json-glib libuuid - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin + libtool readline gobject-introspection json-glib libuuid + ]; - meta = with stdenv.lib; { - description = "Tool and library for managing Microsoft Windows Dynamic Disks"; - homepage = https://github.com/mdbooth/libldm; - maintainers = with maintainers; [ jensbin ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Tool and library for managing Microsoft Windows Dynamic Disks"; + homepage = https://github.com/mdbooth/libldm; + maintainers = with maintainers; [ jensbin ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index d5f2fd4afd4f..50952435dd76 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - env = bundlerEnv { - name = "${name}-gems"; - - inherit ruby; - - gemdir = ./.; - }; - buildInputs = [ makeWrapper ]; phases = ["installPhase"]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${name}-gems"; + + inherit ruby; + + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/pws $out/bin/pws \ --set PATH '"${xsel}/bin/:$PATH"' diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index e54a2b21d9fd..6b5fded40dd9 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "maphosts-${env.gems.maphosts.version}"; - env = bundlerEnv { - name = "maphosts-gems"; - inherit ruby; - gemdir = ./.; - }; - phases = ["installPhase"]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "maphosts-gems"; + inherit ruby; + gemdir = ./.; + }; + in '' mkdir -p "$out/bin" ln -s "${env}/bin/maphosts" "$out/bin/maphosts" ''; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 4579136add26..a9f69c8b96e1 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap texinfo ] - ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ] - ++ stdenv.lib.optional wgetSupport [ wget ]; + ++ stdenv.lib.optionals gnupgSupport [ gnupg gpgme.dev ] + ++ stdenv.lib.optionals wgetSupport [ wget ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 9cec99145b9c..ad11cd2e3b65 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -37,7 +37,7 @@ assert enableQt -> qwt != null; ] ++ stdenv.lib.optional enableNtfs ntfs3g ++ stdenv.lib.optional enableExtFs e2fsprogs - ++ stdenv.lib.optional enableQt [ qtbase qttools qwt ]; + ++ stdenv.lib.optionals enableQt [ qtbase qttools qwt ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 4139771b5cb2..626963bc6010 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ (stdenv.lib.optional stdenv.isDarwin Security) openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; cargoSha256 = "1hxsfls6fpllc9yg5ib3qz6pa62j1y1va8a6356j6812csk4ifnn"; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 25e9c07f351e..261149229b64 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - - gemdir = ./.; - }; - phases = [ "installPhase" ]; buildInputs = [ makeWrapper ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon ''; From edfdd0f3e495018583f908b9fb5c7740f7bebe33 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 11 Nov 2019 19:26:57 +0100 Subject: [PATCH 662/684] darwin: use dontUnpack instead of phases --- pkgs/os-specific/darwin/apple-sdk/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 8456d64a4514..c3914777c6dc 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -18,7 +18,6 @@ let buildInputs = [ xar cpio python pbzx ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; outputs = [ "out" "dev" "man" ]; unpackPhase = '' @@ -52,7 +51,7 @@ let framework = name: deps: stdenv.mkDerivation { name = "apple-framework-${name}"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; # because we copy files from the system preferLocalBuild = true; @@ -137,7 +136,7 @@ in rec { libs = { xpc = stdenv.mkDerivation { name = "apple-lib-xpc"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include @@ -150,7 +149,7 @@ in rec { Xplugin = stdenv.mkDerivation { name = "apple-lib-Xplugin"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; # Not enough __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ]; @@ -168,7 +167,7 @@ in rec { utmp = stdenv.mkDerivation { name = "apple-lib-utmp"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include From 4a8de55be08d0786b3862801f3ed6ddad8c27945 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 11 Nov 2019 20:53:15 +0100 Subject: [PATCH 663/684] ffmpeg: fix for structured attrs --- pkgs/development/libraries/ffmpeg/generic.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 3424493c2098..956d2d7223f6 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -44,7 +44,7 @@ let inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; - inherit (stdenv.lib) optional optionals optionalString enableFeature; + inherit (stdenv.lib) optional optionals optionalString enableFeature filter; cmpVer = builtins.compareVersions; reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! configurePlatforms = []; - configureFlags = [ + configureFlags = filter (v: v != null) ([ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" # License @@ -96,13 +96,15 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--enable-pic") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" + ] ++ (if multithreadBuild then ( if stdenv.isCygwin then - "--disable-pthreads --enable-w32threads" + ["--disable-pthreads" "--enable-w32threads"] else # Use POSIX threads by default - "--enable-pthreads --disable-w32threads") + ["--enable-pthreads" "--disable-w32threads"]) else - "--disable-pthreads --disable-w32threads") + ["--disable-pthreads" "--disable-w32threads"]) + ++ [ (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 "--enable-network" (ifMinVer "2.4" "--enable-pixelutils") @@ -161,7 +163,7 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - ] ++ optional stdenv.cc.isClang "--cc=clang"; + ] ++ optional stdenv.cc.isClang "--cc=clang"); nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; From b92fc0fba48a43ca13eccdc4cb8c8d6aada5b831 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 12 Nov 2019 18:31:22 +0100 Subject: [PATCH 664/684] nfstrace: fix for structured attrs --- pkgs/tools/networking/nfstrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 50654da54e4f..72a0ea3682b7 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # To build with GCC 8+ it needs: - CXXFLAGS = [ "-Wno-class-memaccess" "-Wno-ignored-qualifiers" ]; + CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers"; # CMake can't find json_c without: - NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ]; + NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c"; doCheck = false; # requires network access From 823b96a52b28bfc1e3b7503e5f3c51346406acfa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Nov 2019 14:17:33 +0100 Subject: [PATCH 665/684] rustc: fix for structured attrs --- pkgs/development/compilers/rust/rustc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 44bbd05aec73..e5c8a709a900 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv.lib) optional optionalString; + inherit (stdenv.lib) optionals optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; @@ -83,12 +83,12 @@ in stdenv.mkDerivation rec { "${setBuild}.cxx=${cxxForBuild}" "${setHost}.cxx=${cxxForHost}" "${setTarget}.cxx=${cxxForTarget}" - ] ++ optional (!withBundledLLVM) [ + ] ++ optionals (!withBundledLLVM) [ "--enable-llvm-link-shared" "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" - ] ++ optional stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ "--enable-profiler" # build libprofiler_builtins ]; From 15468f9a4b2a6cf31618d52561f202dbbc1fd2d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Nov 2019 15:57:35 +0100 Subject: [PATCH 666/684] ghc*: fix for structured attrs configureFlags must be a flat list. --- pkgs/development/compilers/ghc/8.4.4.nix | 4 ++-- pkgs/development/compilers/ghc/8.6.5.nix | 4 ++-- pkgs/development/compilers/ghc/8.8.1.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index aa29635fee0d..f79200d1199b 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -167,9 +167,9 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index c5f48940dac6..0b565d3705da 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -167,9 +167,9 @@ stdenv.mkDerivation (rec { "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 9e95ba0de2bb..9197b80224e7 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -152,9 +152,9 @@ stdenv.mkDerivation (rec { "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e9ecdedf3716..c49222f49da3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -161,9 +161,9 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" From 91a1f2043f4b3df24c37e88ee5840499f9258462 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Nov 2019 11:32:45 +0100 Subject: [PATCH 667/684] sudo: fix for structured attrs --- pkgs/tools/security/sudo/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index a0922f4df738..d2877a1ff1b2 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -41,6 +41,15 @@ stdenv.mkDerivation rec { "--with-passprompt=[sudo] password for %p: " # intentional trailing space ]; + installFlags = [ + "sudoers_uid=$(shell id -u)" + "sudoers_gid=$(shell id -g)" + "sysconfdir=${placeholder ''out''}/etc" + "rundir=$(TMPDIR)/dummy" + "vardir=$(TMPDIR)/dummy" + "DESTDIR=/" + ]; + postConfigure = '' cat >> pathnames.h <<'EOF' @@ -48,7 +57,6 @@ stdenv.mkDerivation rec { #define _PATH_MV "${coreutils}/bin/mv" EOF makeFlags="install_uid=$(id -u) install_gid=$(id -g)" - installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/" ''; nativeBuildInputs = [ groff ]; From a534e750a82ee6582cbf08ad9c325580c003d3cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Nov 2019 11:36:01 +0100 Subject: [PATCH 668/684] lvm2: fix build --- pkgs/os-specific/linux/lvm2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9c48caaa2430..7eac8fad64cd 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { doCheck = false; # requires root # To prevent make install from failing. - preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; # Install systemd stuff. #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; From e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 20 Nov 2019 09:21:30 +0100 Subject: [PATCH 669/684] treewide: configureFlags is a flat list --- .../compilers/gcc/common/configure-flags.nix | 2 +- .../libraries/qt-5/modules/qtbase.nix | 9 ++++----- pkgs/misc/ghostscript/default.nix | 18 +++++++++++------- pkgs/tools/networking/dhcp/default.nix | 4 ++-- pkgs/tools/networking/vde2/default.nix | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 3b96f432e96c..aa0fcb506289 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -153,7 +153,7 @@ let ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) - ++ lib.optional (targetPlatform != hostPlatform) crossConfigureFlags + ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" # Platform-specific flags diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index cd426884d12d..bc23d0f9cafe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -170,11 +170,6 @@ stdenv.mkDerivation { export LD=$CXX ''} - configureFlags+="\ - -plugindir $out/$qtPluginPrefix \ - -qmldir $out/$qtQmlPrefix \ - -docdir $out/$qtDocPrefix" - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" ''; @@ -222,6 +217,10 @@ stdenv.mkDerivation { # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ + "-plugindir $(out)/$(qtPluginPrefix)" + "-qmldir $(out)/$(qtQmlPrefix)" + "-docdir $(out)/$(qtDocPrefix)" + "-verbose" "-confirm-license" "-opensource" diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 541fbea1dd40..37974e41080f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -76,15 +76,19 @@ stdenv.mkDerivation rec { sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac autoconf - '' + lib.optionalString cupsSupport '' - configureFlags="$configureFlags --with-cups-serverbin=$out/lib/cups --with-cups-serverroot=$out/etc/cups --with-cups-datadir=$out/share/cups" ''; - configureFlags = - [ "--with-system-libtiff" - "--enable-dynamic" - ] ++ lib.optional x11Support "--with-x" - ++ lib.optional cupsSupport "--enable-cups"; + configureFlags = [ + "--with-system-libtiff" + "--enable-dynamic" + ] + ++ lib.optional x11Support "--with-x" + ++ lib.optionals cupsSupport [ + "--enable-cups" + "--with-cups-serverbin=$(out)/lib/cups" + "--with-cups-serverroot=$(out)/etc/cups" + "--with-cups-datadir=$(out)/share/cups" + ]; doCheck = true; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 5e552da98dfe..c5d650f52bbd 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { "--enable-early-chroot" "--sysconfdir=/etc" "--localstatedir=/var" - (lib.optional stdenv.isLinux "--with-randomdev=/dev/random") - ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random" + ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 4ea09cd7f006..e43c174ab3f5 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { } ); - configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ]; + configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; buildInputs = [ openssl libpcap ] ++ stdenv.lib.optional withPython python2; From 6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 20 Nov 2019 10:17:54 +0100 Subject: [PATCH 670/684] treewide: configureFlags is a flat list --- pkgs/applications/audio/openmpt123/default.nix | 2 +- pkgs/applications/editors/codeblocks/default.nix | 2 +- pkgs/applications/misc/mlterm/default.nix | 4 +--- .../networking/ids/suricata/default.nix | 6 +++--- .../networking/mailreaders/sylpheed/default.nix | 6 ++---- pkgs/development/libraries/libftdi/default.nix | 2 +- .../development/libraries/libjpeg-drop/default.nix | 2 +- pkgs/development/libraries/portaudio/default.nix | 2 +- pkgs/development/tools/misc/srecord/default.nix | 4 +--- pkgs/games/minetest/default.nix | 2 +- pkgs/servers/http/nginx/generic.nix | 6 +++--- pkgs/servers/http/tengine/default.nix | 10 +++++----- pkgs/servers/http/unit/default.nix | 6 +++--- pkgs/servers/mail/opensmtpd/extras.nix | 14 +++++++------- pkgs/tools/graphics/gifsicle/default.nix | 7 +++---- pkgs/tools/graphics/graphviz/base.nix | 2 +- pkgs/tools/networking/chrony/default.nix | 2 +- pkgs/tools/networking/ipv6calc/default.nix | 10 +++------- 18 files changed, 39 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 58e0887163d7..0e52d144e51c 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] ++ stdenv.lib.optional usePulseAudio libpulseaudio; - configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; + configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio"; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 72642cfbe63f..cbed08f317fa 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] - ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; + ++ optionals contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 0c8ad9ae1b3c..b2012801e170 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #and configuring ~/.mlterm/key correctly. - ] ++ stdenv.lib.optional (libssh2 == null) [ - "--disable-ssh2" - ]; + ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index cb45ec3f1e53..24c088f7f2ef 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -109,12 +109,12 @@ stdenv.mkDerivation rec { "--with-libnet-includes=${libnet}/include" "--with-libnet-libraries=${libnet}/lib" ] - ++ lib.optional hyperscanSupport [ + ++ lib.optionals hyperscanSupport [ "--with-libhs-includes=${hyperscan.dev}/include/hs" "--with-libhs-libraries=${hyperscan}/lib" ] - ++ lib.optional redisSupport [ "--enable-hiredis" ] - ++ lib.optional rustSupport [ + ++ lib.optional redisSupport "--enable-hiredis" + ++ lib.optionals rustSupport [ "--enable-rust" "--enable-rust-experimental" ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 986ee5fe3c9e..8e1f67201207 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { ++ optionals gpgSupport [ gpgme ] ++ optionals sslSupport [ openssl ]; - configureFlags = [ - (optional gpgSupport "--enable-gpgme") - (optional sslSupport "--enable-ssl") - ]; + configureFlags = optional gpgSupport "--enable-gpgme" + ++ optional sslSupport "--enable-ssl"; meta = { homepage = http://sylpheed.sraoss.jp/en/; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 08ec1d84a3f0..3dffbd075e93 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -14,7 +14,7 @@ with stdenv; mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - configureFlags = lib.optional (!isDarwin) [ "--with-async-mode" ]; + configureFlags = lib.optional (!isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 4e9c165e71fb..8ed1c9bf92fe 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; configureFlags = [] - ++ optional static [ "--enable-static" "--disable-shared" ]; + ++ optionals static [ "--enable-static" "--disable-shared" ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 92b56467aee9..68daece490fa 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = [ "--disable-mac-universal --enable-cxx" ]; + configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index a76a180741ef..fd8105552967 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost libtool groff ghostscript libgcrypt ]; - configureFlags = [ - (stdenv.lib.optional (libgcrypt == null) "--without-gcrypt") - ]; + configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt"; meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index c26536c5c2aa..f286c359e6fc 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -48,7 +48,7 @@ let irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm - ] ++ optional buildServer [ + ] ++ optionals buildServer [ leveldb postgresql hiredis ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2d1b994faab6..990d7c5cf134 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -53,15 +53,15 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_geoip_module" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" ] ++ optional (perl != null) [ diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1467b1577f99..1eeb5a8c4dd8 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -53,23 +53,23 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (!withMail) [ + ] ++ optionals (!withMail) [ "--without-mail_pop3_module" "--without-mail_imap_module" "--without-mail_smtp_module" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_ssl_module" "--with-stream_realip_module" "--with-stream_geoip_module" "--with-stream_ssl_preread_module" "--with-stream_sni" - ] ++ optional (!withStream) [ + ] ++ optionals (!withStream) [ "--without-stream_limit_conn_module" "--without-stream_access_module" "--without-stream_geo_module" diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8711be4b5c00..d68c37e02d91 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { "--pid=/run/unit/unit.pid" "--user=unit" "--group=unit" - ] ++ optional withSSL [ "--openssl" ] - ++ optional (!withIPv6) [ "--no-ipv6" ] - ++ optional withDebug [ "--debug" ]; + ] ++ optional withSSL "--openssl" + ++ optional (!withIPv6) "--no-ipv6" + ++ optional withDebug "--debug"; postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5a5fc537d6eb..14d36ad65549 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -48,31 +48,31 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optional enablePython [ + ] ++ stdenv.lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optional enableLua [ + ] ++ stdenv.lib.optionals enableLua [ "--with-lua=${pkgconfig}" "--with-filter-lua" - ] ++ stdenv.lib.optional enablePerl [ + ] ++ stdenv.lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optional enableMysql [ + ] ++ stdenv.lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optional enablePostgres [ + ] ++ stdenv.lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optional enableSqlite [ + ] ++ stdenv.lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optional enableRedis [ + ] ++ stdenv.lib.optionals enableRedis [ "--with-table-redis" ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 79b2708cb2b7..9b3836b9decc 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; }; - buildInputs = optional gifview [ xorgproto libXt libX11 ]; + buildInputs = optionals gifview [ xorgproto libXt libX11 ]; - configureFlags = [] - ++ optional (!gifview) [ "--disable-gifview" ]; + configureFlags = optional (!gifview) "--disable-gifview"; - LDFLAGS = optional static "-static"; + LDFLAGS = optionalString static "-static"; doCheck = true; checkPhase = '' diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 700bed237bdb..3b9d8a4cca5d 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; + ] ++ stdenv.lib.optional (xorg == null) "--without-x"; inherit patches; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index c0c3281431f5..2ec16aa430a3 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] - ++ stdenv.lib.optional stdenv.isLinux [ "--enable-scfilter" ]; + ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter"; meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 5de4b8cecb78..35aeb23a9a83 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -30,13 +30,9 @@ stdenv.mkDerivation rec { "--disable-bundled-md5" "--disable-dynamic-load" "--enable-shared" - ] ++ stdenv.lib.optional (libmaxminddb != null ) [ - "--enable-mmdb" - ] ++ stdenv.lib.optional (geolite-legacy != null) [ - "--with-geoip-db=${geolite-legacy}/share/GeoIP" - ] ++ stdenv.lib.optional (ip2location-c != null ) [ - "--enable-ip2location" - ]; + ] ++ stdenv.lib.optional (libmaxminddb != null) "--enable-mmdb" + ++ stdenv.lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ++ stdenv.lib.optional (ip2location-c != null) "--enable-ip2location"; enableParallelBuilding = true; From f6a3f5af36824cc99ad910389c0b22d4c9ffcadd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 24 Nov 2019 17:14:28 +0100 Subject: [PATCH 671/684] treewide: structured-attrs fixes --- pkgs/applications/kde/print-manager.nix | 5 +---- .../networking/instant-messengers/signal-cli/default.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f869f984e001..f0501ffadee4 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -22,8 +22,5 @@ mkDerivation { outputs = [ "out" "dev" ]; # Fix build with cups deprecations etc. # See: https://github.com/NixOS/nixpkgs/issues/73334 - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=format-security" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c821c4b0f44e..8471f43c6dd0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; }; - buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c49222f49da3..415f6c74ad58 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ + ] ++ stdenv.lib.optionals enableDwarf [ "--enable-dwarf-unwind" "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include" "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib" From 7084c052a0f12af6271290a9e71d463bf1c834e7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Dec 2019 16:57:27 -0800 Subject: [PATCH 672/684] hspellDicts.*: remove invalid buildFlags meta attr --- pkgs/development/libraries/hspell/dicts.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index 637a11efaef7..87f4e4672d0a 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -6,9 +6,6 @@ let meta = hspell.meta // { broken = true; description = "${variant} Hebrew dictionary"; - - buildFlags = [ variant ]; - } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); in From 49e485925632fd1a75b29cc4334f69e8fc09464a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 02:32:47 +0100 Subject: [PATCH 673/684] hspell: Fix meta check --- pkgs/development/libraries/hspell/dicts.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index 637a11efaef7..83942c2c1dde 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -3,12 +3,11 @@ let dict = variant: a: stdenv.mkDerivation ({ inherit (hspell) src patchPhase nativeBuildInputs; + buildFlags = [ variant ]; + meta = hspell.meta // { broken = true; description = "${variant} Hebrew dictionary"; - - buildFlags = [ variant ]; - } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); in From 9a8441c170d12b4dcc398dab25f4fb777924578b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 02:37:24 +0100 Subject: [PATCH 674/684] maphosts: fix build --- pkgs/tools/networking/maphosts/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 6b5fded40dd9..dd9886a65eee 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript }: -stdenv.mkDerivation { +let + env = bundlerEnv { + name = "maphosts-gems"; + inherit ruby; + gemdir = ./.; + }; +in stdenv.mkDerivation { name = "maphosts-${env.gems.maphosts.version}"; phases = ["installPhase"]; - installPhase = let - env = bundlerEnv { - name = "maphosts-gems"; - inherit ruby; - gemdir = ./.; - }; - in '' + installPhase = '' mkdir -p "$out/bin" ln -s "${env}/bin/maphosts" "$out/bin/maphosts" ''; From c5406e30b02df521e75c4f5b7de62be322b05810 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 02:59:40 +0100 Subject: [PATCH 675/684] qpid-cpp: fix eval --- pkgs/servers/amqp/qpid-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 97c1ec90ed12..02c2e03d90fa 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -33,7 +33,7 @@ let sed -i '/management/d' CMakeLists.txt ''; - NIX_CFLAGS_COMPILE = toString [ + NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=deprecated-declarations" "-Wno-error=int-in-bool-context" "-Wno-error=maybe-uninitialized" @@ -42,7 +42,7 @@ let "-Wno-error=catch-value" ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" - ]; + ]); }; python-frontend = buildPythonPackage { From 60a34108da182116a680dee8f96b85f8e2f9f88e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 03:58:34 +0100 Subject: [PATCH 676/684] Revert "hspellDicts.*: remove invalid buildFlags meta attr" This reverts commit 7084c052a0f12af6271290a9e71d463bf1c834e7. --- pkgs/development/libraries/hspell/dicts.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index 87f4e4672d0a..637a11efaef7 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -6,6 +6,9 @@ let meta = hspell.meta // { broken = true; description = "${variant} Hebrew dictionary"; + + buildFlags = [ variant ]; + } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); in From 3ee75033dbe50fb33217caddffc9c0d9c198e10c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 03:58:41 +0100 Subject: [PATCH 677/684] Revert "iasl: make NIX_CFLAGS_COMPILE a list" This reverts commit 5aff75d32d9d59801e7e8ec7ecff4ee3f8d8e73a. --- pkgs/development/compilers/iasl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 36d402ee71f4..e98d7cc27dbf 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h"; }; - NIX_CFLAGS_COMPILE = [ "-O3" ]; + NIX_CFLAGS_COMPILE = "-O3"; buildFlags = [ "iasl" ]; From d6136b744a75e641d58d56115b1972b7dd1f4884 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2019 03:59:02 +0100 Subject: [PATCH 678/684] Revert "libreoffice: make NIX_CFLAGS_COMPILE a list" This reverts commit aa6c89479fa04d8f55a6eb15675def7fdd0caef7. --- pkgs/applications/office/libreoffice/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c01048cdb3e4..70b439a5f778 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,9 +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 From 92da996e62eb25b45473b5dc32dbe4d60ceb8f76 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 31 Dec 2019 09:48:45 -0500 Subject: [PATCH 679/684] python3Packages.dask: 2.9.0 -> 2.9.1 enable tests, use github src --- .../python-modules/dask/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 5a3302945967..beef26ec5beb 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,7 +1,7 @@ { lib , bokeh , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fsspec , pytest , pythonOlder @@ -19,21 +19,40 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "eec200032922b2249f7f1061f8701eaf3e68488cfa78ff2b47c3262f442bede7"; + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "1xayr4gkp4slvmh2ksdr0d196giz3yhknqjjg1vw2j0la9gwfwxs"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ - bokeh cloudpickle dill fsspec numpy pandas partd toolz ]; + checkInputs = [ + pytest + ]; - checkPhase = '' - py.test dask + propagatedBuildInputs = [ + bokeh + cloudpickle + dill + fsspec + numpy + pandas + partd + toolz + ]; + + postPatch = '' + # versioneer hack to set version of github package + echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py + + substituteInPlace setup.py \ + --replace "version=versioneer.get_version()," "version='${version}'," \ + --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - # URLError - doCheck = false; + checkPhase = '' + pytest + ''; meta = { description = "Minimal task scheduling abstraction"; From 310afc9e9304dcd28305c088b090415bac3fdb10 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 31 Dec 2019 09:50:13 -0500 Subject: [PATCH 680/684] pythonPackages.bokeh: 1.3.4 -> 1.4.0 --- pkgs/development/python-modules/bokeh/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a352fb0fbb07..18f59b052887 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , futures -, isPy3k +, isPy27 , isPyPy , jinja2 , lib @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c60d38a41a777b8147ee4134e6142cea8026b5eebf48149e370c44689869dce7"; + sha256 = "1rywd6c6hi0c6yg18j5zxssjd07a5hafcd21xr3q2yvp3aj3h3f6"; }; patches = [ @@ -39,7 +39,12 @@ buildPythonPackage rec { disabled = isPyPy; - checkInputs = [ mock pytest pillow selenium ]; + checkInputs = [ + mock + pytest + pillow + selenium + ]; propagatedBuildInputs = [ pillow @@ -51,7 +56,9 @@ buildPythonPackage rec { numpy packaging ] - ++ lib.optionals ( !isPy3k ) [ futures ]; + ++ lib.optionals ( isPy27 ) [ + futures + ]; checkPhase = '' ${python.interpreter} -m unittest discover -s bokeh/tests From 4e0ebea84a4949e9d06e96a9a70bec8adfa010e5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 31 Dec 2019 11:27:10 -0500 Subject: [PATCH 681/684] pythonPackages.cma: init at 2.7.0 --- .../python-modules/cma/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/cma/default.nix diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix new file mode 100644 index 000000000000..1743e23942fe --- /dev/null +++ b/pkgs/development/python-modules/cma/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, python +}: + +buildPythonPackage rec { + pname = "cma"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "CMA-ES"; + repo = "pycma"; + rev = "r${version}"; + sha256 = "0c26969pcqj047axksfffd9pj77n16k4r9h6pyid9q3ah5zk0xg3"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkPhase = '' + ${python.executable} -m cma.test + ''; + + meta = with lib; { + description = "CMA-ES, Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization in Python"; + homepage = https://github.com/CMA-ES/pycma; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b6274ed4f71..a4893a19642c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4355,6 +4355,8 @@ in { cachetools = callPackage ../development/python-modules/cachetools {}; + cma = callPackage ../development/python-modules/cma { }; + cmd2 = callPackage ../development/python-modules/cmd2 {}; warlock = callPackage ../development/python-modules/warlock { }; From 853ecd257166e97a05d237407c6451b263154bb7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 31 Dec 2019 11:27:36 -0500 Subject: [PATCH 682/684] python3Packages.optuna: 0.17.1 -> 0.19.0 --- .../python-modules/optuna/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index ee00985aaff1..26c728993179 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , mock , bokeh @@ -13,6 +13,7 @@ , mxnet , scikit-optimize , tensorflow +, cma , sqlalchemy , numpy , scipy @@ -21,6 +22,7 @@ , colorlog , pandas , alembic +, tqdm , typing , pythonOlder , isPy27 @@ -31,9 +33,11 @@ buildPythonPackage rec { version = "0.19.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "cbcdc826915dd07f7df723bec0dd3edd5e61e54c40e7a8b023e19d4434eef602"; + src = fetchFromGitHub { + owner = "optuna"; + repo = pname; + rev = "v${version}"; + sha256 = "179x2lsckpmkrkkdnvvbzky86g1ba882z677qwbayhsc835wbp0y"; }; checkInputs = [ @@ -49,6 +53,7 @@ buildPythonPackage rec { mxnet scikit-optimize tensorflow + cma ]; propagatedBuildInputs = [ @@ -60,16 +65,22 @@ buildPythonPackage rec { colorlog pandas alembic - ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + tqdm + ] ++ lib.optionals (pythonOlder "3.5") [ + typing + ]; configurePhase = if !(pythonOlder "3.5") then '' substituteInPlace setup.py \ - --replace "'typing'" "" + --replace "'typing'," "" '' else ""; checkPhase = '' pytest --ignore tests/test_cli.py \ - --ignore tests/integration_tests/test_chainermn.py + --ignore tests/integration_tests/test_chainermn.py \ + --ignore tests/integration_tests/test_pytorch_lightning.py \ + --ignore tests/integration_tests/test_pytorch_ignite.py \ + --ignore tests/integration_tests/test_fastai.py ''; meta = with lib; { From ee3f276461414d96830a4a84152b259536478ce3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jan 2020 21:37:35 +0100 Subject: [PATCH 683/684] Revert "sudo: fix for structured attrs" This broke sudo. This reverts commit 91a1f2043f4b3df24c37e88ee5840499f9258462. --- pkgs/tools/security/sudo/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d2877a1ff1b2..a0922f4df738 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -41,15 +41,6 @@ stdenv.mkDerivation rec { "--with-passprompt=[sudo] password for %p: " # intentional trailing space ]; - installFlags = [ - "sudoers_uid=$(shell id -u)" - "sudoers_gid=$(shell id -g)" - "sysconfdir=${placeholder ''out''}/etc" - "rundir=$(TMPDIR)/dummy" - "vardir=$(TMPDIR)/dummy" - "DESTDIR=/" - ]; - postConfigure = '' cat >> pathnames.h <<'EOF' @@ -57,6 +48,7 @@ stdenv.mkDerivation rec { #define _PATH_MV "${coreutils}/bin/mv" EOF makeFlags="install_uid=$(id -u) install_gid=$(id -g)" + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/" ''; nativeBuildInputs = [ groff ]; From bdfb1bd01b2da393a3cdf567764a79e418f2b62e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jan 2020 21:37:19 +0100 Subject: [PATCH 684/684] sudo: 1.8.29 -> 1.8.30 --- pkgs/tools/security/sudo/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index a0922f4df738..71a71be9147e 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,12 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.29"; + pname = "sudo"; + version = "1.8.30"; src = fetchurl { - urls = - [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" - "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" - ]; - sha256 = "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf"; + url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; + sha256 = "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3"; }; prePatch = ''