From 383075f38b94b25ff30ec68a1bb19b35dc9ce4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 6 Sep 2020 20:46:35 +0200 Subject: [PATCH 001/211] openblas: re-enable AVX512 support AVX512 support was disabled due to an issue in the AVX512 DGEMM kernel: https://github.com/NixOS/nixpkgs/issues/59708 However, this kernel has been replaced upstream a while ago: https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.8 And they have enabled AVX512 kernels since then. --- pkgs/development/libraries/science/math/openblas/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 89d88bdf564..dd260ec4912 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -68,7 +68,6 @@ let BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; - NO_AVX512 = true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; }; From 073f83cf143995ac4045966f19cadfd82f898af4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:37 +0100 Subject: [PATCH 002/211] [nix-update-cpan] perlPackages.AlgorithmC3: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2475b1ab6be..34972914327 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -129,10 +129,10 @@ let AlgorithmC3 = buildPerlPackage { pname = "Algorithm-C3"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz"; - sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.11.tar.gz"; + sha256 = "02ck52cf0yyk57354rd1rp5l0kbfwi1pvg2lh3jadvjxfrkq9x5a"; }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; From 5a7f2768e4faa5639691026d353c455007f10828 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:37 +0100 Subject: [PATCH 003/211] [nix-update-cpan] perlPackages.AlienBuild: 2.29 -> 2.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34972914327..8dfc54f2c3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -162,10 +162,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "2.29"; + version = "2.37"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.29.tar.gz"; - sha256 = "0wx1czv14dhfkd9nwa3y2g2gy8fx041hdmckhkhb1ly46ral4d4f"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.37.tar.gz"; + sha256 = "0lgdr4d4hpv9q6i8lzs5lrilrwj8zm1cxzxwdgvl69j8k2zbq01h"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; From 8b186cfda2f2ea8ebc35106810c48380acf49fe4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:37 +0100 Subject: [PATCH 004/211] [nix-update-cpan] perlPackages.AlienLibxml2: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8dfc54f2c3e..ced6a80317e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -192,10 +192,10 @@ let AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz"; - sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz"; + sha256 = "1cwdqspbq0r0bmw0079z4qzc7chs5aw6jdf3699nxhxmy1255d3k"; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; From 113c678fb6fa893ea51fc73c85c592cf4e699172 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:38 +0100 Subject: [PATCH 005/211] [nix-update-cpan] perlPackages.ApacheSession: 1.93 -> 1.94 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ced6a80317e..1b8e9e66712 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -477,10 +477,10 @@ let ApacheSession = buildPerlModule { pname = "Apache-Session"; - version = "1.93"; + version = "1.94"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz"; - sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.94.tar.gz"; + sha256 = "17z9cdsk3vxah1dlix1pi68dlnjplymf4bdqwn50psdgk5lbfsgy"; }; buildInputs = [ TestDeep TestException ]; meta = { From a4ca131acd3bde199590d1dbb15dcab79c4a2248 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:38 +0100 Subject: [PATCH 006/211] [nix-update-cpan] perlPackages.Applify: 0.21 -> 0.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1b8e9e66712..0534db4f10c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -619,10 +619,10 @@ let Applify = buildPerlPackage { pname = "Applify"; - version = "0.21"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.21.tar.gz"; - sha256 = "e34bc64c12c42369af6db7d17e3e20059b9d97ed50f8e487bf610008525eb84d"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.22.tar.gz"; + sha256 = "0y644rr7gl49awn27xj556q9i86fddkkn26gnfn52wm19d7aa94a"; }; meta = { homepage = "https://github.com/jhthorsen/applify"; From b2d7fadca1b3b45c543a7c8028c5389894746b7b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:38 +0100 Subject: [PATCH 007/211] [nix-update-cpan] perlPackages.Appperlbrew: 0.88 -> 0.89 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0534db4f10c..e31b81288b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -669,10 +669,10 @@ let Appperlbrew = buildPerlModule { pname = "App-perlbrew"; - version = "0.88"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz"; - sha256 = "08aj77i7bh4nhilz16axp4zfv0zg66za2c4i0rcwfg3qxgxbcrzs"; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.89.tar.gz"; + sha256 = "00krymnsvz5qx7fkn4hpfqlgrqmbkbf45f9jr3vl4yqcyrsmiyhg"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; From 55fc11b336f416d9c8a7b92ad2e9e09ef0a08bbe Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:38 +0100 Subject: [PATCH 008/211] [nix-update-cpan] perlPackages.ArrayCompare: 3.0.3 -> 3.0.7 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e31b81288b3..cfc91a74b40 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -754,10 +754,10 @@ let ArrayCompare = buildPerlModule { pname = "Array-Compare"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz"; - sha256 = "13hn913cj7vswh5yy7gxpmhzrwmwknkc73qn7bhw0x7gx757rav2"; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.7.tar.gz"; + sha256 = "1p2kv4p2p5i6a665ax4b8iq1wal4x0g259yv32cc2ypbk7v11qs4"; }; buildInputs = [ TestNoWarnings ]; From ba9c5e38806e4fda7f73b9e247efc2fbdc460e91 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:39 +0100 Subject: [PATCH 009/211] [nix-update-cpan] perlPackages.ArchiveTarWrapper: 0.37 -> 0.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cfc91a74b40..64c46c4be12 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -849,10 +849,10 @@ let ArchiveTarWrapper = buildPerlPackage { pname = "Archive-Tar-Wrapper"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz"; - sha256 = "0b1hi3zfnq487kfg514kr595j9w8x6wxddy3zlpqcxgiv90zlv3y"; + url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.38.tar.gz"; + sha256 = "0ymknznhk5ky7f835l0l5wfkx8kl0vfm0hvhijvgyp5rm3dd1wqr"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { From 102f48a2153f2ee316040baf22436e571c435679 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:39 +0100 Subject: [PATCH 010/211] [nix-update-cpan] perlPackages.AuthenRadius: 0.31 -> 0.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64c46c4be12..9b47b323594 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1029,10 +1029,10 @@ let AuthenRadius = buildPerlPackage { pname = "Authen-Radius"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz"; - sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; + url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.32.tar.gz"; + sha256 = "0h0p4djscwixpbgbxrs9vsyx1vl7cm9r4j15cx11hfn86yc8y83v"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; From 4f2c7194c1d0399acea781df3505850a0de724e1 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:39 +0100 Subject: [PATCH 011/211] [nix-update-cpan] perlPackages.BerkeleyDB: 0.63 -> 0.64 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b47b323594..5dc98bc4481 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1232,11 +1232,11 @@ let BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; - version = "0.63"; + version = "0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz"; - sha256 = "1lh2a75cy85hqxlridk862nwzhrp762h74vy27hcbfgb4a6r62by"; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz"; + sha256 = "0jvllgyk7ai8zxziaxpxar0n2054y01dq3qn40xc86lwakl8ap2k"; }; preConfigure = '' From e7e990dabbe20802c99ea0e59c7a2000cb6163fa Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:39 +0100 Subject: [PATCH 012/211] [nix-update-cpan] perlPackages.CacheFastMmap: 1.49 -> 1.54 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5dc98bc4481..2b1bffdacc5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1511,11 +1511,12 @@ let CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.49"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz"; - sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm"; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.54.tar.gz"; + sha256 = "0lkrsr582h714jpmh5dv4szz5f7rm466xqxbavj7l9w0p40f4him"; }; + buildInputs = [ TestDeep ]; }; CacheKyotoTycoon = buildPerlModule { From 03072a280db63a92a7a992a1e5c23785724e1163 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:40 +0100 Subject: [PATCH 013/211] [nix-update-cpan] perlPackages.Cairo: 1.107 -> 1.108 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b1bffdacc5..371a9588442 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1584,10 +1584,10 @@ let Cairo = buildPerlPackage { pname = "Cairo"; - version = "1.107"; + version = "1.108"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz"; - sha256 = "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay"; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.108.tar.gz"; + sha256 = "1nh5iya63q6j2w0cdi24x2ygpi8k8wwccnbh8cisnx8nqmywnhk0"; }; buildInputs = [ pkgs.cairo ]; meta = { From d310b48f58610efd16d822d54e409d5d0811c210 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:40 +0100 Subject: [PATCH 014/211] [nix-update-cpan] perlPackages.CarpAssertMore: 1.20 -> 1.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 371a9588442..f25f6e59689 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1711,10 +1711,10 @@ let CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.20"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz"; - sha256 = "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.24.tar.gz"; + sha256 = "0axjfl1hp7s4lcfxjj41zcp397dzhjqzd95innzxnz914xkc2p5s"; }; propagatedBuildInputs = [ CarpAssert ]; meta = { From 362febbb0b96e02122a903f9d25ebaf474514379 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:40 +0100 Subject: [PATCH 015/211] [nix-update-cpan] perlPackages.CatalystDevel: 1.41 -> 1.42 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f25f6e59689..aa510e75c62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1884,12 +1884,12 @@ let CatalystDevel = buildPerlPackage { pname = "Catalyst-Devel"; - version = "1.41"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Devel-1.41.tar.gz"; - sha256 = "9a4a7ab9266aed8b11f399e9859b7ff42615de1d6c7ee76505ed0cae0fce0ae5"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Devel-1.42.tar.gz"; + sha256 = "1gcaqivyxwsdq87v9za1ijjibh6llirzqsbpwjbw1f5mravg1iky"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ FileShareDirInstall TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { homepage = "http://wiki.catalystframework.org/wiki/"; From 7779f19db4e42e9be0ae239aad2d626ec52419fd Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:40 +0100 Subject: [PATCH 016/211] [nix-update-cpan] perlPackages.CatalystRuntime: 5.90126 -> 5.90128 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa510e75c62..fbe7c9a5103 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1942,10 +1942,10 @@ let CatalystRuntime = buildPerlPackage { pname = "Catalyst-Runtime"; - version = "5.90126"; + version = "5.90128"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz"; - sha256 = "66f08334bf8b70049e77c0dcafd741c568e6f1341b2ffbb531a93833638d3986"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90128.tar.gz"; + sha256 = "1yb0caagdrl7c1ldkwaz6w2qpgj8wcibzhqh6yscarjzmw6kppx6"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; From 1352b38d442449c64cd075702b133b7fb769e614 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:41 +0100 Subject: [PATCH 017/211] [nix-update-cpan] perlPackages.CDB_File: 1.02 -> 1.05 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fbe7c9a5103..b40beda005a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2338,16 +2338,17 @@ let CDB_File = buildPerlPackage { pname = "CDB_File"; - version = "1.02"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz"; - sha256 = "a0ae46916a190dd746be9fb11cda51cfb27dfec0f21e15e1ec2773dadc50c05f"; + url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.05.tar.gz"; + sha256 = "0jzbm59b9q51k00djr1b8c4vjvjkwb577r946vi5s09rasfq8r45"; }; meta = { homepage = "https://github.com/toddr/CDB_File"; description = "Perl extension for access to cdb databases"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ BCOW ]; }; From a28736ecc1d1e9f19474004aa304f245c3a32914 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:41 +0100 Subject: [PATCH 018/211] [nix-update-cpan] perlPackages.CGI: 4.50 -> 4.51 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b40beda005a..24d6524b07e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2398,10 +2398,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.50"; + version = "4.51"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.50.tar.gz"; - sha256 = "d8c7a2143352842a9b4962c314ee7e0385273c8b9d8314dcbd04a09c008eef46"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.51.tar.gz"; + sha256 = "02k0p8zwbn0fz9r39rg8jvbmky8fwdg6kznklzk557rg07kiblhb"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; From be5b5500c92b49469217c7d2a7c34305789f4c9f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:41 +0100 Subject: [PATCH 019/211] [nix-update-cpan] perlPackages.ClassC3: 0.34 -> 0.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24d6524b07e..53314fd628b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2692,10 +2692,10 @@ let ClassC3 = buildPerlPackage { pname = "Class-C3"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz"; - sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.35.tar.gz"; + sha256 = "0gp3czp6y0jxx4448kz37f7gdxq4vw514bvc0l98rk4glvqkq1c4"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { From 4372ebb54c36439fdf2f677499d2ffbc25d7abaf Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:41 +0100 Subject: [PATCH 020/211] [nix-update-cpan] perlPackages.ClassSingleton: 1.5 -> 1.6 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 53314fd628b..f0f7699fba5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2942,10 +2942,10 @@ let ClassSingleton = buildPerlPackage { pname = "Class-Singleton"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz"; - sha256 = "0y7ngrjf551bjgmijp5rsidbkq6c8hb5lmy2jcqq0fify020s8iq"; + url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.6.tar.gz"; + sha256 = "1942j9g0b4c88nvs3jghh3y31mlhbpwrx35xdcb2jaaiv7q17fi7"; }; }; From a14b2d69ae6ba3bf1648883d0f55c3d788a22d7d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:42 +0100 Subject: [PATCH 021/211] [nix-update-cpan] perlPackages.ClonePP: 1.07 -> 1.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0f7699fba5..a4180f28ac1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3146,10 +3146,10 @@ let ClonePP = buildPerlPackage { pname = "Clone-PP"; - version = "1.07"; + version = "1.08"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz"; - sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; + url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz"; + sha256 = "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d41604a38b14cc19a0dd9c37ff695a2e0b3389b5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:42 +0100 Subject: [PATCH 022/211] [nix-update-cpan] perlPackages.ConfigAutoConf: 0.318 -> 0.319 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a4180f28ac1..33399dafa7e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3298,10 +3298,10 @@ let ConfigAutoConf = buildPerlPackage { pname = "Config-AutoConf"; - version = "0.318"; + version = "0.319"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz"; - sha256 = "0d5bxsax2x3xy8bgqrbzs0562x7bpglan8m23hjxw0rhxkz31j9k"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz"; + sha256 = "0gm3l0qyrgiia67lsmzjfb6ihgbdx1lidli7w47lq9jk4v66ckrh"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { From 91f474b82e9c3f81d0da1e50b791b12473eebfb3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:42 +0100 Subject: [PATCH 023/211] [nix-update-cpan] perlPackages.Connector: 1.32 -> 1.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 33399dafa7e..fbc50d2ccf9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3523,10 +3523,10 @@ let Connector = buildPerlPackage { pname = "Connector"; - version = "1.32"; + version = "1.35"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.32.tar.gz"; - sha256 = "c108ce559fa48faf95d01eb6bae9c14ecef49386f89c4aa2c2ce5edf9fd0ca14"; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.35.tar.gz"; + sha256 = "0jnwcvjibywdfq4x5n3np9fxvpsgqq6vjpn72sfa2xfdwrp7dna1"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; From 821898f6025ca08e1f494fa2cbec0b5c487dd73a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:42 +0100 Subject: [PATCH 024/211] [nix-update-cpan] perlPackages.CpanelJSONXS: 4.17 -> 4.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fbc50d2ccf9..e2d304934b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3769,10 +3769,10 @@ let CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.17"; + version = "4.25"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz"; - sha256 = "fa80ae47caa9beee6db9b12df2c04482e98df1d62041a114ccd82b681a8706fb"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.25.tar.gz"; + sha256 = "061940vyj9y3rzwq47z2a3f5i5rfpa90ccz7fgz228zr7njkvfpr"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From 43e2e22260212c6bd8568b93609619e9e04f6939 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:43 +0100 Subject: [PATCH 025/211] [nix-update-cpan] perlPackages.CPANPerlReleases: 5.20200820 -> 5.20201120 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e2d304934b1..4538b6d5eb3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3851,10 +3851,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20200820"; + version = "5.20201120"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200820.tar.gz"; - sha256 = "07vsbsxygdbv0nk9389ng3jdsl1d3yk1z54xdci1gpy0lghbij70"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20201120.tar.gz"; + sha256 = "1qsjm26556kqxyvj85c7j37mh2xw78fm3i7f58mpqkfawxip4q3k"; }; meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; From 8d83c13b50e7a1d76f153aa21e6421bd0e270191 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:43 +0100 Subject: [PATCH 026/211] [nix-update-cpan] perlPackages.CryptRIPEMD160: 0.06 -> 0.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4538b6d5eb3..481b8524823 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4169,10 +4169,10 @@ let CryptRIPEMD160 = buildPerlPackage { pname = "Crypt-RIPEMD160"; - version = "0.06"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.06.tar.gz"; - sha256 = "ea64a1e9eb42f3d79855a392e7cca6b86e8e0bcc9aabcc5efa5fa32415b67dba"; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.08.tar.gz"; + sha256 = "0cmj620kfg08yvh81bq1sbabdyyc3g9pc6vlngxdxjgn0xvcil9l"; }; meta = { homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160"; From 6b0ae2e927e4f6b3a0f5c31d9659a1bc3da52a1b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:43 +0100 Subject: [PATCH 027/211] [nix-update-cpan] perlPackages.CryptRijndael: 1.14 -> 1.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 481b8524823..40f31aaa740 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4195,10 +4195,10 @@ let CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz"; - sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.15.tar.gz"; + sha256 = "0qs1b6ma4sj0ip5d8544fzgc1bbankc4qlmznp8hay8dk5arp650"; }; }; From c9a126431b39a81101b1be7d951c2f30d2b4aaa0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:44 +0100 Subject: [PATCH 028/211] [nix-update-cpan] perlPackages.CryptTwofish: 2.17 -> 2.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40f31aaa740..b2a6d05f096 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4270,10 +4270,10 @@ let CryptTwofish = buildPerlPackage { pname = "Crypt-Twofish"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz"; - sha256 = "eed502012f0c63927a1a32e3154071cc81175d1992a893ec41f183b6e3e5d758"; + url = "mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.18.tar.gz"; + sha256 = "00fms8v94wr3lmn1nqjcfw30p5scsyr4s3dah8ijm5w7c5fmb0aq"; }; meta = { description = "The Twofish Encryption Algorithm"; From 8da80886f28c54cd73037ae1cc76ac62b980eae4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:44 +0100 Subject: [PATCH 029/211] [nix-update-cpan] perlPackages.Curses: 1.36 -> 1.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2a6d05f096..44e58170bd1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4497,10 +4497,10 @@ let Curses = buildPerlPackage { pname = "Curses"; - version = "1.36"; + version = "1.37"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz"; - sha256 = "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"; + url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz"; + sha256 = "086vaj4wh5473hbp5f4amk6l0yzm66yxdcd2znz5pcqrmpiplw3l"; }; propagatedBuildInputs = [ pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lncurses"; From 20a582f13478c4eb540f24af756a05d9bd711475 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:44 +0100 Subject: [PATCH 030/211] [nix-update-cpan] perlPackages.DateManip: 6.82 -> 6.83 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44e58170bd1..7530168ad5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5070,10 +5070,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.82"; + version = "6.83"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz"; - sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps"; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.83.tar.gz"; + sha256 = "1ylrj6g1sccnyd5k0dq3xl3l40y1jgcbpcb3jnjj5hknv3hv54gl"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' From 3606fc3b0cb6a5828adb792a3dbf3dfe58af342c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:44 +0100 Subject: [PATCH 031/211] [nix-update-cpan] perlPackages.DateTime: 1.52 -> 1.54 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7530168ad5e..92d8ad9bb72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5100,10 +5100,10 @@ let DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.52"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz"; - sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz"; + sha256 = "1rxjagwmkdlmksz1cbxwx2ad51pv5q7dri2djqkz44q7j1nxlbmi"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; From d525d16bf8646f0635d8b89f7423c0ddd963c2a3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:45 +0100 Subject: [PATCH 032/211] [nix-update-cpan] perlPackages.DateTimeFormatISO8601: 0.14 -> 0.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92d8ad9bb72..19cad59785f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5224,10 +5224,10 @@ let DateTimeFormatISO8601 = buildPerlPackage { pname = "DateTime-Format-ISO8601"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.14.tar.gz"; - sha256 = "1ssy41d7g1kgrdlhnz1vr7rhxspmnhzx1hkdmrf11ca293kq7r47"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.15.tar.gz"; + sha256 = "1afslsr2axkamdfjqk6i3w092hp20dznqffk4lgpxmxrd31ni5ql"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { From e73b2826f43d10030def6bf13a9c934090409422 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:45 +0100 Subject: [PATCH 033/211] [nix-update-cpan] perlPackages.DateTimeFormatNatural: 1.10 -> 1.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19cad59785f..5405f4368ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5253,10 +5253,10 @@ let DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.10.tar.gz"; - sha256 = "0ahia58vs5f8ymskain1a6vl6b4fhkar1cmakq5q92zzhvmgx6z1"; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.11.tar.gz"; + sha256 = "0lj5yh1k4dl06p9ydyscd4ic330w8ygz88m38bhzlbz42kxv13vk"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; From 8154ac7379728bf5205829648b03a53404b9b6d7 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:45 +0100 Subject: [PATCH 034/211] [nix-update-cpan] perlPackages.DateTimeTimeZone: 2.39 -> 2.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5405f4368ad..9f5ad2dabf3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5369,10 +5369,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.39"; + version = "2.44"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz"; - sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.44.tar.gz"; + sha256 = "09j5rqid1mv0cgm1vc89l2anbb3q8w4bzlm7sqrkiz9dk82x8gap"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; From c3b023bee55ca9ef3634a0632b54282f043ec768 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:45 +0100 Subject: [PATCH 035/211] [nix-update-cpan] perlPackages.DevelCheckOS: 1.83 -> 1.85 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f5ad2dabf3..ca476142625 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5467,10 +5467,10 @@ let DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.83"; + version = "1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz"; - sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972"; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.85.tar.gz"; + sha256 = "1jjqwrx8mydyhqwwjlgimribz0yq0b6q66xnr6mgvyn63pdajhvg"; }; propagatedBuildInputs = [ FileFindRule ]; }; From 0c8653c62dbe18a6f1838913510d3cb210bcc5fc Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:46 +0100 Subject: [PATCH 036/211] [nix-update-cpan] perlPackages.DevelPatchPerl: 2.00 -> 2.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ca476142625..a8a36d85f35 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5491,10 +5491,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "2.00"; + version = "2.04"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz"; - sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.04.tar.gz"; + sha256 = "1q8xhz2sdlz2266pjl8j9vcixbhcaxsprmvsx56ra998miayc42p"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { From 125fa4a0e6c11bfb69ce1fd3dcee6e540cdd5b58 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:46 +0100 Subject: [PATCH 037/211] [nix-update-cpan] perlPackages.DevelPPPort: 3.60 -> 3.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8a36d85f35..ca8755e4f3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5520,10 +5520,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.60"; + version = "3.62"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.60.tar.gz"; - sha256 = "0c7f36d2c63e1bbe4fd9670f3b093a207175068764884b9d67ea27aed6c07ea6"; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.62.tar.gz"; + sha256 = "16w1mmx304bhql27mgy0l1qjwjr86vn7j0133i0hln9fdz2097gi"; }; meta = { description = "Perl/Pollution/Portability"; From 9d5ae3bb086d89221da1ed39bc4491f96322e491 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:46 +0100 Subject: [PATCH 038/211] [nix-update-cpan] perlPackages.DBDCSV: 0.55 -> 0.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ca8755e4f3e..abd95082a66 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5579,10 +5579,10 @@ let DBDCSV = buildPerlPackage { pname = "DBD-CSV"; - version = "0.55"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.55.tgz"; - sha256 = "4670028e46df9a3c2791740445e8a4c82840b6667cee5dd796bc5a6ad9266ddb"; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.56.tgz"; + sha256 = "16rhgchwlnnvjklca0d4sa3lmlj29zc0iwclk41y5fz6kg8c2qjs"; }; propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; }; From 5129b694c2f2db8c8a30d0c478a853071e382f1a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:46 +0100 Subject: [PATCH 039/211] [nix-update-cpan] perlPackages.DBDMock: 1.55 -> 1.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index abd95082a66..3b49404426a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5589,10 +5589,10 @@ let DBDMock = buildPerlModule { pname = "DBD-Mock"; - version = "1.55"; + version = "1.58"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz"; - sha256 = "827ca7a363eca8d1d4912decc920eb55ef8e8173e0f756808e2ed304f0dad20c"; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.58.tar.gz"; + sha256 = "0g67r5i5qad5knjph4ybfpqxabgi2h7svpl3pgjrc4qh4h0vy7mv"; }; propagatedBuildInputs = [ DBI ]; buildInputs = [ ModuleBuildTiny TestException ]; From 6346861c683d80f3f0b98c6018b7d59d60b1157b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:47 +0100 Subject: [PATCH 040/211] [nix-update-cpan] perlPackages.DBFile: 1.853 -> 1.855 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b49404426a..75578b3ead3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5727,11 +5727,11 @@ let DBFile = buildPerlPackage { pname = "DB_File"; - version = "1.853"; + version = "1.855"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz"; - sha256 = "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h"; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.855.tar.gz"; + sha256 = "0q599h7g4jkzks5dxf1zifx9k7l9vif26r2dlgkzxkg6bfif5zyr"; }; preConfigure = '' From f3ed0369c26e6b1377c6d0c5d7e7feaf5713dbbb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:47 +0100 Subject: [PATCH 041/211] [nix-update-cpan] perlPackages.DBIxClass: 0.082841 -> 0.082842 dependencies: perlPackages.SQLAbstractClassic: init at 1.91 DBIx::Class replaced dependency SQL::Abstract with SQL::Abstract::Classic https://metacpan.org/source/RIBASUSHI/DBIx-Class-0.082842/Changes --- pkgs/top-level/perl-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 75578b3ead3..e7e69347bdb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5815,13 +5815,13 @@ let DBIxClass = buildPerlPackage { pname = "DBIx-Class"; - version = "0.082841"; + version = "0.082842"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz"; - sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082842.tar.gz"; + sha256 = "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh"; }; buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstractClassic ScopeGuard SubName namespaceclean ]; meta = { homepage = "https://metacpan.org/pod/DBIx::Class"; description = "Extensible and flexible object <-> relational mapper"; @@ -18265,6 +18265,21 @@ let }; }; + SQLAbstractClassic = buildPerlPackage { + pname = "SQL-Abstract-Classic"; + version = "1.91"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/SQL-Abstract-Classic-1.91.tar.gz"; + sha256 = "0a7g13hs3kdxrjn43sfli09mgsi9d6w0dfw6hlk268av17yisgaf"; + }; + buildInputs = [ TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ SQLAbstract ]; + meta = { + description = "Generate SQL from Perl data structures"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SQLAbstractLimit = buildPerlModule { pname = "SQL-Abstract-Limit"; version = "0.141"; From e60cdaa9d84b14218d29635fc963b2d57e2d5e37 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:47 +0100 Subject: [PATCH 042/211] [nix-update-cpan] perlPackages.DistZilla: 6.015 -> 6.017 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7e69347bdb..4a72b1630ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6373,10 +6373,10 @@ let DistZilla = buildPerlPackage { pname = "Dist-Zilla"; - version = "6.015"; + version = "6.017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz"; - sha256 = "06w9mdk46y4n2dshkx6laphkqk08wfw6bqpsa5q2yb4lky0yb212"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.017.tar.gz"; + sha256 = "1vkg5cyazhy2kdffwlcr2k52awlyfzxgr0vggs9mx2xc6g7313aw"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; From 2f1aad1a18386b4a46468f23b3922b62f6b978ac Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:48 +0100 Subject: [PATCH 043/211] [nix-update-cpan] perlPackages.EmailOutlookMessage: 0.919 -> 0.920 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a72b1630ab..86b72d1f444 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6919,10 +6919,10 @@ let EmailOutlookMessage = buildPerlModule { pname = "Email-Outlook-Message"; - version = "0.919"; + version = "0.920"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz"; - sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; + url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.920.tar.gz"; + sha256 = "1063wpdf90k1f6vcqvs92cwm93zvmh3l09pfnrrsp6vqkyah48lj"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) From 08300d5ef1b6b077b4b263564f648bff972d900c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:48 +0100 Subject: [PATCH 044/211] [nix-update-cpan] perlPackages.EmailSender: 1.300034 -> 1.300035 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86b72d1f444..1c0fe6f452b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6936,10 +6936,10 @@ let EmailSender = buildPerlPackage { pname = "Email-Sender"; - version = "1.300034"; + version = "1.300035"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300034.tar.gz"; - sha256 = "05ac38a63b053c7c3846ffa45196e4483a5785941b0bfb615b22b7a4f04c5291"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300035.tar.gz"; + sha256 = "0yfssp3rqdx1dmgvnygarzgkpkhqm28r5sd0gh87ksk8yxndhjql"; }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; From d63e4c23b0224bbab8c435425de32a9d19316b9d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:48 +0100 Subject: [PATCH 045/211] [nix-update-cpan] perlPackages.Encode: 3.07 -> 3.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c0fe6f452b..ea912a0ee60 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6998,10 +6998,10 @@ let Encode = buildPerlPackage { pname = "Encode"; - version = "3.07"; + version = "3.08"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.07.tar.gz"; - sha256 = "34a4ec9b574b7a6c6132c4ab3ded490fd600bc7ce382124aeda58bb1e112910f"; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.08.tar.gz"; + sha256 = "0nvvs5a7sz2x38isr5na31fa6ja85cpvmbn07qx0l50ss00ks1pd"; }; meta = { description = "Character encodings in Perl"; From 10c864c2a97af8d715fd50c75c9b10c18e9d3c6d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:49 +0100 Subject: [PATCH 046/211] [nix-update-cpan] perlPackages.ExtUtilsInstall: 2.16 -> 2.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea912a0ee60..49b2fcbded0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7416,10 +7416,10 @@ let ExtUtilsInstall = buildPerlPackage { pname = "ExtUtils-Install"; - version = "2.16"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.16.tar.gz"; - sha256 = "9b6cd0aa3585ce45b6faf6de490a561d51d530dc7922888989febf067c0632dc"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.18.tar.gz"; + sha256 = "1i9hgvk3wcyshigfwvlrm2qilh8xvb7lfk3qdjrbnrrvl9xqgpg5"; }; meta = { description = "Install files from here to there"; From 07f756ab6ce5f896a03df0e8b8fffd6b6f3ba8f5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:49 +0100 Subject: [PATCH 047/211] [nix-update-cpan] perlPackages.ExtUtilsMakeMaker: 7.46 -> 7.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49b2fcbded0..5e1cafafab1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7457,10 +7457,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.46"; + version = "7.56"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.46.tar.gz"; - sha256 = "8f4a107565392d0f36c99c849a3bfe7126ba58148a4dca334c139add0dd0d328"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.56.tar.gz"; + sha256 = "05h058iwx81qs384kgyx34qnhqznavzwmhdsin65c434hga8jly9"; }; meta = { description = "Create a module Makefile"; From 4fd291ee0da048fdade76128f45fabe602a22990 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:49 +0100 Subject: [PATCH 048/211] [nix-update-cpan] perlPackages.FileHomeDir: 1.004 -> 1.006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5e1cafafab1..3d4e8364674 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7867,10 +7867,10 @@ let FileHomeDir = buildPerlPackage { pname = "File-HomeDir"; - version = "1.004"; + version = "1.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz"; - sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.006.tar.gz"; + sha256 = "0ll8akqmwrh9q3nkxhv2caxlaya1fr20nbhjsjsxmxph5p33fdsr"; }; propagatedBuildInputs = [ FileWhich ]; meta = { From 6b59ee62a2405e6cd667b03fad806dd1922ea253 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:49 +0100 Subject: [PATCH 049/211] [nix-update-cpan] perlPackages.FileListing: 6.04 -> 6.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d4e8364674..75fbea2211b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7927,10 +7927,10 @@ let FileListing = buildPerlPackage { pname = "File-Listing"; - version = "6.04"; + version = "6.14"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz"; - sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.14.tar.gz"; + sha256 = "1zs8gfngqsd6jbsqajf95kql3bshsis1nf16y8v4l5i33s3s9cqm"; }; propagatedBuildInputs = [ HTTPDate ]; }; From d7eed4974c5c537c4368767107d54a007bf95be5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:50 +0100 Subject: [PATCH 050/211] [nix-update-cpan] perlPackages.FileLoadLines: 0.02 -> 1.01 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 75fbea2211b..24a815f9a64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7937,11 +7937,12 @@ let FileLoadLines = buildPerlPackage { pname = "File-LoadLines"; - version = "0.02"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-0.02.tar.gz"; - sha256 = "ab0c1c31cf7b694dd3c9a0707098f7483763d46b60799a7f496ea0588be46b7b"; + url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-1.01.tar.gz"; + sha256 = "1lar8s1mc4d36lhxgqyk3hpwdc1bk6j6dfdzzacbjz4zlim6x33f"; }; + buildInputs = [ TestException ]; meta = { description = "Load lines from file"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 16c8f43778cf8b1c87ecee7c8e91df5ad2619ada Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:50 +0100 Subject: [PATCH 051/211] [nix-update-cpan] perlPackages.FileMimeInfo: 0.29 -> 0.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24a815f9a64..28aeb4f347a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7951,10 +7951,10 @@ let FileMimeInfo = buildPerlPackage { pname = "File-MimeInfo"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz"; - sha256 = "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz"; + sha256 = "0wm87gpagb35d7c4nyaf9z3ry0jb3g5xpyjfzcxqcfxyj2zy9ip2"; }; doCheck = false; # Failed test 'desktop file is the right one' buildInputs = [ FileBaseDir FileDesktopEntry ]; From d57f2ff863416cddb97928ed9e2704d9da5cbf8a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:50 +0100 Subject: [PATCH 052/211] [nix-update-cpan] perlPackages.FilePath: 2.17 -> 2.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 28aeb4f347a..5aaa472b110 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8022,10 +8022,10 @@ let FilePath = buildPerlPackage { pname = "File-Path"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.17.tar.gz"; - sha256 = "8c506dfd69a70fdd5f1212fe58fbc53620a89a8293e2ac6860570f868269fb31"; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.18.tar.gz"; + sha256 = "1pddss5hwzng0rxgsi8cz3hcsaarkxzkayydx53dylxkxlbhl3wq"; }; meta = { description = "Create or remove directory trees"; From d9e4bee86761552ca0309d7ca39d74f801dc4ce5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:50 +0100 Subject: [PATCH 053/211] [nix-update-cpan] perlPackages.FileRemove: 1.58 -> 1.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5aaa472b110..2356d7ae4e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8081,10 +8081,10 @@ let FileRemove = buildPerlModule { pname = "File-Remove"; - version = "1.58"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz"; - sha256 = "1n6h5w3sp2bs4cfrifdx2z15cfpb4r536179mx1a12xbmj1yrxl1"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz"; + sha256 = "19lc9xr8w38i4bq3mbr0hadmyjm1dgyh6587gmlxbipdzx02lvp8"; }; }; From 1214c171b3478bdf82b1e9b6e8b18137a474ed8d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:51 +0100 Subject: [PATCH 054/211] [nix-update-cpan] perlPackages.FileShareDir: 1.116 -> 1.118 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2356d7ae4e3..66907d06e28 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8105,10 +8105,10 @@ let FileShareDir = buildPerlPackage { pname = "File-ShareDir"; - version = "1.116"; + version = "1.118"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz"; - sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.118.tar.gz"; + sha256 = "0n69h793jxz1zkp8ng6yqjwdh0yr0py0c8sg1bf5iyaxlc5s5civ"; }; propagatedBuildInputs = [ ClassInspector ]; meta = { From 9bdbebae61ced64585e3ef2ba42860c099bd5c38 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:51 +0100 Subject: [PATCH 055/211] [nix-update-cpan] perlPackages.GD: 2.72 -> 2.73 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66907d06e28..78b98a1bf1f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8480,10 +8480,10 @@ let GD = buildPerlPackage { pname = "GD"; - version = "2.72"; + version = "2.73"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.72.tar.gz"; - sha256 = "014ik1rng6cnjfgdarkyy5m6wl4pdzc2b445m27krfn3zh9hgl31"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.73.tar.gz"; + sha256 = "0arjpa8id6k5yjxfq0j2hsinhhjzjch5lwk6gscf48l54drrw729"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; From 8de23f11338fd348808aac7be8f04537757e4b06 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:51 +0100 Subject: [PATCH 056/211] [nix-update-cpan] perlPackages.GitAutofixup: 0.002007 -> 0.003001 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 78b98a1bf1f..180c4b59a53 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8626,10 +8626,10 @@ let GitAutofixup = buildPerlPackage rec { pname = "App-Git-Autofixup"; - version = "0.002007"; + version = "0.003001"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.002007.tar.gz"; - sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6"; + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz"; + sha256 = "1q7im0zj238k5agwi7d1mz26a8r0wrxwfwp1l8n5k777gx3b5xhp"; }; meta = { maintainers = [ maintainers.DamienCassou ]; From 736394b0984a66fe32527b5e6e3907d800aa78f5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:52 +0100 Subject: [PATCH 057/211] [nix-update-cpan] perlPackages.GlibObjectIntrospection: 0.048 -> 0.049 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 180c4b59a53..c4a794efd32 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8702,10 +8702,10 @@ let GlibObjectIntrospection = buildPerlPackage { pname = "Glib-Object-Introspection"; - version = "0.048"; + version = "0.049"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"; - sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; + sha256 = "0mxg6pz8qfyipw0ypr54alij0c4adzg94f62702b2a6hkp5jhij6"; }; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { From d6bde2e2b72c329808de97cdf87806259b8c1624 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:52 +0100 Subject: [PATCH 058/211] [nix-update-cpan] perlPackages.Gnome2Canvas: 1.002 -> 1.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4a794efd32..77aee21f842 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8732,10 +8732,10 @@ let Gnome2Canvas = buildPerlPackage { pname = "Gnome2-Canvas"; - version = "1.002"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz"; - sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.004.tar.gz"; + sha256 = "0g42bfmqq5395m55np95pfj4i1qbrmx2ml4zhi4cw4sx4fdv7drr"; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; meta = { From 3b7debe69fb111c78a8f71a1883fbaa59201d810 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:52 +0100 Subject: [PATCH 059/211] [nix-update-cpan] perlPackages.Graph: 0.9704 -> 0.9712 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 77aee21f842..c7ea4ca8dfb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8861,11 +8861,12 @@ let Graph = buildPerlPackage { pname = "Graph"; - version = "0.9704"; + version = "0.9712"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz"; - sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9712.tar.gz"; + sha256 = "1as4ngbqxrjv9f31hm3wg8pyiyrz5fbbvlpfsrm68k1yskwkgkcg"; }; + propagatedBuildInputs = [ HeapFibonacci ]; }; GraphViz = buildPerlPackage { From 22843dfda97db121c372a9651f4da0b37503af24 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:52 +0100 Subject: [PATCH 060/211] [nix-update-cpan] perlPackages.HTMLTableExtract: 2.13 -> 2.15 --- pkgs/top-level/perl-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c7ea4ca8dfb..4a0f2be3b7d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9510,11 +9510,15 @@ let HTMLTableExtract = buildPerlPackage { pname = "HTML-TableExtract"; - version = "2.13"; + version = "2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz"; - sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; + url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.15.tar.gz"; + sha256 = "1kry9igbcjyiwpwivq5in41dmx02zfhgaqjyv9sa2g6sb2frric6"; }; + preCheck = '' + # https://rt.cpan.org/Public/Bug/Display.html?id=121920 + rm t/30_tree.t + ''; propagatedBuildInputs = [ HTMLElementExtended ]; }; From eec464cd880fffbba62828fe3ad209848a4997dc Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:53 +0100 Subject: [PATCH 061/211] [nix-update-cpan] perlPackages.HTTPCookieJar: 0.008 -> 0.010 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a0f2be3b7d..e4576cdf3b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9638,10 +9638,10 @@ let HTTPCookieJar = buildPerlPackage { pname = "HTTP-CookieJar"; - version = "0.008"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz"; - sha256 = "0rfw6avcralggs7bf7n86flvhaahxjnqzvpwszp0sk4z4wwy01wm"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.010.tar.gz"; + sha256 = "1l7mqsca4fmls7agzwmp6yq1x16y9jwq4114i6i75n654gl37qsn"; }; propagatedBuildInputs = [ HTTPDate ]; buildInputs = [ TestDeep TestRequires URI ]; From 1c3696f9566b222700eeb6b9648765b976ecbea2 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:53 +0100 Subject: [PATCH 062/211] [nix-update-cpan] perlPackages.HTTPCookies: 6.08 -> 6.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4576cdf3b6..3daee9cc3d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9654,10 +9654,10 @@ let HTTPCookies = buildPerlPackage { pname = "HTTP-Cookies"; - version = "6.08"; + version = "6.09"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.08.tar.gz"; - sha256 = "0ndgqciqqcxyycry0nl0xkg9ci09vxvr81xw0hy0chgbfqsvgss9"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.09.tar.gz"; + sha256 = "1q0z3n3bl5lg5z0bhvk3zgmw536cri7c3vwhrjcqbdx5z9x02gwh"; }; propagatedBuildInputs = [ HTTPMessage ]; meta = { From a0d34c753b85e8207510f0e4d9001906250973e4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:53 +0100 Subject: [PATCH 063/211] [nix-update-cpan] perlPackages.HTTPDaemon: 6.01 -> 6.12 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3daee9cc3d2..85ea08e1cfe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9668,11 +9668,12 @@ let HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.01"; + version = "6.12"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; - sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.12.tar.gz"; + sha256 = "19hz9r6f1p406fk1pqyd99h96ipxsmknh4fh1xw0qrrq1k8vwiyz"; }; + buildInputs = [ CPANMetaCheck ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; From 5dc16af99a5bed162d5d7635f5c6a39a1eba5fd4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:53 +0100 Subject: [PATCH 064/211] [nix-update-cpan] perlPackages.HTTPEntityParser: 0.24 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 85ea08e1cfe..e09ef44ac9e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9697,10 +9697,10 @@ let HTTPEntityParser = buildPerlModule { pname = "HTTP-Entity-Parser"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.24.tar.gz"; - sha256 = "04p6y5234857wb0k024rx3928lx3q9pj5mr3mi0r5jshf740z3pn"; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.25.tar.gz"; + sha256 = "0fpchgj6jgxmjkmljjnrpmyj9anz85rjvs2fq3c7rld3rgcd131s"; }; propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; buildInputs = [ HTTPMessage ModuleBuildTiny ]; From 99138c47b0e97de81217dcc3238cd96c96c8a67a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:54 +0100 Subject: [PATCH 065/211] [nix-update-cpan] perlPackages.HTTPMessage: 6.25 -> 6.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e09ef44ac9e..322a9fa5421 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9762,10 +9762,10 @@ let HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.25"; + version = "6.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/HTTP-Message-6.25.tar.gz"; - sha256 = "21f46502e87d57f43b7a38f81916464b079f5d50fe529458391c0ad529e0075a"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.26.tar.gz"; + sha256 = "1q952w7r1yj4s2v2cly5zzir7v45nj4h2fbad63bphvmvrcw7rkc"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; From 3ccacfb6e063c28a9d025495960bd08caf624f24 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:54 +0100 Subject: [PATCH 066/211] [nix-update-cpan] perlPackages.IOAIO: 4.72 -> 4.73 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 322a9fa5421..f3f4d1a64c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10096,10 +10096,10 @@ let IOAIO = buildPerlPackage { pname = "IO-AIO"; - version = "4.72"; + version = "4.73"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.72.tar.gz"; - sha256 = "17vfbqagpab8lsbf5nmp2frvxw7hvsyy2i87dpid8djzr615wnvf"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.73.tar.gz"; + sha256 = "0nmcwj385zdk65z8b9ivsvbm1d7a3d5gfnhy7mkbgyi4h33lfnws"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; From 2f19d93bef37231a47973d0086463da30ab0fcb7 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:54 +0100 Subject: [PATCH 067/211] [nix-update-cpan] perlPackages.IOHTML: 1.001 -> 1.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3f4d1a64c9..a62c76b3080 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10213,10 +10213,10 @@ let IOHTML = buildPerlPackage { pname = "IO-HTML"; - version = "1.001"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz"; - sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0"; + url = "mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.004.tar.gz"; + sha256 = "1xcbplf8rxb3z4wz66h5w7vy1g83bkxksxwnjp1z5fv3jksjsyy8"; }; meta = { description = "Open an HTML file with automatic charset detection"; From 7a5522cf97eb6d494b9d4d50801354ecd55c7916 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:55 +0100 Subject: [PATCH 068/211] [nix-update-cpan] perlPackages.IOPager: 1.03 -> 2.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a62c76b3080..bfd11f27237 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10269,11 +10269,11 @@ let }; IOPager = buildPerlPackage { - version = "1.03"; + version = "2.10"; pname = "IO-Pager"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz"; - sha256 = "13mmykrb391584wkw907zrmy4hg1fa9hj3zw58whdq5bjc66r1mc"; + url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-2.10.tgz"; + sha256 = "15dimh3i61y6kybhbap91kwh9837xfww072rh95h7j40sb1did5w"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests }; From d7caefe891d34de1bc0a8cb0aa8a7ad5e8bfc695 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:55 +0100 Subject: [PATCH 069/211] [nix-update-cpan] perlPackages.IOTty: 1.14 -> 1.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfd11f27237..3b6246be3ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10395,10 +10395,10 @@ let IOTty = buildPerlPackage { pname = "IO-Tty"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz"; - sha256 = "1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi"; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.15.tar.gz"; + sha256 = "06mmyr4fkkix1z0j8hnhrccn93isnabf3408kqavn2v2hw7wrya3"; }; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox }; From 74718ed75930ca00403c95248a4ee44b83b4586e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:55 +0100 Subject: [PATCH 070/211] [nix-update-cpan] perlPackages.IPCSysV: 2.08 -> 2.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b6246be3ae..2259abdba2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10480,10 +10480,10 @@ let IPCSysV = buildPerlPackage { pname = "IPC-SysV"; - version = "2.08"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.08.tar.gz"; - sha256 = "1b89bf3a2564f578bd9cd17659ac53e064c28ef7dd80e3cb5efef4ba6126ea4f"; + url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.09.tar.gz"; + sha256 = "1g9ddlba4w2jpasn4sh5v1spag4x87rhfv7b0w8gsj6mfhf595qq"; }; meta = { description = "System V IPC constants and system calls"; From 8c7ed202905bd8158d26b63d3f1034414621332c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:55 +0100 Subject: [PATCH 071/211] [nix-update-cpan] perlPackages.JSONMaybeXS: 1.004002 -> 1.004003 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2259abdba2e..b6cb3b4b58e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10687,10 +10687,10 @@ let JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; - version = "1.004002"; + version = "1.004003"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz"; - sha256 = "1dbpdlrk4pjwbn3wzawwsj57jqzdvi01h4kqpknwbl1n7gf2z3iv"; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004003.tar.gz"; + sha256 = "1grg8saa318bs4x2wqnww7y0nra7azrzg35bk5pgvkwxzwbkpvjv"; }; meta = { description = "Use L with a fallback to L and L"; From 525cfe7eb92024c76b0d184242f29bb19199aa6e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:56 +0100 Subject: [PATCH 072/211] [nix-update-cpan] perlPackages.JSONValidator: 4.02 -> 4.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b6cb3b4b58e..5612f099fb2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10740,10 +10740,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "4.02"; + version = "4.10"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.02.tar.gz"; - sha256 = "0ix6k7b7sawbfqsjfj2w9symfr6d7jvpjqc6c6ag8b5my8k932sy"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.10.tar.gz"; + sha256 = "15hgjldd85ada8anz5fdrlnixvwqahnvv3hprcvr9jgj3gvx0lww"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; From bfc83d01a730de667683456e743c34608ac0c324 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:56 +0100 Subject: [PATCH 073/211] [nix-update-cpan] perlPackages.JSONXS: 4.02 -> 4.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5612f099fb2..d72ef6802e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10773,10 +10773,10 @@ let JSONXS = buildPerlPackage { pname = "JSON-XS"; - version = "4.02"; + version = "4.03"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz"; - sha256 = "05ngmpc0smlfzgyhyagd5gza8g93r8hik858kmr186h770higbd5"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.03.tar.gz"; + sha256 = "0s4hdfjwi1sq3cx4bjxrg8k1s4nhb0vm6948iklag89gbzs3cmai"; }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; From 5dc5aeac2431ad30e2f8bc10ac6dfc7425b57ae5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:56 +0100 Subject: [PATCH 074/211] [nix-update-cpan] perlPackages.libintl_perl: 1.31 -> 1.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d72ef6802e9..f4975c9afb8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10890,10 +10890,10 @@ let libintl_perl = buildPerlPackage { pname = "libintl-perl"; - version = "1.31"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz"; - sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; + url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.32.tar.gz"; + sha256 = "19gbbh9w3rl805mv6mg1q80fsrg610h098qhf7ycnkjnyac84440"; }; }; From b5b9023f2305f1fc8241d5da691b81e65ccea403 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:56 +0100 Subject: [PATCH 075/211] [nix-update-cpan] perlPackages.libnet: 3.11 -> 3.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4975c9afb8..dd2823560ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10899,10 +10899,10 @@ let libnet = buildPerlPackage { pname = "libnet"; - version = "3.11"; + version = "3.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz"; - sha256 = "1lsj3a2vbryh85mbb6yddyb2zjv5vs88fdj5x3v7fp2ndr6ixarg"; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.12.tar.gz"; + sha256 = "1px35q9qchzd7rxqldj87vbrall8v31blidhmh0d25d5hyq9lw25"; }; meta = { description = "Collection of network protocol modules"; From 6abb1255c565cb1740bc2ba84b71e7a9d631470f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:57 +0100 Subject: [PATCH 076/211] [nix-update-cpan] perlPackages.LinguaENInflect: 1.904 -> 1.905 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd2823560ab..4654bc1d91c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10951,10 +10951,10 @@ let LinguaENInflect = buildPerlPackage { pname = "Lingua-EN-Inflect"; - version = "1.904"; + version = "1.905"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz"; - sha256 = "54d344884ba9b585680975bbd4049ddbf27bf654446fb00c7e1fc538e08c3173"; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.905.tar.gz"; + sha256 = "15ij4rk1nznnd9hyg2hzy1ydpi9h1cdii8hdlq9j6mrf931rxhh5"; }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; From 05eb3be0f73a596c2a6f950758ed2a8244e78004 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:57 +0100 Subject: [PATCH 077/211] [nix-update-cpan] perlPackages.LinguaStem: 2.30 -> 2.31 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4654bc1d91c..f2871a74eda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11049,10 +11049,10 @@ let LinguaStem = buildPerlModule { pname = "Lingua-Stem"; - version = "2.30"; + version = "2.31"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-2.30.tar.gz"; - sha256 = "0wx1sa3y3l1a09zxqlfysxlc0x8cwjin3ivh849shv2xy2a3x27q"; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-2.31.tar.gz"; + sha256 = "0r02cf5p09r09ivxhn4xmsgmbk041p6qq6p6af15jzj2nqr9j6ma"; }; doCheck = false; propagatedBuildInputs = [ LinguaPTStemmer LinguaStemFr LinguaStemIt LinguaStemRu LinguaStemSnowballDa SnowballNorwegian SnowballSwedish TextGerman ]; From 600ff01ede0039782689161ae15b86d8febb5403 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:57 +0100 Subject: [PATCH 078/211] [nix-update-cpan] perlPackages.LinkEmbedder: 1.14 -> 1.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2871a74eda..44342574f49 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11117,10 +11117,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.14.tar.gz"; - sha256 = "1dzbh40g773ivawn1smii6jz3kisz07pcn9sbqarc857q5zaf8dq"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.15.tar.gz"; + sha256 = "0ij2jvsiqnqz3qlzw8k3q37ys05wfh1ks2n692hs3bpg7ds3n8bc"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; From 9d4e372070bab760282639d9989cd1b1abca77e0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:57 +0100 Subject: [PATCH 079/211] [nix-update-cpan] perlPackages.ListMoreUtils: 0.428 -> 0.430 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44342574f49..a526a4880fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11252,10 +11252,10 @@ let ListMoreUtils = buildPerlPackage { pname = "List-MoreUtils"; - version = "0.428"; + version = "0.430"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz"; - sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.430.tar.gz"; + sha256 = "09v5cipjf634a1176wy2wicibzz51lry0d0yim9rnbfl5j2ggcb3"; }; propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; meta = { From 2b4223d096e4b52951ec8792ed46747883174960 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:58 +0100 Subject: [PATCH 080/211] [nix-update-cpan] perlPackages.ListMoreUtilsXS: 0.428 -> 0.430 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a526a4880fc..f4807f4c400 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11267,10 +11267,10 @@ let ListMoreUtilsXS = buildPerlPackage { pname = "List-MoreUtils-XS"; - version = "0.428"; + version = "0.430"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz"; - sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"; + sha256 = "0hmjkhmk1qlzbg8skq7g1zral07k1x0fk4w2fpcfr7hpgkaldkp8"; }; preConfigure = '' export LD=$CC From 25da2eacc33289f4a535d48be085dcee613b2150 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:58 +0100 Subject: [PATCH 081/211] [nix-update-cpan] perlPackages.LocaleCodes: 3.65 -> 3.66 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4807f4c400..7d720c38e76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11307,10 +11307,10 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.65"; + version = "3.66"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.65.tar.gz"; - sha256 = "8e0a3f5f9a5f9ec027dcfc6e21ad414b10e3a5c0826b3f9ea498e1a79881cd5d"; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.66.tar.gz"; + sha256 = "1rspbig3zb7l7s1mlsk9n0rrisy8qrzwn0ix6a7sd372arnwvylr"; }; meta = { description = "A distribution of modules to handle locale codes"; From a077793a94ee109efeeb91d1dc46139827e30076 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:58 +0100 Subject: [PATCH 082/211] [nix-update-cpan] perlPackages.LogLog4perl: 1.52 -> 1.53 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7d720c38e76..ccf4ed51dde 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11653,10 +11653,10 @@ let LogLog4perl = buildPerlPackage { pname = "Log-Log4perl"; - version = "1.52"; + version = "1.53"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.52.tar.gz"; - sha256 = "be1cbc318f0c7c40b3062127994691d14a05881f268bbd2611e789b4fdd306b1"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.53.tar.gz"; + sha256 = "13n39byny3yif3x6nrj9iriw8jhbhxqavwrrlm277v3f066v9gwg"; }; meta = { homepage = "https://mschilli.github.io/log4perl/"; From 6a544580aa22e0f23c761dad15da04c7cd9c6e83 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:59 +0100 Subject: [PATCH 083/211] [nix-update-cpan] perlPackages.LWP: 6.47 -> 6.49 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ccf4ed51dde..b7b72f8cf4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11731,10 +11731,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.47"; + version = "6.49"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.47.tar.gz"; - sha256 = "3029d6efc2099c4175bf976d0db7fbab9771ada631010c809cb4664230898f53"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.49.tar.gz"; + sha256 = "19k0cg4j4qz005a4ngy48z4r8dc99dxlpq8kvj7qnk15mvgd1r63"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) From 1f5514b529ad9cccc788e2b6c9fa30e995a697d7 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:59 +0100 Subject: [PATCH 084/211] [nix-update-cpan] perlPackages.MacPasteboard: 0.009 -> 0.011 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7b72f8cf4f..bad1ef212cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11882,10 +11882,10 @@ let MacPasteboard = buildPerlPackage { pname = "Mac-Pasteboard"; - version = "0.009"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.009.tar.gz"; - sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54"; + url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.011.tar.gz"; + sha256 = "1a82pacp6pph3y2agdihzr4vc0phx85mq5am9czc81g8n484b35x"; }; meta = with stdenv.lib; { description = "Manipulate Mac OS X pasteboards"; From d752e4cea8007e5cf3baea48fdc7315fe130583c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:26:59 +0100 Subject: [PATCH 085/211] [nix-update-cpan] perlPackages.MailMessage: 3.009 -> 3.010 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bad1ef212cf..0041f6c61fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11951,10 +11951,10 @@ let MailMessage = buildPerlPackage { pname = "Mail-Message"; - version = "3.009"; + version = "3.010"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz"; - sha256 = "06ngjxnw0r5s6fnwc6qd2710p5v28ssgjkghkw8nqy2glacczlir"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz"; + sha256 = "04wblxrkcjwn7hw6vkvf307lbpc9blj1glqmm59q3642wcd4nhaq"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { From 6c6ffd32e86261bbc96fd54763cb8253e073a65d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:00 +0100 Subject: [PATCH 086/211] [nix-update-cpan] perlPackages.MIMETypes: 2.17 -> 2.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0041f6c61fc..f90804547e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12728,10 +12728,10 @@ let MIMETypes = buildPerlPackage { pname = "MIME-Types"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz"; - sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.18.tar.gz"; + sha256 = "1glml03gyj5xkadn3vcxzm06bvi343j1jg6ksz69is9a3yj3bjii"; }; meta = { description = "Definition of MIME types"; From 7092aff8585b5e7c85981aa03320195859db64cf Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:00 +0100 Subject: [PATCH 087/211] [nix-update-cpan] perlPackages.Minion: 10.13 -> 10.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f90804547e5..73ef7d0d244 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12741,10 +12741,10 @@ let Minion = buildPerlPackage { pname = "Minion"; - version = "10.13"; + version = "10.14"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.13.tar.gz"; - sha256 = "0nxk147v22lvc461923yv8fypqpbsajamvcvnlidk8bb54r33afj"; + url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.14.tar.gz"; + sha256 = "1xs0z61p42qqzqwlag4fci40lzxfy6pdccijgf8wswb2vk6xambg"; }; propagatedBuildInputs = [ Mojolicious ]; meta = { From 72fd18cc1a5028f01e169e591f8c376d42cb482e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:00 +0100 Subject: [PATCH 088/211] [nix-update-cpan] perlPackages.MojoliciousPluginAssetPack: 2.09 -> 2.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73ef7d0d244..2b80b29676a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13383,10 +13383,10 @@ let MojoliciousPluginAssetPack = buildPerlPackage { pname = "Mojolicious-Plugin-AssetPack"; - version = "2.09"; + version = "2.10"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.09.tar.gz"; - sha256 = "7d3277748fb05221085a7632dd1c152e8b41c5519fd3984a0380404221e0686d"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.10.tar.gz"; + sha256 = "0jfspr0mrb8f9p89d01ri7ci0dazrg341sbyd1khppxxwviip378"; }; propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ]; meta = { From b798d7aed8d412d4e16ada6defca404ed09d4f14 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:00 +0100 Subject: [PATCH 089/211] [nix-update-cpan] perlPackages.MojoliciousPluginOpenAPI: 3.35 -> 3.40 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b80b29676a..65ab713fe50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13430,10 +13430,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "3.35"; + version = "3.40"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.35.tar.gz"; - sha256 = "1zw51qdlmrqbg758w2dnrs9qraqj0nv9jqrjygdn4d6661fran11"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.40.tar.gz"; + sha256 = "0pj2azis2xfqcy04j0734hsfq3v60wympzpvsgfhmj0w66mb238y"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { From de86422069c8af4ee854c15d67880b823cf40b3f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:01 +0100 Subject: [PATCH 090/211] [nix-update-cpan] perlPackages.MojoRedis: 3.24 -> 3.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65ab713fe50..df114fc50ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13494,10 +13494,10 @@ let MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; - version = "3.24"; + version = "3.25"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.24.tar.gz"; - sha256 = "ca9ca1026bf7d658f23860d54cbc79605e4e5a8b1cc8e7b053b36a218cef566b"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.25.tar.gz"; + sha256 = "17xxhfavj9j1pzjpxf1j72rq3vm2vj0j4h62088l64v11cs86zig"; }; propagatedBuildInputs = [ Mojolicious ProtocolRedisFaster ]; meta = { From 0fc47bb9e82cc434c0f891368373c27c52fab054 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:01 +0100 Subject: [PATCH 091/211] [nix-update-cpan] perlPackages.MojoJWT: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df114fc50ab..a62e435a46f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13558,10 +13558,10 @@ let MojoJWT = buildPerlModule { pname = "Mojo-JWT"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-JWT-0.08.tar.gz"; - sha256 = "c910229e1182266b6666a2d65deea381a04e48d3aa788c42461b3184006934de"; + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-JWT-0.09.tar.gz"; + sha256 = "11jqm2sbgf5nikkb0d56xxwrd74757ks53nh8p72nvqc7sc06kn0"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ Mojolicious ]; From 26a13e8d4107b5db5fea71906aa2c5226e417f56 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:01 +0100 Subject: [PATCH 092/211] [nix-update-cpan] perlPackages.MojoPg: 4.19 -> 4.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a62e435a46f..e07f45baa89 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13575,10 +13575,10 @@ let MojoPg = buildPerlPackage { pname = "Mojo-Pg"; - version = "4.19"; + version = "4.22"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz"; - sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.22.tar.gz"; + sha256 = "11s3f3km6i3in9wx9q4rkxgvj9rc6w8pdahrc19hi6zkxz3i87nr"; }; propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; buildInputs = [ TestDeep ]; From bd11cefbb19d8c7812c53a654fbdfa6bcc1abee3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:01 +0100 Subject: [PATCH 093/211] [nix-update-cpan] perlPackages.Moo: 2.004000 -> 2.004004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e07f45baa89..9fd75e678ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13622,10 +13622,10 @@ let Moo = buildPerlPackage { pname = "Moo"; - version = "2.004000"; + version = "2.004004"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz"; - sha256 = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004004.tar.gz"; + sha256 = "0ii2rzzs0wfc697d7v3s76fi1y3kl7p1hvxbv330i1vq2nqpfjvi"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; From 76efe253036420b87da8426d957ef8f7b024af2b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:02 +0100 Subject: [PATCH 094/211] [nix-update-cpan] perlPackages.MooXHandlesVia: 0.001008 -> 0.001009 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9fd75e678ec..b65dc905fc2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13657,10 +13657,10 @@ let MooXHandlesVia = buildPerlPackage { pname = "MooX-HandlesVia"; - version = "0.001008"; + version = "0.001009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz"; - sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-HandlesVia-0.001009.tar.gz"; + sha256 = "04kcyflg49rclxa1nm035c05jpyvhdacjyy1wklbgv4li3im6qvi"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; propagatedBuildInputs = [ DataPerl Moo ]; From 102001b43c5d52dcdb85b43c3d42bf671dcc12a3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:02 +0100 Subject: [PATCH 095/211] [nix-update-cpan] perlPackages.MusicBrainzDiscID: 0.03 -> 0.06 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b65dc905fc2..2983c884773 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14609,16 +14609,16 @@ let }; }; - MusicBrainzDiscID = buildPerlModule { + MusicBrainzDiscID = buildPerlPackage { pname = "MusicBrainz-DiscID"; - version = "0.03"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz"; - sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; + url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.06.tar.gz"; + sha256 = "1azc91jnwa3gdmy9pc8mflakgvsvf69ywwlqllxmdzwpk386w2xs"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' - # Build.PL in this package uses which to find pkg-config -- make it use path instead - patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; + # Makefile.PL in this package uses which to find pkg-config -- make it use path instead + patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkgconfig ]; propagatedBuildInputs = [ pkgs.libdiscid ]; From 120d39e23635870547006b12c99ec8391394e61d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:02 +0100 Subject: [PATCH 096/211] [nix-update-cpan] perlPackages.NetAmazonS3: 0.91 -> 0.97 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2983c884773..24a7b82eee1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14765,10 +14765,10 @@ let NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.91"; + version = "0.97"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.91.tar.gz"; - sha256 = "9779f8dea7155b6f96549b4817ca55ee5c6d6e1b0ee872d8d0de8ff13205caff"; + url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.97.tar.gz"; + sha256 = "0d6yg0l6r6ziqjvgsswr484l66nznmj0b9rx4jnsygj8s1vmdn03"; }; buildInputs = [ TestDeep TestException TestLWPUserAgent TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SafeIsa SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; From ff235a0049817865094cce6d9c9f03b8fba4d016 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:03 +0100 Subject: [PATCH 097/211] [nix-update-cpan] perlPackages.NetDNS: 1.26 -> 1.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24a7b82eee1..94108b42e68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14936,10 +14936,10 @@ let NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.26"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.26.tar.gz"; - sha256 = "eabaecd0fdb3e6adef8c9e016e8509319f19caa8c76836253f7db72bafe56498"; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.29.tar.gz"; + sha256 = "1ia35l9bdnwic6fb5knkvn6bl939np5q2r824d1023cggvl6wbc5"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From d9ecee9dfb88ca490a82140def37aec001569be4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:03 +0100 Subject: [PATCH 098/211] [nix-update-cpan] perlPackages.NetLDAPSID: 0.0001 -> 0.001 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94108b42e68..324a55b48b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15148,7 +15148,7 @@ let NetLDAPSID = buildPerlPackage { pname = "Net-LDAP-SID"; - version = "0.0001"; + version = "0.001"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz"; sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8"; From 4d9e8863b0d0bc74c4fb6eca19a79a6c9b0184d6 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:03 +0100 Subject: [PATCH 099/211] [nix-update-cpan] perlPackages.NetPing: 2.73 -> 2.74 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 324a55b48b1..72cb7cde6c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15213,10 +15213,10 @@ let NetPing = buildPerlPackage { pname = "Net-Ping"; - version = "2.73"; + version = "2.74"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz"; - sha256 = "a5fbeafd3e65778364bead8800ae6a06d468ed68208619b5d4c1debd4d197cf2"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.74.tar.gz"; + sha256 = "04bxfglhxvffbwcg32rm1bzv54h183jyazhih5apqppdpdcqjami"; }; meta = { description = "Check a remote host for reachability"; From c5b0de9c6ba388783a70464487f3bdd62f6dbe96 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:03 +0100 Subject: [PATCH 100/211] [nix-update-cpan] perlPackages.NumberFraction: 2.01 -> 3.0.3 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72cb7cde6c7..a3c84fc8785 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15548,12 +15548,12 @@ let NumberFraction = buildPerlModule { pname = "Number-Fraction"; - version = "2.01"; + version = "3.0.3"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz"; - sha256 = "1ysv5md4dmz95zc0gy8ivb21nhqxyv8vrc5lr2sgshsjrdqsi185"; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.3.tar.gz"; + sha256 = "1vqhd6ngrxhfykf4qz358divjhcnp9v688fp3zi6n5757x1sl01v"; }; - propagatedBuildInputs = [ Moose ]; + propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; meta = { description = "Perl extension to model fractions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c5f0703264305a55d7455e50a373e4cf47941fdb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:04 +0100 Subject: [PATCH 101/211] [nix-update-cpan] perlPackages.OggVorbisHeaderPurePerl: 1.04 -> 1.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a3c84fc8785..12764fbee22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15644,10 +15644,10 @@ let OggVorbisHeaderPurePerl = buildPerlPackage { pname = "Ogg-Vorbis-Header-PurePerl"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-PurePerl-1.04.tar.gz"; - sha256 = "04xcjbpkp6mc57f1626871xy3aqnmp8nr21hfsazih8mzklld5sg"; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-PurePerl-1.05.tar.gz"; + sha256 = "0gm5zl1zdi7wra64qz5mm93rkhypwvmaccvcn2k24w9dyh43h7aj"; }; # The testing mechanism is erorrneous upstream. See http://matrix.cpantesters.org/?dist=Ogg-Vorbis-Header-PurePerl+1.0 From e031d4b7ada5bece624f4b2e417d575348a5a7c3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:04 +0100 Subject: [PATCH 102/211] [nix-update-cpan] perlPackages.NetOpenSSH: 0.79 -> 0.80 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 12764fbee22..b745341e723 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15748,10 +15748,10 @@ let NetOpenSSH = buildPerlPackage { pname = "Net-OpenSSH"; - version = "0.79"; + version = "0.80"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz"; - sha256 = "4210fa64b50820f91ab4b6c0e02a579543fc071e73fbdec0f476447ca11172cc"; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.80.tar.gz"; + sha256 = "1cxfipxfmgzfwpn1i0gf39gbrr56i2aqb0i9593n3czjgmjr7q7y"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; From 4ffbf0576d00aff9b6334628159f51690b6cf21e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:04 +0100 Subject: [PATCH 103/211] [nix-update-cpan] perlPackages.PackageStash: 0.38 -> 0.39 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b745341e723..15722e7ea3f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15834,12 +15834,12 @@ let PackageStash = buildPerlPackage { pname = "Package-Stash"; - version = "0.38"; + version = "0.39"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz"; - sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz"; + sha256 = "1d914qnnpiyimfi57crzb6r31nl613g2k48frs9h821f25azarci"; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ CPANMetaCheck TestFatal TestNeeds TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { description = "Routines for manipulating stashes"; From ba6b3d81a17f7403a07d2793bf5e4d9379ed23b6 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:04 +0100 Subject: [PATCH 104/211] [nix-update-cpan] perlPackages.ParamsUtil: 1.07 -> 1.102 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 15722e7ea3f..8f88f31a8d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15936,10 +15936,10 @@ let ParamsUtil = buildPerlPackage { pname = "Params-Util"; - version = "1.07"; + version = "1.102"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz"; - sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Params-Util-1.102.tar.gz"; + sha256 = "00kl154zisf2zsl8yl6xa6yw54nhd9cja5d5fyigs96vhasb36s9"; }; meta = { description = "Simple, compact and correct param-checking functions"; From a88938b232e53585fa44e9364923971d82865bf8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:05 +0100 Subject: [PATCH 105/211] [nix-update-cpan] perlPackages.ParamsValidate: 1.29 -> 1.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f88f31a8d8..77fb667ae93 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15949,10 +15949,10 @@ let ParamsValidate = buildPerlModule { pname = "Params-Validate"; - version = "1.29"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz"; - sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.30.tar.gz"; + sha256 = "04nqfgib2w529na6wjfxfrp54zdyyn91yb40iizd099i7mc3afls"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; From facd7f6653fc11db5d563ee6a96d70493f36522e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:05 +0100 Subject: [PATCH 106/211] [nix-update-cpan] perlPackages.PARDist: 0.49 -> 0.51 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 77fb667ae93..a972d49c16f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16000,10 +16000,10 @@ let PARDist = buildPerlPackage { pname = "PAR-Dist"; - version = "0.49"; + version = "0.51"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz"; - sha256 = "078ycyn8pw3rba4k3qwcqrqfcym5c1pivymwa0bvs9sab45j4iwy"; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.51.tar.gz"; + sha256 = "1y6z6fpp6wclmk4x3nzsxv869i56668y1i74828g72dnz4nhchnj"; }; meta = { description = "Create and manipulate PAR distributions"; From 64eae8bc5a4a5f7e60f2034f1cb2934aea4bf969 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:05 +0100 Subject: [PATCH 107/211] [nix-update-cpan] perlPackages.ParsePMFile: 0.42 -> 0.43 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a972d49c16f..af33339500c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16095,10 +16095,10 @@ let ParsePMFile = buildPerlPackage { pname = "Parse-PMFile"; - version = "0.42"; + version = "0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.42.tar.gz"; - sha256 = "0v3k5jslbl29735hs32x9si546v55cyy6sb58aib8vmq684wgxp7"; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.43.tar.gz"; + sha256 = "08q6j1lw5l49yhzx8gm4zal7zp1gk58iacpda86cyf27403yhqdy"; }; buildInputs = [ ExtUtilsMakeMakerCPANfile ]; meta = { From c9cfd2e36f5251f43adff70e95ed42c432fa6a7c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:05 +0100 Subject: [PATCH 108/211] [nix-update-cpan] perlPackages.PDL: 2.022 -> 2.025 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index af33339500c..00c68f60155 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16270,10 +16270,10 @@ let PDL = buildPerlPackage rec { pname = "PDL"; - version = "2.022"; + version = "2.025"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/${pname}-${version}.tar.gz"; - sha256 = "12isj05ni44bgf76lc0fs5v88ai8gn5dqrppsbj7vsxblcya7113"; + url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.025.tar.gz"; + sha256 = "1mlab95ij5a4q5pkrmgfas8x46cms2vqwzyjvaajsxr7mmz1cnhv"; }; patchPhase = '' substituteInPlace perldl.conf \ From 6a05a4dde38d0a3a5997300e3fea49ebde32e716 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:06 +0100 Subject: [PATCH 109/211] [nix-update-cpan] perlPackages.PerlIOutf8_strict: 0.007 -> 0.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00c68f60155..b98a973a2cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16433,10 +16433,10 @@ let PerlIOutf8_strict = buildPerlPackage { pname = "PerlIO-utf8_strict"; - version = "0.007"; + version = "0.008"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz"; - sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz"; + sha256 = "0ngl9p3kh7as1yx1az66yhbxhrh664vzhl3qnlhx9iywa3nqsyaz"; }; buildInputs = [ TestException ]; meta = { From e9ab989f24929c337630d43cfa560aecd9921ed0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:06 +0100 Subject: [PATCH 110/211] [nix-update-cpan] perlPackages.PerlTidy: 20201001 -> 20201207 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b98a973a2cf..70371cf1aaf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16519,10 +16519,10 @@ let PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20201001"; + version = "20201207"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-${version}.tar.gz"; - sha256 = "04lsvjhv9h11scq9craky4gzpf2bw2q68wg6p0ppk79302rynwq8"; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20201207.tar.gz"; + sha256 = "049x02awvpfr7m8dai04ya61jzs6cl45qplxzx7nf8x6jgj08i9f"; }; meta = { description = "Indent and reformat perl scripts"; From b13e39825e1e39522e83d77c89bd34a271a17187 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:06 +0100 Subject: [PATCH 111/211] [nix-update-cpan] perlPackages.PkgConfig: 0.24026 -> 0.25026 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70371cf1aaf..7845d48333b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16544,10 +16544,10 @@ let PkgConfig = buildPerlPackage { pname = "PkgConfig"; - version = "0.24026"; + version = "0.25026"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.24026.tar.gz"; - sha256 = "345d44562802ddf3da70faf817e2d1884808166d00480fcce6d7b92005d91aee"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.25026.tar.gz"; + sha256 = "1862hzlkibqsgynrnwg43acycp4rlsv19gsybjwq39nnqb9mxfjd"; }; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; From 770cbe859fbc148ac690946250ff230143f5ee08 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:07 +0100 Subject: [PATCH 112/211] [nix-update-cpan] perlPackages.Plack: 1.0047 -> 1.0048 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7845d48333b..ae76d59d75a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16558,10 +16558,10 @@ let Plack = buildPerlPackage { pname = "Plack"; - version = "1.0047"; + version = "1.0048"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz"; - sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0048.tar.gz"; + sha256 = "19j2wnzsl0wl31ww4c2p1pahidwsr9hnylm2as8qadxl35gg5x9h"; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; From 4457fbc7d9add5bb63e054e9b8022b903a54e6b2 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:07 +0100 Subject: [PATCH 113/211] [nix-update-cpan] perlPackages.PPIxQuoteLike: 0.012 -> 0.013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae76d59d75a..4893ffc89c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16827,10 +16827,10 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.012"; + version = "0.013"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.012.tar.gz"; - sha256 = "0g69wgj3libxf03q2sp7wcs6m42yps38fi8ndwlz5saqxnwpdz27"; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.013.tar.gz"; + sha256 = "05qq5lk7a91jzn2vld906nvrpqbhxvy40s2qdymm5lkqha1k67ld"; }; propagatedBuildInputs = [ PPI Readonly ]; meta = { From e9de9cd84fb0bc2072a89a794066cef0941c2022 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:07 +0100 Subject: [PATCH 114/211] [nix-update-cpan] perlPackages.PPIxRegexp: 0.074 -> 0.076 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4893ffc89c6..fd91dbd9aba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16841,10 +16841,10 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.074"; + version = "0.076"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.074.tar.gz"; - sha256 = "c4c02ef32d5357ac3f81c8cb6d7da5f1c9e9bea2f47f1476c847efac276d109f"; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.076.tar.gz"; + sha256 = "0jh1g83s4m7qlj6c99myvbqayfd9nkff37y0chvlp33j4a9psq0h"; }; propagatedBuildInputs = [ PPI ]; meta = { From 562f7b67ebbd47605511e1d7c7c25c52d453688e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:07 +0100 Subject: [PATCH 115/211] [nix-update-cpan] perlPackages.PadWalker: 2.3 -> 2.5 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fd91dbd9aba..429781c4dde 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17013,10 +17013,10 @@ let PadWalker = buildPerlPackage { pname = "PadWalker"; - version = "2.3"; + version = "2.5"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz"; - sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; + url = "mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.5.tar.gz"; + sha256 = "1l0cga0ny43x5xpqw9nrdwbznvqpj35ni39a0wrayihihjxnmch7"; }; }; From cee213a395871c0dd22d7cfadfad202fc9c6d692 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:08 +0100 Subject: [PATCH 116/211] [nix-update-cpan] perlPackages.PodChecker: 1.73 -> 1.74 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 429781c4dde..fb70ec06c00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17105,10 +17105,10 @@ let PodChecker = buildPerlPackage { pname = "Pod-Checker"; - version = "1.73"; + version = "1.74"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz"; - sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.74.tar.gz"; + sha256 = "12559997r7wbhhs0p6cdxdzv7rzviv0nx1hq0dby8q481apn489f"; }; }; From 74566f8c64e5e9250c6bb854a6fe36946008a905 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:08 +0100 Subject: [PATCH 117/211] [nix-update-cpan] perlPackages.podlators: 4.10 -> 4.14 --- pkgs/top-level/perl-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb70ec06c00..64a06c388dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17258,11 +17258,15 @@ let podlators = buildPerlPackage { pname = "podlators"; - version = "4.10"; + version = "4.14"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz"; - sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; + url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.14.tar.gz"; + sha256 = "10hgvdyp0969a1222hk1y5n2p72lhxrrv8h0yyzlsbjbwcfw9wbs"; }; + preCheck = '' + # remove failing spdx check + rm t/docs/spdx-license.t + ''; meta = { description = "Convert POD data to various other formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d4308542d6a557e2b884a8e1097bc8f8181d18f3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:08 +0100 Subject: [PATCH 118/211] [nix-update-cpan] perlPackages.PodMarkdown: 3.200 -> 3.300 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64a06c388dc..054a8913d32 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17330,10 +17330,10 @@ let PodMarkdown = buildPerlPackage { pname = "Pod-Markdown"; - version = "3.200"; + version = "3.300"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz"; - sha256 = "16dffpqwrdhi2s90ff2sgncrpnzqp81ydhl5pd78m725j60p2286"; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.300.tar.gz"; + sha256 = "0y8vk7wprair2fjqbkjl7g9jv0dn7rv58l7b9yf7819nia8fjygc"; }; buildInputs = [ TestDifferences ]; meta = { From c0c0d94fdc0d97a933e92d2606b7a8377e97eae5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:08 +0100 Subject: [PATCH 119/211] [nix-update-cpan] perlPackages.PodSimple: 3.40 -> 3.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 054a8913d32..ea3a92c6dbe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17361,10 +17361,10 @@ let PodSimple = buildPerlPackage { pname = "Pod-Simple"; - version = "3.40"; + version = "3.42"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.40.tar.gz"; - sha256 = "0384k8k18srsdj2a2j10gbvv19lnvynq359y9kb4zn5bv2wqqfh6"; + url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.42.tar.gz"; + sha256 = "1icagrjqw1azmff82h17cbrhqgql7rg21gz64mjpiqqq0cpfpz59"; }; }; From f4038979611ae49212d2cf0beaa9249c78f2bf49 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:09 +0100 Subject: [PATCH 120/211] [nix-update-cpan] perlPackages.SearchXapian: 1.2.25.2 -> 1.2.25.4 --- pkgs/top-level/perl-packages.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea3a92c6dbe..75f4b23590b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17881,19 +17881,11 @@ let SearchXapian = buildPerlPackage rec { pname = "Search-Xapian"; - version = "1.2.25.2"; + version = "1.2.25.4"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.2.tar.gz"; - sha256 = "0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"; + url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.4.tar.gz"; + sha256 = "1pbl8pbgmbs3i8yik4p63g4pd9bhn0dp3d7l667dkvw0kccl66c7"; }; - patches = [ - (fetchpatch { - url = "https://git.xapian.org/?p=xapian;a=patch;h=69ad652b7ad7912801e686db2da55d73f79fbf75"; - name = "fix-automated-testing-false-negative"; - sha256 = "1241mpyf8mgx7szyl5sxa6wl388rzph3q51mn9v4yjbm0k5l0sxr"; - stripLen = 1; - }) - ]; buildInputs = [ pkgs.xapian DevelLeak ]; meta = { description = "Perl XS frontend to the Xapian C++ search library"; From 42d69352f02b17ef5b5f89f97491e661d251aa97 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:09 +0100 Subject: [PATCH 121/211] [nix-update-cpan] perlPackages.SQLAbstractLimit: 0.141 -> 0.142 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 75f4b23590b..2328e29455d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18283,12 +18283,12 @@ let }; }; - SQLAbstractLimit = buildPerlModule { + SQLAbstractLimit = buildPerlPackage { pname = "SQL-Abstract-Limit"; - version = "0.141"; + version = "0.142"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz"; - sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; + url = "mirror://cpan/authors/id/A/AS/ASB/SQL-Abstract-Limit-0.142.tar.gz"; + sha256 = "0y2q7mxngm9m2kvr6isvxra4frb1cjbiplp381p6hhifn7xfz8fl"; }; propagatedBuildInputs = [ DBI SQLAbstract ]; buildInputs = [ TestDeep TestException ]; From 1131181f54faf2a37814b868bd814d329ed5573e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:09 +0100 Subject: [PATCH 122/211] [nix-update-cpan] perlPackages.SQLStatement: 1.412 -> 1.414 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2328e29455d..15a577def64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18307,10 +18307,10 @@ let SQLStatement = buildPerlPackage { pname = "SQL-Statement"; - version = "1.412"; + version = "1.414"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz"; - sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8"; + url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.414.tar.gz"; + sha256 = "0j8sg36wc3nwfb2gj3fv75f0iv7s7q7vl6b5l3fywdm1lv7vvs6x"; }; buildInputs = [ MathBaseConvert TestDeep TextSoundex ]; propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil ]; From a3b6445213d5f200d41371a7de3fb9f9cd207685 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:09 +0100 Subject: [PATCH 123/211] [nix-update-cpan] perlPackages.SQLTranslator: 1.61 -> 1.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 15a577def64..0627ad9cba0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18327,10 +18327,10 @@ let SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "1.61"; + version = "1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz"; - sha256 = "840e3c77cd48b47e1343c79ae8ef4fca46d036356d143d33528900740416dfe8"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.62.tar.gz"; + sha256 = "096fq62iphmxgcfcayg4i0wf09y1rl1ar6hrcxfqsbrsmkwlzk8a"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; From 6bd539dcf9c3e6396ee98f29f896125955645b59 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:10 +0100 Subject: [PATCH 124/211] [nix-update-cpan] perlPackages.StatisticsDescriptive: 3.0702 -> 3.0800 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0627ad9cba0..972c174d8bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18442,10 +18442,10 @@ let StatisticsDescriptive = buildPerlModule { pname = "Statistics-Descriptive"; - version = "3.0702"; + version = "3.0800"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz"; - sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0800.tar.gz"; + sha256 = "0fgrjr79ai5dn92kypslsi97y7r8iiwmd682lrd47vdz4vmdwkmh"; }; meta = { #homepage = "http://web-cpan.berlios.de/modules/Statistics-Descriptive/"; # berlios shut down; I found no replacement From 5c7f530d8d2cc1c85249ff37aa1423bdfc79f7b4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:10 +0100 Subject: [PATCH 125/211] [nix-update-cpan] perlPackages.StringCRC32: 1.8 -> 2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 972c174d8bd..8df49ca1560 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18522,10 +18522,10 @@ let StringCRC32 = buildPerlPackage { pname = "String-CRC32"; - version = "1.8"; + version = "2"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.8.tar.gz"; - sha256 = "0vvwlf50vylx1m7nrjphkz309nsl2k2yqyldn3942337kiipjnmn"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.tar.gz"; + sha256 = "0bfrpnkgfakd4apv366p63z4vzypzvhj3yyqaw9dg7zca2pgxdzd"; }; }; From aa32a9d2b2edbd12fba35efb3f1447cbabf440ec Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:10 +0100 Subject: [PATCH 126/211] [nix-update-cpan] perlPackages.StringRandom: 0.30 -> 0.31 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8df49ca1560..e9845fc3b61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18653,10 +18653,10 @@ let StringRandom = buildPerlModule { pname = "String-Random"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz"; - sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.31.tar.gz"; + sha256 = "0p4pmf3k6c01j8clfx54167rva9mf82bkh9aj5qdrix2cgpd2jjb"; }; }; From fd6dbc0b73d1625f106f43930fd8a8bde3ba30fd Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:11 +0100 Subject: [PATCH 127/211] [nix-update-cpan] perlPackages.SubHandlesVia: 0.014 -> 0.016 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9845fc3b61..591933293d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18842,10 +18842,10 @@ let SubHandlesVia = buildPerlPackage { pname = "Sub-HandlesVia"; - version = "0.014"; + version = "0.016"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.014.tar.gz"; - sha256 = "0mhwnh3966gr10hxnbsdq2ccsha958divcfhwn2yia3q06j6bk4d"; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.016.tar.gz"; + sha256 = "1mgr5igbr0zj8kzlfq7ayh5912i6mz47cx3605s04927wm5d9pk9"; }; propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; buildInputs = [ TestFatal TestRequires ]; From 12be1335a76ff2111a482ccce79f7ef465fd750e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:11 +0100 Subject: [PATCH 128/211] [nix-update-cpan] perlPackages.TaskFreecellSolverTesting: 0.0.11 -> 0.0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 591933293d1..39650509631 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19212,10 +19212,10 @@ let TaskFreecellSolverTesting = buildPerlModule { pname = "Task-FreecellSolver-Testing"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz"; - sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-0.0.12.tar.gz"; + sha256 = "19wkz5ii8h90i9gmh692kvw9rz7k9bmpi53pw331fm0jmsvi069x"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC ListMoreUtils MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; From 269d3d2cafddea310b5655aa85bc6c09484fee53 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:11 +0100 Subject: [PATCH 129/211] [nix-update-cpan] perlPackages.TaskTestRunAllPlugins: 0.0105 -> 0.0106 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39650509631..ee58290ed9c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19238,10 +19238,10 @@ let TaskTestRunAllPlugins = buildPerlModule { pname = "Task-Test-Run-AllPlugins"; - version = "0.0105"; + version = "0.0106"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz"; - sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0106.tar.gz"; + sha256 = "0y6fgldb59mc96lkghmd8n0gdbqaal6hz0cqqadna1jqi3q0p38v"; }; buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; meta = { From 89d641d740d1e1b2c04dc12418f7831b26c19bac Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:12 +0100 Subject: [PATCH 130/211] [nix-update-cpan] perlPackages.TermShell: 0.11 -> 0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee58290ed9c..c122eae977f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19526,10 +19526,10 @@ let TermShell = buildPerlModule { pname = "Term-Shell"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz"; - sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.12.tar.gz"; + sha256 = "1mrx7g74qvkdis7x7zq1zs0b7q2fsz59g4hxvg140r8bq1wzav3x"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = with stdenv.lib; { From d18f623e9f9ac1e2c354a3b1246cf06f3dca091d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:12 +0100 Subject: [PATCH 131/211] [nix-update-cpan] perlPackages.Test2Suite: 0.000135 -> 0.000138 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c122eae977f..388b6f92d74 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19668,10 +19668,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000135"; + version = "0.000138"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000135.tar.gz"; - sha256 = "1d0ac9e1e363c70ffecfe155e2cf917c610c671f65aa1cdb2425a3a6caeae21b"; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000138.tar.gz"; + sha256 = "0x887d8y657k7072k5f5ly36f067ldafm27xbd9lh5nirvr2vxqc"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From f996c57783216b9c0a63d095b11be55dbe381c4a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:12 +0100 Subject: [PATCH 132/211] [nix-update-cpan] perlPackages.TestDataSplit: 0.2.1 -> 0.2.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 388b6f92d74..2f58ecb9b47 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19890,10 +19890,10 @@ let TestDataSplit = buildPerlModule { pname = "Test-Data-Split"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz"; - sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.2.tar.gz"; + sha256 = "08l0h9xkikj6ggm24dark2hp9wffypanjdbha3gdfc5dmn83h275"; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ]; From 9f8b55ef98b82f5d93c1c487915c1d968572685d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:12 +0100 Subject: [PATCH 133/211] [nix-update-cpan] perlPackages.TestEOL: 2.00 -> 2.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f58ecb9b47..15541173cfd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19958,10 +19958,10 @@ let TestEOL = buildPerlPackage { pname = "Test-EOL"; - version = "2.00"; + version = "2.02"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz"; - sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.02.tar.gz"; + sha256 = "1i5g40bx72fh0nszxh75v042bp66f4jv3xva4bi7z017zgbrjc98"; }; meta = { description = "Check the correct line endings in your project"; From d9daaf8cca2d2d449e027452dd68832903997acc Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:13 +0100 Subject: [PATCH 134/211] [nix-update-cpan] perlPackages.TestMockModule: 0.173.0 -> 0.175.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 15541173cfd..9a88eebff8c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20338,10 +20338,10 @@ let TestMockModule = buildPerlModule { pname = "Test-MockModule"; - version = "0.173.0"; + version = "0.175.0"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz"; - sha256 = "0hnv2ziyasrri58ys93j5qyyzgxw3jx5hvjhd72nsp4vqq6lhg6s"; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.175.0.tar.gz"; + sha256 = "1zpf8p04and7jj33pc919g2pfg0scaqwqq1cnk8wx0nx2gbq9ch7"; }; propagatedBuildInputs = [ SUPER ]; buildInputs = [ TestWarnings ]; From 598de3891dddabbd805cf9dcba68ce9b31329d3d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:13 +0100 Subject: [PATCH 135/211] [nix-update-cpan] perlPackages.TestRun: 0.0304 -> 0.0305 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a88eebff8c..8ab4881b0b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20706,10 +20706,10 @@ let TestRun = buildPerlModule { pname = "Test-Run"; - version = "0.0304"; + version = "0.0305"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz"; - sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0305.tar.gz"; + sha256 = "0j62hzh7k4lvk390pm8581nhjnayxp4pf0g6x1vagqpqc3fp36pq"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; From 1540a018ca2bed82a3288267df9af5c407c9afcb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:13 +0100 Subject: [PATCH 136/211] [nix-update-cpan] perlPackages.TestRunCmdLine: 0.0131 -> 0.0132 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ab4881b0b3..4ba17183b1b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20722,10 +20722,10 @@ let TestRunCmdLine = buildPerlModule { pname = "Test-Run-CmdLine"; - version = "0.0131"; + version = "0.0132"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz"; - sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0132.tar.gz"; + sha256 = "01x7rzscj3f06kpv0bd9dwx4wg9bmn7b5gyqfvy7wmv3ak6r3hxj"; }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; From b836fd77d04ba0035d99a5871ebcf792216429fa Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:13 +0100 Subject: [PATCH 137/211] [nix-update-cpan] perlPackages.TestRunPluginAlternateInterpreters: 0.0124 -> 0.0125 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ba17183b1b..d78b9ed674d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20739,10 +20739,10 @@ let TestRunPluginAlternateInterpreters = buildPerlModule { pname = "Test-Run-Plugin-AlternateInterpreters"; - version = "0.0124"; + version = "0.0125"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz"; - sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0125.tar.gz"; + sha256 = "1fwr687h05fg6xn6vsfx9ll2ha8c7brmqbiz18biz0jx2jdnihsj"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; From 453ccff30ee97325251a0981c992fd706f6389aa Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:14 +0100 Subject: [PATCH 138/211] [nix-update-cpan] perlPackages.TestRunPluginBreakOnFailure: 0.0.5 -> 0.0.6 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d78b9ed674d..1ddb053adb2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20755,10 +20755,10 @@ let TestRunPluginBreakOnFailure = buildPerlModule { pname = "Test-Run-Plugin-BreakOnFailure"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz"; - sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.6.tar.gz"; + sha256 = "1a8k9p89s31wrax0yk8p0zsvj40mjgi0bnjmj0949hghwbihw650"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; From e1c44be0e58822787d21576bdcb78f9643c4b29e Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:14 +0100 Subject: [PATCH 139/211] [nix-update-cpan] perlPackages.TestRunPluginColorFileVerdicts: 0.0124 -> 0.0125 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1ddb053adb2..2dd6ee85452 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20771,10 +20771,10 @@ let TestRunPluginColorFileVerdicts = buildPerlModule { pname = "Test-Run-Plugin-ColorFileVerdicts"; - version = "0.0124"; + version = "0.0125"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz"; - sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0125.tar.gz"; + sha256 = "0ihy5rzhc7472kh8931i7fbqf36nixl6yjrf8x5ndzd62hn1l90w"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; propagatedBuildInputs = [ Moose ]; From bbccf825b5ef74ec6542fbeb5f2b7ad27580fea5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:14 +0100 Subject: [PATCH 140/211] [nix-update-cpan] perlPackages.TestRunPluginColorSummary: 0.0202 -> 0.0203 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2dd6ee85452..ad8b257baae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20789,10 +20789,10 @@ let TestRunPluginColorSummary = buildPerlModule { pname = "Test-Run-Plugin-ColorSummary"; - version = "0.0202"; + version = "0.0203"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz"; - sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0203.tar.gz"; + sha256 = "1zca7w360m0vf3srf8af1s2k9k8hi85w1cavql7m2sr9kcvpknbv"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it From 3949ca37e284bba3b4ad5a9746185a4b47a8e49f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:15 +0100 Subject: [PATCH 141/211] [nix-update-cpan] perlPackages.TestRunPluginTrimDisplayedFilenames: 0.0125 -> 0.0126 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ad8b257baae..081c302e41d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20806,10 +20806,10 @@ let TestRunPluginTrimDisplayedFilenames = buildPerlModule { pname = "Test-Run-Plugin-TrimDisplayedFilenames"; - version = "0.0125"; + version = "0.0126"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz"; - sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0126.tar.gz"; + sha256 = "0a4hxbsbhsnkx99h3d01fchv7ip0c1np2jmf6xvqm657qv1lk1la"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; From 31bfc7a1887c0a88c2253c36592b02b510e28bf5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:15 +0100 Subject: [PATCH 142/211] [nix-update-cpan] perlPackages.TestRunValgrind: 0.2.1 -> 0.2.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 081c302e41d..6efad17f871 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20822,10 +20822,10 @@ let TestRunValgrind = buildPerlModule { pname = "Test-RunValgrind"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz"; - sha256 = "25a4a8bfcefaed7c40d8b8492e8828e798e6c85ca5f34ce4b9993f9899a7b09c"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.2.tar.gz"; + sha256 = "1vm5iw5sy0mhjjypaaviil9qgqixmkaghdbjbcyb4lf2mm6d24v9"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ PathTiny ]; From 0dcc67f52a62bf0ef2fa92d38f72303606c2ea8c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:15 +0100 Subject: [PATCH 143/211] [nix-update-cpan] perlPackages.TestSimple13: 1.302177 -> 1.302183 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6efad17f871..3c066a214dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20879,10 +20879,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302177"; + version = "1.302183"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302177.tar.gz"; - sha256 = "9fbf263096d893d7f8e0dcb0ea0dfe8d62b973b86e6360f43b54080bd2974554"; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302183.tar.gz"; + sha256 = "1zq6841yrwxmrmhgzmzx0njlymsv9mzl6l5njabfl2j2xjjvs0ws"; }; meta = { description = "Basic utilities for writing tests"; From 87abe2349349a208ae38bc2a3d10a351768ef152 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:15 +0100 Subject: [PATCH 144/211] [nix-update-cpan] perlPackages.TestWWWMechanize: 1.52 -> 1.54 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3c066a214dc..2e57d04cf54 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21082,10 +21082,10 @@ let TestWWWMechanize = buildPerlPackage { pname = "Test-WWW-Mechanize"; - version = "1.52"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz"; - sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.54.tar.gz"; + sha256 = "1z4s8fijwx8p74fw29435d2c2l6c1sgzz0n7lrdby5212xdqpa6w"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; From 0509d3d6964ad44bdb668900f022be296e12a5ca Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:16 +0100 Subject: [PATCH 145/211] [nix-update-cpan] perlPackages.TextBalanced: 2.03 -> 2.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2e57d04cf54..de01c3cdf6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21200,10 +21200,10 @@ let TextBalanced = buildPerlPackage { pname = "Text-Balanced"; - version = "2.03"; + version = "2.04"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz"; - sha256 = "057753f8f0568b53921f66a60a89c30092b73329bcc61a2c43339ab70c9792c8"; + url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.04.tar.gz"; + sha256 = "1qp7whrampvdzb4nbdvbzp02vlmyk5ssha2lg1iaf2y8hn5l177l"; }; meta = { description = "Extract delimited text sequences from strings"; From 4468adf01cd4a4afbc2d8574e42dc619a49d21b3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:16 +0100 Subject: [PATCH 146/211] [nix-update-cpan] perlPackages.TextSprintfNamed: 0.0403 -> 0.0405 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de01c3cdf6c..ce1b1a7fcb9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21635,10 +21635,10 @@ let TextSprintfNamed = buildPerlModule { pname = "Text-Sprintf-Named"; - version = "0.0403"; + version = "0.0405"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz"; - sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0405.tar.gz"; + sha256 = "1z0glxrmbc6pgjs5bkmp1wiifd4xdcrin8wqz6rhmi6gzxw0siwv"; }; buildInputs = [ TestWarn ]; meta = { From 41a8ff035c3820c7d46f47bd7c53e97a180df5bb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:16 +0100 Subject: [PATCH 147/211] [nix-update-cpan] perlPackages.TieHashIndexed: 0.05 -> 0.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ce1b1a7fcb9..18656c00f72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21956,10 +21956,10 @@ let TieHashIndexed = buildPerlPackage { pname = "Tie-Hash-Indexed"; - version = "0.05"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz"; - sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e"; + url = "mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.08.tar.gz"; + sha256 = "043v98xaid6sjch2x9c39s475wm9i13vzf8jg73qm12sby0n5g1p"; }; meta = { description = "Ordered hashes for Perl"; From 8865f69e1d22463ae4ad061dd0d44570a5be887f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:16 +0100 Subject: [PATCH 148/211] [nix-update-cpan] perlPackages.TieRefHash: 1.39 -> 1.40 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18656c00f72..34144904063 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21970,10 +21970,10 @@ let TieRefHash = buildPerlPackage { pname = "Tie-RefHash"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz"; - sha256 = "b0b80ef571e7dadb726b8214f7352a932a8fa82af29072895aa1aadc89f48bec"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Tie-RefHash-1.40.tar.gz"; + sha256 = "1mvyjab8pv1yfimvlh4gxxpm3xzny4pinymdr8hgdd9gim8izkss"; }; }; From 0a204c73666bc057588482f9f2dfaebc2444e3e4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:17 +0100 Subject: [PATCH 149/211] [nix-update-cpan] perlPackages.TypeTiny: 1.010006 -> 1.012000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34144904063..de481b1f1ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22263,10 +22263,10 @@ let TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.010006"; + version = "1.012000"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010006.tar.gz"; - sha256 = "f1568e3f0bf103e65faadc1804c6184fe29bf52559e7ff3c12f4dad437befd82"; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012000.tar.gz"; + sha256 = "147axzi07g5akpzbzd2npvdyh9pmzv22a8la1dmylahw2qh15nyk"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { From 8284f4080258369d1719640a5877d373901e8d9f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:17 +0100 Subject: [PATCH 150/211] [nix-update-cpan] perlPackages.TypesSerialiser: 1.0 -> 1.01 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de481b1f1ac..c41c77739ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22278,10 +22278,10 @@ let TypesSerialiser = buildPerlPackage { pname = "Types-Serialiser"; - version = "1.0"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz"; - sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.01.tar.gz"; + sha256 = "104a7292pwwg57rswpkiaq1cgj7hcsrpf818azcy7l0l14xigizq"; }; propagatedBuildInputs = [ commonsense ]; meta = { From 3320372b554306f340e6adaf1af4782dad024233 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:17 +0100 Subject: [PATCH 151/211] [nix-update-cpan] perlPackages.URI: 1.76 -> 5.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c41c77739ab..0512fec1e89 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22417,10 +22417,10 @@ let URI = buildPerlPackage { pname = "URI"; - version = "1.76"; + version = "5.05"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz"; - sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-5.05.tar.gz"; + sha256 = "1v3r3ck67w272kzfgm1nd3wb41av1hlnza56vkxxj1i7s3917hd5"; }; buildInputs = [ TestNeeds ]; meta = { From b923a1c976588cdae82a0ff0eaf5a87ac9f816e5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:17 +0100 Subject: [PATCH 152/211] [nix-update-cpan] perlPackages.UserIdentity: 0.99 -> 1.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0512fec1e89..b416e8153be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22485,10 +22485,10 @@ let UserIdentity = buildPerlPackage { pname = "User-Identity"; - version = "0.99"; + version = "1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz"; - sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz"; + sha256 = "0jlzishg33848qvl5x7nsrnlpnx7lfg5hr4m1qrjddzy3hkv86cj"; }; meta = { description = "Collect information about a user"; From 8d92277c251d54c75049930a95c94f868f91c364 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:18 +0100 Subject: [PATCH 153/211] [nix-update-cpan] perlPackages.Version: 0.9927 -> 0.9928 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b416e8153be..2ac853a05bf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22607,10 +22607,10 @@ let Version = buildPerlPackage { pname = "version"; - version = "0.9927"; + version = "0.9928"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9927.tar.gz"; - sha256 = "a78cb8d9ecbfea200ac18bed9e6e72c8efd60e6ebeb47ee142c3c5c635a88d06"; + url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9928.tar.gz"; + sha256 = "13mabl07rhwwlshj72hvp1j43q3ygxf7wp7qxx3nbqbnrf6i83i4"; }; meta = { description = "Structured version objects"; From 9158a1f2dd81bac2d019f13e3d48424c3aefbace Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:18 +0100 Subject: [PATCH 154/211] [nix-update-cpan] perlPackages.WWWMechanize: 2.00 -> 2.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ac853a05bf..42c8434d69c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22712,10 +22712,10 @@ let WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "2.00"; + version = "2.03"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz"; - sha256 = "0j5bzn9jwb8rclif776gax57jxxn108swmajiqi2cpjbmlwng0ki"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.03.tar.gz"; + sha256 = "0pl4jc6hmkhzkswka62dij7l0378qvn9dwbh08n54q8xyr6xf79z"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; From db806b7c704b57bdc158e75c4c0217126ffa5c7c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:18 +0100 Subject: [PATCH 155/211] [nix-update-cpan] perlPackages.XMLLibXML: 2.0205 -> 2.0206 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42c8434d69c..e0435836f94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23016,10 +23016,10 @@ let XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0205"; + version = "2.0206"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz"; - sha256 = "0y12bcpnxzn8vs9zglaaxkw0kgrgmljxrxdf1cnijgxi2hkh099s"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0206.tar.gz"; + sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ]; From 13b5166c7bad17c569c479e9f56cdb91fc8570ad Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:18 +0100 Subject: [PATCH 156/211] [nix-update-cpan] perlPackages.XMLRSS: 1.61 -> 1.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0435836f94..b10a1950091 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23157,10 +23157,10 @@ let XMLRSS = buildPerlModule { pname = "XML-RSS"; - version = "1.61"; + version = "1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz"; - sha256 = "fa6fe7ce5d31800a2bd414ef39da48c7f2b26b073a3c1f0d677bda26e840c90d"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.62.tar.gz"; + sha256 = "0klb8ghd405pdkmn25lp3i4j2lfydz8w581sk51p3zy788s0c9yk"; }; propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { From e51cb52c04fceeb677728285495c5cf6f44be35c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:19 +0100 Subject: [PATCH 157/211] [nix-update-cpan] perlPackages.XMLWriter: 0.625 -> 0.900 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b10a1950091..0fc7bffb17d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23306,10 +23306,10 @@ let XMLWriter = buildPerlPackage { pname = "XML-Writer"; - version = "0.625"; + version = "0.900"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz"; - sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"; + url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.900.tar.gz"; + sha256 = "07qd806kcs7si7qakx3x5p68xq2jdmkxdrns987kaayg7syzbj3k"; }; }; From dbee8403116b6a27d1510e4ee9be0937f7db6182 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:19 +0100 Subject: [PATCH 158/211] [nix-update-cpan] perlPackages.YAMLSyck: 1.32 -> 1.34 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0fc7bffb17d..14f5f1011f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23377,10 +23377,10 @@ let YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; - version = "1.32"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; - sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; + sha256 = "0na1wg3d7ykzy5i44w6i1s37ymq6x0cvcc9gzvmri9xxmv65d4fc"; }; perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { From e93c88a761f7ad2cd8e0093b771be7da9d5fe433 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 13 Dec 2020 13:27:19 +0100 Subject: [PATCH 159/211] [nix-update-cpan] perlPackages.YAMLPP: 0.025 -> 0.026 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14f5f1011f7..a5580771ba2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23409,10 +23409,10 @@ let YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.025"; + version = "0.026"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.025.tar.gz"; - sha256 = "1v579a874b98l8kj0sk2qk8ydcgqlzlrvcs2yc77s1xnxay15b0m"; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.026.tar.gz"; + sha256 = "1ss5b8ny00pvg6bfx562hy7z5hj02w1yh224qpn6dsgk3ikqx1ab"; }; buildInputs = [ TestDeep TestWarn ]; meta = { From 99061cb6ac8197d456692ccec06a6bfa8354917a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Dec 2020 04:20:00 +0000 Subject: [PATCH 160/211] zstd: 1.4.5 -> 1.4.8 + https://github.com/facebook/zstd/releases/tag/v1.4.7 + https://github.com/facebook/zstd/releases/tag/v1.4.8 --- pkgs/tools/compression/zstd/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index c26ca507525..913a94e1a00 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep +{ stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file , legacySupport ? false @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.5"; + version = "1.4.8"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "0ay3qlk4sffnmcl3b34q4zd7mkcmjds023icmib1mdli97qcp38l"; + sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw"; }; nativeBuildInputs = [ cmake ] @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { patches = [ ./playtests-darwin.patch - (fetchpatch { - url = "https://github.com/facebook/zstd/pull/2163.patch"; - sha256 = "07mfjc5f9wy0w2xlj36hyf7g5ax9r2rf6ixhkffhnwc6rwy0q54p"; - }) ] # This I didn't upstream because if you use posix threads with MinGW it will # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; @@ -88,6 +84,7 @@ stdenv.mkDerivation rec { property shared by most LZ compression algorithms, such as zlib. ''; homepage = "https://facebook.github.io/zstd/"; + changelog = "https://github.com/facebook/zstd/blob/v${version}/CHANGELOG"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. platforms = platforms.all; From 10e8c6d3239fe76c6563f7e5106bfe23de475024 Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 8 Dec 2020 21:06:51 +0900 Subject: [PATCH 161/211] libtapi: 1000.10.8 -> 1100.0.11 closes #106348 --- pkgs/os-specific/darwin/libtapi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index a6bc16d42f9..8c83b4ae1e6 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtapi"; - version = "1000.10.8"; # determined by looking at VERSION.txt + version = "1100.0.11"; # determined by looking at VERSION.txt src = fetchFromGitHub { owner = "tpoechtrager"; repo = "apple-libtapi"; - rev = "3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48"; - sha256 = "1zb10p6xkls8x7wsdwgy9c0v16z97rfkgidii9ffq5rfczgvrhjh"; + rev = "664b8414f89612f2dfd35a9b679c345aa5389026"; + sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; sourceRoot = "source/src/llvm"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="$INCLUDE_FIX") ''; - buildFlags = [ "clangBasic" "libtapi" ]; + buildFlags = [ "clangBasic" "libtapi" "tapi" ]; - installTargets = [ "install-libtapi" "install-tapi-headers" ]; + installTargets = [ "install-libtapi" "install-tapi-headers" "install-tapi" ]; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libtapi.dylib $out/lib/libtapi.dylib From 34c8fae43997917ee43522f4ab5aedf4855d5349 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 16 Dec 2020 13:59:18 +0900 Subject: [PATCH 162/211] darwin/stdenv: tapi stub based bootstrap Fixes bootstrapping on macOS Big Sur. --- .../Libsystem/reexported_libraries | 41 ----------- .../darwin/darwin-stubs/default.nix | 12 ++-- pkgs/stdenv/darwin/default.nix | 70 +++++++++++++++---- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 3 - pkgs/stdenv/darwin/unpack-bootstrap-tools.sh | 35 ---------- 5 files changed, 61 insertions(+), 100 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries deleted file mode 100644 index edc2e759a29..00000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries +++ /dev/null @@ -1,41 +0,0 @@ -# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine -/usr/lib/system/libcache.dylib -/usr/lib/system/libcommonCrypto.dylib -/usr/lib/system/libcompiler_rt.dylib -/usr/lib/system/libcopyfile.dylib -/usr/lib/system/libcorecrypto.dylib -/usr/lib/system/libdispatch.dylib -/usr/lib/system/libdyld.dylib -/usr/lib/system/libkeymgr.dylib -/usr/lib/system/liblaunch.dylib -/usr/lib/system/libmacho.dylib -/usr/lib/system/libquarantine.dylib -/usr/lib/system/libremovefile.dylib -/usr/lib/system/libsystem_asl.dylib -/usr/lib/system/libsystem_blocks.dylib - -# We handle this specially in the expression -# /usr/lib/system/libsystem_c.dylib - -/usr/lib/system/libsystem_configuration.dylib -/usr/lib/system/libsystem_coreservices.dylib -# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 -/usr/lib/system/libsystem_dnssd.dylib -/usr/lib/system/libsystem_info.dylib - -# We handle this specially in the expression -# /usr/lib/system/libsystem_kernel.dylib - -/usr/lib/system/libsystem_m.dylib -/usr/lib/system/libsystem_malloc.dylib -# /usr/lib/system/libsystem_network.dylib # Removed in 10.14 -/usr/lib/system/libsystem_networkextension.dylib -/usr/lib/system/libsystem_notify.dylib -/usr/lib/system/libsystem_platform.dylib -/usr/lib/system/libsystem_pthread.dylib -/usr/lib/system/libsystem_sandbox.dylib -/usr/lib/system/libsystem_secinit.dylib -/usr/lib/system/libsystem_trace.dylib -/usr/lib/system/libunc.dylib -/usr/lib/system/libunwind.dylib -/usr/lib/system/libxpc.dylib diff --git a/pkgs/os-specific/darwin/darwin-stubs/default.nix b/pkgs/os-specific/darwin/darwin-stubs/default.nix index f7f083e32f4..aa946eb5bf0 100644 --- a/pkgs/os-specific/darwin/darwin-stubs/default.nix +++ b/pkgs/os-specific/darwin/darwin-stubs/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "darwin-stubs"; version = "10.12"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "darwin-stubs"; - rev = "80b3d4a57d3454c975eefd984c804dbd76f04ef2"; - sha256 = "0sslg4rmskms8ixixv1gvnrvvvmn723vbfjj6mcn24fj2ncg38y7"; + src = fetchurl { + url = "https://github.com/NixOS/darwin-stubs/releases/download/v20201216/10.12.tar.gz"; + sha256 = "1fyd3xig7brkzlzp0ql7vyfj5sp8iy56kgp548mvicqdyw92adgm"; }; dontBuild = true; installPhase = '' mkdir $out - cp -vr stubs/$version/* $out + mv * $out ''; } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f07b1ee73b8..ecec2903b5f 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -54,8 +54,6 @@ in rec { args = [ ./unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) mkdir bzip2 cpio tarball; - reexportedLibrariesFile = - ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; __impureHostDeps = commonImpureHostDeps; }; @@ -167,19 +165,57 @@ in rec { stage0 = stageFun 0 null { overrides = self: super: with stage0; { - coreutils = { name = "bootstrap-stage0-coreutils"; outPath = bootstrapTools; }; - gnugrep = { name = "bootstrap-stage0-gnugrep"; outPath = bootstrapTools; }; + coreutils = stdenv.mkDerivation { + name = "bootstrap-stage0-coreutils"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/bin $out/bin + ''; + }; + + gnugrep = stdenv.mkDerivation { + name = "bootstrap-stage0-gnugrep"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/bin $out/bin + ''; + }; darwin = super.darwin // { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' mkdir -p $out - ln -s ${bootstrapTools}/lib $out/lib + + cp -r ${self.darwin.darwin-stubs}/usr/lib $out/lib + chmod -R +w $out/lib + substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system + + ln -s libSystem.B.tbd $out/lib/libSystem.tbd + + for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do + ln -s libSystem.tbd $out/lib/lib$name.tbd + done + + ln -s ${bootstrapTools}/lib/*.o $out/lib + + ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib + ln -s libresolv.9.dylib $out/lib/libresolv.dylib + ln -s ${bootstrapTools}/include-Libsystem $out/include ''; }; - dyld = bootstrapTools; + + darwin-stubs = super.darwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; + + dyld = { + name = "bootstrap-stage0-dyld"; + buildCommand = '' + mkdir -p $out + ln -s ${bootstrapTools}/lib $out/lib + ln -s ${bootstrapTools}/include $out/include + ''; + }; binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) { shell = "${bootstrapTools}/bin/bash"; @@ -194,10 +230,15 @@ in rec { }; llvmPackages_7 = { - clang-unwrapped = { + clang-unwrapped = stdenv.mkDerivation { name = "bootstrap-stage0-clang"; - outPath = bootstrapTools; version = bootstrapClangVersion; + buildCommand = '' + mkdir -p $out/lib + ln -s ${bootstrapTools}/bin $out/bin + ln -s ${bootstrapTools}/lib/clang $out/lib/clang + ln -s ${bootstrapTools}/include $out/include + ''; }; libcxx = stdenv.mkDerivation { @@ -256,6 +297,7 @@ in rec { darwin = super.darwin // { binutils = darwin.binutils.override { + coreutils = self.coreutils; libc = self.darwin.Libsystem; }; }; @@ -268,8 +310,8 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ libcxx libcxxabi llvmPackages_7.compiler-rt ]) ++ - (with pkgs.darwin; [ Libsystem ]); + (with pkgs; [ coreutils gnugrep libcxx libcxxabi llvmPackages_7.clang-unwrapped llvmPackages_7.compiler-rt ]) ++ + (with pkgs.darwin; [ darwin-stubs Libsystem ]); overrides = persistent; }; @@ -318,8 +360,8 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt - zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); @@ -370,8 +412,8 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt - zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld ICU Libsystem locale ]); diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1243b96e505..9824d57dff8 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -180,9 +180,6 @@ in rec { unpack = stdenv.mkDerivation (bootstrapFiles // { name = "unpack"; - reexportedLibrariesFile = - ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; - # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly, # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the # unpack-bootstrap-tools.sh for the next round of bootstrap tools. diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 0da80ec5ce5..37beeaf28f9 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -17,41 +17,6 @@ for i in $out/bin/*; do fi done -install_name_tool \ - -id $out/lib/system/libsystem_c.dylib \ - $out/lib/system/libsystem_c.dylib - -install_name_tool \ - -id $out/lib/system/libsystem_kernel.dylib \ - $out/lib/system/libsystem_kernel.dylib - -# TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! -libs=$(cat $reexportedLibrariesFile | grep -v '^#') - -for i in $libs; do - if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then - args="$args -reexport_library $i" - fi -done - -ld -macosx_version_min 10.7 \ - -arch x86_64 \ - -dylib \ - -o $out/lib/libSystem.B.dylib \ - -compatibility_version 1.0 \ - -current_version 1226.10.1 \ - -reexport_library $out/lib/system/libsystem_c.dylib \ - -reexport_library $out/lib/system/libsystem_kernel.dylib \ - $args - -ln -s libSystem.B.dylib $out/lib/libSystem.dylib - -for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do - ln -s libSystem.dylib $out/lib/lib$name.dylib -done - -ln -s libresolv.9.dylib $out/lib/libresolv.dylib - for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then echo "Patching $i" From 84daff4b8482c3ed5703df995b61d3223240f293 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 16 Dec 2020 17:36:38 +0900 Subject: [PATCH 163/211] Revert "release: disable darwin bootstrapped stdenv test" The bootstrap tools are now aligned. This reverts commit c5b0f56ae4e4ff22ecb56676bc583c6e750a5688. --- pkgs/top-level/release.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cacc77fea30..5fc6e91b311 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -173,13 +173,8 @@ let in { # Lightweight distribution and test inherit (bootstrap) dist test; - # Test a full stdenv bootstrap from the bootstrap tools definition - # Temporarily disabled. The darwin bootstrap is transitioning the - # structure of bootstrap tools. The tools that are generated as - # part of the current package set cannot be unpacked in the same - # way as the tools used by the current package set. - # inherit (bootstrap.test-pkgs) stdenv; + inherit (bootstrap.test-pkgs) stdenv; }; }; From 61a6d1aae2f20ca7e714480907d87c6419ef1e80 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 15 Dec 2020 00:05:57 -0800 Subject: [PATCH 164/211] stdenv: trim random seed to avoid reference cycles Using the full store hash as the random seed occasionally caused reference cycles when the invocation was stored in output artifacts. For example, cross-compiled gcc was failing due to this: https://hydra.nixos.org/eval/1631713#tabs-now-fail Simply truncating the hash is sufficient to avoid this. --- pkgs/build-support/setup-hooks/reproducible-builds.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh index 2d8db6ff7d3..5b01c213fe4 100644 --- a/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -1,4 +1,9 @@ # Use the last part of the out path as hash input for the build. # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. -export NIX_CFLAGS_COMPILE+=" -frandom-seed=${out##*/}" +# We also truncate the hash so that it cannot cause reference cycles. +export NIX_CFLAGS_COMPILE+=" -frandom-seed=$( + outbase="${out##*/}" + randomseed="${outbase:0:10}" + echo $randomseed +)" From 2c19ef2209667bb01c5ae6ecf226a97752d55c52 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 23 Dec 2020 07:33:25 +0100 Subject: [PATCH 165/211] linux: disable module signing Without this, the kernel would generate a random one for us which obviously isn't reproducible. `nix-build -A linux --check` succeeds now! (Tested at different times with different kernel) --- pkgs/os-specific/linux/kernel/common-config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 47e49dbe01d..da719c9de50 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -416,7 +416,10 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" yes; + MODULE_SIG = no; # r13y, generates a random key during build and bakes it in + # Depends on MODULE_SIG and only really helps when you sign your modules + # and enforce signatures which we don't do by default. + SECURITY_LOCKDOWN_LSM = no; } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { # Detect buffer overflows on the stack From c12fdec39d60c59279b78625f8dcfed1e8e1eeff Mon Sep 17 00:00:00 2001 From: sjau Date: Sat, 26 Dec 2020 15:33:06 +0100 Subject: [PATCH 166/211] util-linux: removing symfollow --- pkgs/os-specific/linux/util-linux/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 4f8f7cae7f8..600d10888c5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + # Remove patch below in 2.36.2, see https://github.com/karelzak/util-linux/issues/1193 + (fetchpatch { + url = "https://github.com/karelzak/util-linux/commit/52f730e47869ce630fafb24fd46f755dc7ffc691.patch"; + sha256 = "1fz3p9127lfvmrdj1j1s8jds0jjz2dzkvmia66555ihv7hcfajbg"; + }) ]; outputs = [ "bin" "dev" "out" "man" ]; From 2d0ba1f54b3421e7df79c53098bb006f4b49b93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Thu, 3 Dec 2020 18:21:25 +0900 Subject: [PATCH 167/211] kernel/manual-config: simplify ld-version sed with patchShebangs. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9edc0ced412..d00ad8ee467 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils +, libelf, cpio, elfutils, gawk , writeTextFile }: @@ -120,7 +120,7 @@ let # See also https://kernelnewbies.org/BuildId sed -i Makefile -e 's|--build-id|--build-id=none|' - sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|" + patchShebangs scripts/ld-version.sh ''; postPatch = '' @@ -306,7 +306,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. From 9fee546667db6da9cf896420abddd564ddfae238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Thu, 3 Dec 2020 18:27:03 +0900 Subject: [PATCH 168/211] kernel/manual-config: add zstd to nativeBuildDeps. Required to build with zstd compression. Refs #101108 --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d00ad8ee467..c2f13718308 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, gawk +, libelf, cpio, elfutils, zstd, gawk , writeTextFile }: @@ -306,7 +306,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. From 61bbbcd1af1c3b5a365423f2ecc722a627ff353f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 25 Dec 2020 21:52:42 +0100 Subject: [PATCH 169/211] bintools-wrapper: skip dynamic linker for static binaries --- .../bintools-wrapper/add-flags.sh | 5 ++++ .../bintools-wrapper/default.nix | 21 +++++++---------- .../bintools-wrapper/ld-wrapper.sh | 13 ++++++++++- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 +++++ pkgs/development/compilers/gcc/builder.sh | 5 +++- pkgs/test/cc-wrapper/default.nix | 23 +++++++++++++++---- 6 files changed, 54 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index e99beb38158..3b94daba65d 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -3,6 +3,7 @@ var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC NIX_LDFLAGS NIX_LDFLAGS_BEFORE + NIX_DYNAMIC_LINKER NIX_LDFLAGS_AFTER NIX_LDFLAGS_HARDEN NIX_HARDENING_ENABLE @@ -25,6 +26,10 @@ if [ -e @out@/nix-support/libc-ldflags ]; then NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi +if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/ld-set-dynamic-linker ]; then + NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)" +fi + if [ -e @out@/nix-support/libc-ldflags-before ]; then NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6da0e58436d..bd3ebdf800e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -237,19 +237,14 @@ stdenv.mkDerivation { if [ -n "''${dynamicLinker-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - '' - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - + '' - echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before - '') + '' + ${if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + touch $out/nix-support/ld-set-dynamic-linker + ''} fi '') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 81b5a90edd5..9d02f99851a 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,6 +20,7 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -47,6 +48,11 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else + if [[ "$p" = -static || "$p" = -static-pie ]]; then + # Using a dynamic linker for static binaries can lead to crashes. + # This was observed for rust binaries. + setDynamicLinker=0 + fi rest+=("$p") fi n+=1 @@ -63,6 +69,11 @@ extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then extraAfter+=($NIX_LDFLAGS_@suffixSalt@) extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) + # By adding dynamic linker to extraBefore we allow the users set their + # own dynamic linker as NIX_LD_FLAGS will override earlier set flags + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) @@ -134,7 +145,7 @@ then done fi -if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then +if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 7e734f57773..1450218aff2 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -28,6 +28,7 @@ cc1=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 cInclude=1 +setDynamicLinker=1 expandResponseParams "$@" declare -i n=0 @@ -58,6 +59,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 + elif [[ "$p" = -static || "$p" = -static-pie ]]; then + setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -152,6 +155,9 @@ if [ "$dontLink" != 1 ]; then for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e1c4768413f..7d104b96624 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -37,6 +37,9 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags when linking to pass to the gcc # compilers being generated to make sure that they use our libc. extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) + if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then + extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker) + fi # The path to the Libc binaries such as `crti.o'. libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" @@ -252,7 +255,7 @@ postInstall() { if [[ targetConfig == *"linux"* ]]; then # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. + # RPATH to $out. for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index c0c89d63fff..fae3448c44c 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,11 +1,13 @@ -{ stdenv }: +{ stdenv, glibc }: with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux); + sanitizersWorking = !stdenv.hostPlatform.isMusl && ( + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux) + ); + staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -28,6 +30,19 @@ in stdenv.mkDerivation { ./core-foundation-check ''} + + ${optionalString (!stdenv.isDarwin) '' + printf "checking whether compiler builds valid static C binaries... " >&2 + $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ./cc-static + # our glibc does not have pie enabled yet. + ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + printf "checking whether compiler builds valid static pie C binaries... " >&2 + $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ./cc-static-pie + ''} + ''} + printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h From ea9a94c50d510f1413ca261174a19acc331575b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Dec 2020 01:39:54 +0000 Subject: [PATCH 170/211] gtk-doc: 1.33.0 -> 1.33.1 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 4645c63e71d..10b48d51191 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.33.0"; + version = "1.33.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0="; + sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo="; }; patches = [ From 1a65c5df5f98a63d103977384cdbe12a80379906 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 25 Sep 2020 21:40:10 -0400 Subject: [PATCH 171/211] cpython: fix finding headers when cross-compiling extension modules --- ...finding-headers-when-cross-compiling.patch | 54 ++++++++++++++++ ...finding-headers-when-cross-compiling.patch | 54 ++++++++++++++++ .../interpreters/python/cpython/default.nix | 63 +++++++++++++++++++ .../bootstrapped-pip/default.nix | 2 +- 4 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch create mode 100644 pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch diff --git a/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch b/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch new file mode 100644 index 00000000000..d324d10b39f --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch @@ -0,0 +1,54 @@ +From 45dfbbb4f5b67ab83e4365564ea569334e979f8e Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Fri, 25 Sep 2020 16:49:16 -0400 +Subject: [PATCH] Fix finding headers when cross compiling + +When cross-compiling third-party extensions, get_python_inc() may be called to +return the path to Python's headers. However, it uses the sys.prefix or +sys.exec_prefix of the build Python, which returns incorrect paths when +cross-compiling (paths pointing to build system headers). + +To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can +be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME. +The existing behavior is maintained on non-POSIX platforms or if a prefix is +manually specified. +--- + Lib/distutils/sysconfig.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 2bcd1dd288..567375e488 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -84,8 +84,6 @@ def get_python_inc(plat_specific=0, prefix=None): + If 'prefix' is supplied, use it instead of sys.base_prefix or + sys.base_exec_prefix -- i.e., ignore 'plat_specific'. + """ +- if prefix is None: +- prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if os.name == "posix": + if python_build: + # Assume the executable is in the build directory. The +@@ -98,9 +96,17 @@ def get_python_inc(plat_specific=0, prefix=None): + else: + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) +- python_dir = 'python' + get_python_version() + build_flags +- return os.path.join(prefix, "include", python_dir) ++ if prefix is None: ++ if plat_specific: ++ return get_config_var('CONFINCLUDEPY') ++ else: ++ return get_config_var('INCLUDEPY') ++ else: ++ python_dir = 'python' + get_python_version() + build_flags ++ return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": ++ if prefix is None: ++ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + return os.path.join(prefix, "include") + else: + raise DistutilsPlatformError( +-- +2.28.0 + diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch new file mode 100644 index 00000000000..543e267e94b --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/fix-finding-headers-when-cross-compiling.patch @@ -0,0 +1,54 @@ +From debccd4be0a8d619770f63622d9de1b451dd02ac Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Fri, 25 Sep 2020 16:49:16 -0400 +Subject: [PATCH] Fix finding headers when cross compiling + +When cross-compiling third-party extensions, get_python_inc() may be called to +return the path to Python's headers. However, it uses the sys.prefix or +sys.exec_prefix of the build Python, which returns incorrect paths when +cross-compiling (paths pointing to build system headers). + +To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can +be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME. +The existing behavior is maintained on non-POSIX platforms or if a prefix is +manually specified. +--- + Lib/distutils/sysconfig.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 37feae5df7..6d4ad06696 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -95,8 +95,6 @@ def get_python_inc(plat_specific=0, prefix=None): + If 'prefix' is supplied, use it instead of sys.base_prefix or + sys.base_exec_prefix -- i.e., ignore 'plat_specific'. + """ +- if prefix is None: +- prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if os.name == "posix": + if python_build: + # Assume the executable is in the build directory. The +@@ -109,9 +107,17 @@ def get_python_inc(plat_specific=0, prefix=None): + else: + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) +- python_dir = 'python' + get_python_version() + build_flags +- return os.path.join(prefix, "include", python_dir) ++ if prefix is None: ++ if plat_specific: ++ return get_config_var('CONFINCLUDEPY') ++ else: ++ return get_config_var('INCLUDEPY') ++ else: ++ python_dir = 'python' + get_python_version() + build_flags ++ return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": ++ if prefix is None: ++ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX + if python_build: + # Include both the include and PC dir to ensure we can find + # pyconfig.h +-- +2.28.0 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index c67ede82003..2394e0e259e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -100,6 +100,50 @@ let "$out/bin/python" else pythonForBuild.interpreter; + # The CPython interpreter contains a _sysconfigdata_ + # module that is imported by the sysconfig and distutils.sysconfig modules. + # The sysconfigdata module is generated at build time and contains settings + # required for building Python extension modules, such as include paths and + # other compiler flags. By default, the sysconfigdata module is loaded from + # the currently running interpreter (ie. the build platform interpreter), but + # when cross-compiling we want to load it from the host platform interpreter. + # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. + # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct + # platform suffix on extension modules. The correct values for these variables + # are not documented, and must be derived from the configure script (see links + # below). + sysconfigdataHook = with stdenv.hostPlatform; with passthru; let + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 + # The configure script uses "arm" as the CPU name for all 32-bit ARM + # variants when cross-compiling, but native builds include the version + # suffix, so we do the same. + pythonHostPlatform = "${parsed.kernel.name}-${parsed.cpu.name}"; + + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 + multiarchCpu = + if isAarch32 then + if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" + else if isx86_32 then "i386" + else parsed.cpu.name; + multiarch = + if isDarwin then "darwin" + else "${multiarchCpu}-${parsed.kernel.name}-${parsed.abi.name}"; + + abiFlags = optionalString (isPy36 || isPy37) "m"; + + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 + pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}"; + in '' + sysconfigdataHook() { + if [ "$1" = '${placeholder "out"}' ]; then + export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' + export _PYTHON_SYSCONFIGDATA_NAME='${pythonSysconfigdataName}' + fi + } + + addEnvHooks "$hostOffset" sysconfigdataHook + ''; + in with passthru; stdenv.mkDerivation { pname = "python3"; inherit version; @@ -165,6 +209,13 @@ in with passthru; stdenv.mkDerivation { ] ++ [ # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch + # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. + ( + if isPy36 then + ./3.6/fix-finding-headers-when-cross-compiling.patch + else + ./3.7/fix-finding-headers-when-cross-compiling.patch + ) ] ++ optionals (isPy37 || isPy38) [ # Backport a fix for ctypes.util.find_library. ./3.7/find_library.patch @@ -281,6 +332,10 @@ in with passthru; stdenv.mkDerivation { find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + + # Make the sysconfigdata module accessible on PYTHONPATH + # This allows build Python to import host Python's sysconfigdata + mkdir -p "$out/${sitePackages}" + ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" '' + optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config-* '' + optionalString stripIdlelib '' @@ -313,6 +368,14 @@ in with passthru; stdenv.mkDerivation { export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH ''; + # Add CPython specific setup-hook that configures distutils.sysconfig to + # always load sysconfigdata from host Python. + postFixup = '' + cat << "EOF" >> "$out/nix-support/setup-hook" + ${sysconfigdataHook} + EOF + ''; + # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 9679edd9512..690c88b83f4 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mv wheel* wheel # Set up PYTHONPATH. The above folders need to be on PYTHONPATH # $out is where we are installing to and takes precedence - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel" + export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH" echo "Building setuptools wheel..." pushd setuptools From 9461f0a73432f9d124b96f65884efba788f5c0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Sat, 12 Dec 2020 13:56:33 +0900 Subject: [PATCH 172/211] kernel: use zstd compression on 5.9+. --- pkgs/os-specific/linux/kernel/common-config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 47e49dbe01d..0fb83014662 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -654,7 +654,10 @@ let MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; - KERNEL_XZ = yes; + + # use zstd for kernel compression if newer than 5.9, else xz. + KERNEL_XZ = whenOlder "5.9" yes; + KERNEL_ZSTD = whenAtLeast "5.9" yes; SYSVIPC = yes; # System-V IPC From a6b5693a71fa2b8d8e50621162cd45e27fb0d5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Wed, 16 Dec 2020 12:37:09 +0900 Subject: [PATCH 173/211] nixos/stage-1: set zstd as the default compressor when supported Co-authored-by: Atemu --- nixos/modules/system/boot/stage-1.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 86bfde6349c..1fe1bb14eaf 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -513,7 +513,12 @@ in }; boot.initrd.compressor = mkOption { - default = "gzip"; + default = ( + if lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.9" + then "zstd" + else "gzip" + ); + defaultText = "zstd if the kernel supports it (5.9+), gzip if not."; type = types.unspecified; # We don't have a function type... description = '' The compressor to use on the initrd image. May be any of: From e69bc44dc72dca17994038826c45336c103f2ed8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 28 Dec 2020 16:45:00 +0100 Subject: [PATCH 174/211] dconf: fix cross compilation Vala doesn't yet cross-compile, and gtk-doc uses some gobject-introspection bits (and gobject-introspection doesn't cross-compile either). --- pkgs/development/libraries/dconf/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index c9c1b9be922..993e9b8f053 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -15,12 +15,15 @@ , docbook-xsl-nons , docbook_xml_dtd_42 }: - +let + isCross = (stdenv.hostPlatform != stdenv.buildPlatform); +in stdenv.mkDerivation rec { pname = "dconf"; version = "0.38.0"; - outputs = [ "out" "lib" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" ] + ++ stdenv.lib.optional (!isCross) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -30,27 +33,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala pkg-config python3 libxslt libxml2 glib - gtk-doc docbook-xsl-nons docbook_xml_dtd_42 - ]; + ] ++ stdenv.lib.optional (!isCross) gtk-doc; buildInputs = [ glib bash-completion dbus - ]; + ] ++ stdenv.lib.optional (!isCross) vala; + # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=true" - ]; + "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. + ] ++ stdenv.lib.optional isCross "-Dvapi=false"; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; From 195bb483dd1bb33dbfd223bd084869a82b4b2831 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 28 Dec 2020 17:56:20 +0100 Subject: [PATCH 175/211] dconf: remove libxml2 This doesn't seem to be required anymore (?) --- pkgs/development/libraries/dconf/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 993e9b8f053..4b574a17f78 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -10,7 +10,6 @@ , bash-completion , dbus , gnome3 -, libxml2 , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { pkg-config python3 libxslt - libxml2 glib docbook-xsl-nons docbook_xml_dtd_42 From eab1bfbc21a97f61d19f08f23b31e66763e34e28 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Mon, 28 Dec 2020 00:12:04 -0800 Subject: [PATCH 176/211] python3Packages.pyparsing: 2.4.6 -> 2.4.7 --- 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 4acc4fa804b..5ecfdfb8883 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "1fh7s3cfr274pd6hh6zygl99842rqws98an2nkrrqj2spb9ldxcm"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; }; # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 From 63484ff09deb283664cb4d08dea18f49d994ff14 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 28 Dec 2020 20:15:40 +0100 Subject: [PATCH 177/211] python3Packages.pytest: remove unreproducible test artifacts from output Running the tests produced some unreproducible artifacts from the output directory. This cleans them up afterwards. --- pkgs/development/python-modules/pytest/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 93282218871..e0648285810 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -58,6 +58,12 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + + # tests leave behind unreproducible pytest binaries in the output directory, remove: + find $out/lib -name "*-pytest-${version}.pyc" -delete + # specifically testing/test_assertion.py and testing/test_assertrewrite.py leave behind those: + find $out/lib -name "*opt-2.pyc" -delete + runHook postCheck ''; From 9e043f4944e0c84c2457b4463ef11e473ad49649 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 8 Sep 2020 11:23:47 +0200 Subject: [PATCH 178/211] gnome-2.gnome_mime_data: Move intltool to nativeBuildInputs --- pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index e50ddeb9411..d5af0e362b4 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; - buildInputs = [ intltool ]; + nativeBuildInputs = [ intltool ]; } From 61ae600daf934e7d8d91453061c7b565eca73f99 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 29 Dec 2020 11:19:28 +0100 Subject: [PATCH 179/211] git: 2.29.2 -> 2.30.0 (#107828) The removed patch was merged into Git 2.30: https://github.com/git/git/commit/3569e11d6999cf18549626356784c9fd74f3d43e And the disabled test is new in Git 2.30. --- .../version-management/git-and-tools/git/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 57f6703762d..8c7f323cbb6 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -23,7 +23,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.2"; + version = "2.30.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; + sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; @@ -52,12 +52,6 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch - (fetchpatch { - # https://github.com/git/git/pull/925 - name = "make-manual-reproducible.patch"; - url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; - sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; - }) ]; postPatch = '' @@ -298,6 +292,7 @@ stdenv.mkDerivation { disable_test t0001-init shared disable_test t1301-shared-repo disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' + disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks From 1d83fc2aacd352836e2f4539a97089571b54f3b8 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Mon, 28 Dec 2020 08:09:57 -0800 Subject: [PATCH 180/211] bash-completion: fix build on darwin (#107768) --- pkgs/shells/bash/bash-completion/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 5fda5704812..4599b0a2283 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchurl , fetchpatch , autoreconfHook , perl @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; version = "2.11"; - src = fetchFromGitHub { - owner = "scop"; - repo = "bash-completion"; - rev = version; - sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; + # Using fetchurl because fetchGithub or fetchzip will have trouble on + # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the + # test fixtures that are part of the repository. + # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 + src = fetchurl { + url = "https://github.com/scop/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "1b0iz7da1sgifx1a5wdyx1kxbzys53v0kyk8nhxfipllmm5qka3k"; }; nativeBuildInputs = [ autoreconfHook ]; From 4e70a418c7a8b47456f124c368d4630447c77595 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 29 Dec 2020 21:41:01 +0100 Subject: [PATCH 181/211] tzdata: 2020c -> 2020f --- pkgs/data/misc/tzdata/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 5065e3718cb..fa7100501ad 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020c"; + version = "2020f"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; + sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; + sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; }) ]; @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; + changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; From 1f405c91911a7a16b09a528cb0a0617e0101b494 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Dec 2020 09:36:51 +0100 Subject: [PATCH 182/211] python3Packages.psutil: 5.7.3 -> 5.8.0 --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 2d9f0a9440d..6760ff168e5 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.7.3"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2"; + sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; }; # arch doesn't report frequency is the same way From da806f3f7b76ad7b5d327c1053156fc46d067844 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 30 Dec 2020 17:51:55 +0000 Subject: [PATCH 183/211] linuxHeaders: 5.9.8 -> 5.10.4 --- pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 284ef472d04..cadf65a7220 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.9.8"; in + linuxHeaders = let version = "5.10.4"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn"; + sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms From 899354d2c86cd44494f4ca469d9367d1a75b16e9 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 8 Dec 2020 05:06:47 +0000 Subject: [PATCH 184/211] glibc: 2.32-10 -> 2.32-24 https://sourceware.org/glibc/wiki/Release https://sourceware.org/git/?p=glibc.git;a=log;h=refs/heads/release/2.32/master --- .../{2.32-10.patch.gz => 2.32-24.patch.gz} | Bin 24498 -> 41579 bytes pkgs/development/libraries/glibc/common.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/glibc/{2.32-10.patch.gz => 2.32-24.patch.gz} (52%) diff --git a/pkgs/development/libraries/glibc/2.32-10.patch.gz b/pkgs/development/libraries/glibc/2.32-24.patch.gz similarity index 52% rename from pkgs/development/libraries/glibc/2.32-10.patch.gz rename to pkgs/development/libraries/glibc/2.32-24.patch.gz index 6141f08efadb0cecc27bc54baedfa5f7027d0add..e63bd42ed980a33a292252e5ad0fd2879740043d 100644 GIT binary patch delta 19835 zcmV)1K+V6hzX9vS0Ue}Q4ZQ!bhTkptdo z2^XU-pfeouAw|gqO8JO@E-VyjLyB%@;n%eA2g<#qqg~Z{G3w#L0GkHm)pz|*z-;NR zxH)DEvm`C0e*C4Fts2bAb3(_7!TgHCPPgBQq9_b~zlU6Q&x?n>D2n4=Cmim^ta7x< zhSx`q*YC%%(*Uz#e{eyC4>%aJx;74F-4G6C?ZTlHchy%ff^m*7s@6AB*PxyDmt9}wRr(6Z*q6gw@qnn^yH-h*NfiWLKk(vCV%woR z^89e<`3-q1omIWG>SQRbeZ)e)hQHko(+GT5aX2(P8~lOhe{bl9@He122uhHftR2i0 z@5Ri;?HP-gjS0X(OBkKjzp15Ui(Q{1w)s^K$bQLhO5d^`aE@U6N>a{PE6(Yk#U5;y3Uq@-3xlwr3a9|hr&pDjuSmD^J~uwit&JkXip8?|hxjMeSWOgvQa z9#xL5U9wTz0Oa^?*4_{fYUdf*6OhIn{nD${qm;+Kf9Q@@)Q!*`BXv`Br`vW$V5arG z=pb~*e4~l(1VICIr)W0c;X8Nu&KhIJ#hCU zf<4eHO~D>zA;>(EFK^OZ{xQKG6s5z!9&;a0CVYdZfh*u*Jv0A18y5e27(j#lW-iK9 zZD{lAf6sP`Mp+oO6b+L&Lek_E4LnQdIN-l$FI&ouKa8G%2hY!cq0G)-z0N@yddXW> zx$yh#n>Q!=P49j@*&CZ-WQMZa1Dl~8Yub&)1`^4kT8P}?m93-<-n=<3=BsQYz9)z+ z6~NdQzI?Wwgh45{E^B!ew~|-U+Xt81;gzB`e`yY|Fdsz_%YFchTEeu%R56z{>mU{x zsrx`I+EV?6}7kt4VjXtZKUBb0Rx*&(#4PCd|Rn6%PSAsx&x({Qn%Q;a?ql44y4 zNx3BeC5KKx0{y`6jYd)I-T^3|7l2X$nCy+D9ht?;k!C&PCBiIROm)6q++CaFWKw~si+(%KoS4W35~QG zQb`YkRQOZ`y*?VEfbOu|>g={Xcm@5;Hk`$5=^A9ANn;gomh?7o7AGM6=wcw2>xmNy z6wLi#;60*M<)Um9qo=5#e<)Rfgj4{Pn-_a7h_&a*28ruP-jL-?s-UN=mi&Y~6H4gyc_uNEqyRePknSb8A5JFEw%%0eQ}xY5LkAVtE)M~plzDat_yo_s zIKl8i$EO59$!a`;e@`XeWDONXKjsU9hoB!MI=(FQ4RPlJdu6$v(IMy1%w3;uv5}pB z%dVpE+?HfK#+7leQVuUzX?GyJ8TPrB+Y1}Ti7I+PC2;*f73ax38rH_k|i+vwP+5! z$#^=cj;Dh;qrC7sto3Mc{@vj1i`TEt|NDy(+J;kYZS=~AtC)vdjNX$@mEh;h(}Egr zTL7QqjQ~FBbcbv;3E-1f1n?1pA=itI7$lxH=`DC>^2wXC*8`YnXrbZk9scBOVKD!o zmpQh#_yNG0@adxP-WfeL5Fdfc8Nw9)f3l9wxy}AB@4R>k%OO;47F<3>p zhUMqeYUy4cQiTijjZ71N7FaDdD4MntBrU^UY*#dH=o0KjvhZ6z7oN>=uU_ximbc78 zrH5POm&q}j6&vB&!lYewFms~!AJ9AjFOmJ*Ol|2Je`Y6)FKi2Ck+2)KRsXKA}u2x91$&}h?$F49{0VpBD(rE;nXW0YPqj1kFRt1P!Wf(w!0x5^`7 z_d~^qe?;kC5s3=6av>_wb%`w*D|?0`I{q@k5jCK-a`R1v7&_h=m1x@|w-A-ckZ|>u zCxzDENoy5krx=*1*3I2%r`;5-m2};(H;Q|sFdmNJXOxWkcxck7@420z6Ait-(@8>4 z(^_vsQoYt`^g2ls5XleLKNoz>o<~ z6s`4BLaTl-cY<6+>q)52RUHhFjp6nj%;vL!teQ*)s}z)Y3i4jWj~YBcC$}!AbZR$2 z7ks*$EBh2FNHQTJ|Ny9a^L0N(#;>RF*73IF7(h&6r+We|=bt zQ3=bc8uY~nrVXPNjCS=b^p4pG%G}A!y6P1TsqSbl+#*sLoJ~tFsz)K7e$G-~d=*xk zib8`y*7qnQ>K2x290%6BE5r&zG^sM0S?MN2E~@=UBM?*D`hK1=Exv8frM35F^hl$LTA*(30xPN&;e@6HsvoD~= z>!CfKKLKUZJ97F*j(0ReHimP1f@Oj6%_T`h)v<|W7JM?#XuHXG94t`Bfo2sPFH|eY zJo*x;!fa#A@Va?9*MtYfbPf$Z8NWwyz_rgPS}*e!%>zinGa;EgFil;Kv6oN`F6Q&N zkTWERmg5x;s}j_z7*d>Df3{32xF5$mPK3>3_bzeaRq2{I8HF(Z_3}S10l{2;LHVw6 zzve2%DS(FbRXAH^THDgFQA2Vb@vK0NSkSR3>s$1ct!n}`T|@JN#N)<;+KQ0srS$zs zf?~FS7UG(KCcZ?^Noy!`RVy6gtcPCMV!gzP%xF0EhqfZe=pU%9e_LqACsZl2%cCu+ zxu{RnI?Bbs_*LcOyp>&fi%y|#dvpvn{NuWOjMqw8m8_(*@$c9Z zU=Y9nq>eHpO7gyMR|lQc^By(17OtVup<3N@G!Gj1vX@c#FH#5&u!2EO$L&Qzh5qAw=v z*wCCYZDAutK35Z04D&vi+N4mVEoFcB-q)bF7n3k5*?k++e;aCi)dcX9R01w9%%|WM zK?W-vKcu6zB`O+=bYVrMXdc6(acR^+bx`S9as)T^wVY{>U0i;@@V&IFGj8{~lpeb8 zh}iw-2o;l1RAV5ev1$Mq?QAxd#N*`>&7?A0X=HV`V zRDn~SP&ySOl}ACi0Bs6N9hZLCy9Nb%nTWw+&e$ra6@AQ?fM!F92P+t)4)w0pJ1X1B zn(e|j<@TNAw3@F_n#v{9?zvQ6O;edz{A!9QI77x@f6NR^Tio_admAkF@dB>N82JxT z4!E%hQ$C;U{NnWAd2RG+7#d$>YK_rEQ~19{i)X`Rb%nDPx;&Hxx|J>QY^VfcBui$+ z@=y~HTLZ%vY!mB;m!wu;lz7%D{kE;2wL1gVH0sB-hq7G46Ry`W9yYR)SLx!Qx{yq0 zTOCUfe~wnP@~I|!-N;CFC{vb9?`b%u&v-U+K&t^kavbmI^^5OZcy+c4aXS}3Akd7C zb{4Q)$qP7;tTPi$FEyz6V^e`9tw3Dx*cDsnSdCZEES-u5*gyvk~?P|qhexLNM*=N@^&>9 zpg$onurSY}B?zEJ|KSFS?(VTLwP^A;vCBKkOHUkbBt7@_TE557gm};dZTYe@2#bXnKc^qijZ=BW*?is6+8;4y1SVnQRkG zu#sRPDfu5D4ABBwUjjQPR~0Qfz98Q?ZKptBSJdBo8`j{S+Kf8?at>Har@W+ztuzML zG_P`1P!F9T!{_A9JK*a*(j<6_S<3`jC#X!a;8{N7-2u{ML4&HFUi4b0jmi(re*$eo zg}C?JVf&Kad_D2prk}`n?iu1NtIm2P{*lS)aGOZ0YHEh6@CH8HA&Sc#wahFF(O^5SsYCZzFP+Vy0m@dF)1} z?Wg`X6FE)t>gJEl0;jxIOA+^DVTlJ1M5mJ_m*U|=kP*7#2Vq{C=#9gbN$R}A=K}gQ z;5l77yJ(h@i+qg*#puRtf8^0*1lr0&sB&oy)j_j|!g0{2e#hNQq zkJOIw?3{!papz7ch~Z(!R338?G;9Y$Bk;qvw}YcPgNHaR9+DJ6e>_&OI+AdJkv>YO zJEC#fWinnBD4qb_LBR!R3H2lWruuhuTL;HPl=#pGn)$h@Efd*-e}%wy*S9*0z;eX9 z!1zGI_&~zA#znJ;kHJg$<8Y>{NsOXYsxMwjKXRt-e3ZK_ckN-i0iS>|Ov&|W7W4u-Bb9GGc3h=*Q2 zG(9gc^TY~lCo1KV&!BsalR~_V&aXfykw1+o{QN0eOzINJ+lv)TB(|`Ihn{z6T1q0Z z)G1bkXf<#-=fIP<;iE@qC%+8b@cpB+XOCXK4PT$USxY)Fe+>K&bz7t2Ygk(z&-CFRT)s5p?@$EY9$3ASlOU@F9$ z_osABU6khFKQfZo#@Y0o$YA5x1r7J{h-C@+#&R~NB7In*ay)=6F+y#;z{4>)WOU6J9f3b6{m1?&Lc9Iws=E&pyI`=0099$tMifAkTvqtpe2j)71`fcB|9%p)&0 z^UUpT;HeTfe@w@HL9G+r3m2Ke;yg9Ex%`(H(sba6&kK!SOvwgXh8F* z>J8Ek>4Q5PfLV_Xyrvt)Qn>yN5ajLiH&0IAoYc`nUtKiFhJib9&BU?YGNps8&&rQ{nM zh#~a6BQea<+)0Bx9b|b1a7-g-7~7FMFf#yaU`Bxn{6BK9PhV1|EHR7}TJT+WV8=V8 zFYzdSiFeD}X#T&a?BFCOur41;JbE!=f1R@hmoV^zT&w92lQ=e>LIH9CAII~fU9Y84 zOoHAu-n6g}`9$$3&k3B&N-W~JxXW+cj-f25;g z^3Ks}#3*En=V!EDPhYdRoaCbrB}eOV0pMtI36leEJPg_-9HUUXA{G2Uj zAxMr=atDm7Ug-96HtnA$3E9v_V-yQJ$v8s67M5#1gDn%omSAIcS%*kwe~P{uEJ9AA z;`ddyKu<3ald(O|FwudNLSwr`Rph~5#cyK6II9lPv^bpD3j@jU#6f%gNQV|a)*^n# z*w*YG7VRGw6voU7i4;NbRDitqFh4Y#K+rcOVowMpdb7!hjBadrM5}2Ts2dgN>WWEm z67(LME=OZ&s!Kr1MhS<#e`5%i6wt&Dm**f+01*kFzB+r00Z=lCtE;(?%mPOf$I(uh zY*iS{&m)fah5GSK&KFlpt{b_3%^5;DERwc!N*CE_=|(2kvnSF8s0-|Rj#~#`LG`;} zSH{*=qPU`6G80iwPrWv5aFxpnjjS3bZpl3Re^ut0Cic*cE!P?h z2E)N1_A}6ogTPLGf0#LmnRuCN#aX(hLXaE5kEjL7?_rLoOvry&iP%~}bJ`#^VfV(i zVI+R)n4T5oO(Wg*h9srlUWqQZB)5qJ+a^Ti$dguq0#GgAMOL)D8egV*RR1 zeHYEXriviMVz9~Ge=z*{<-3#c_1Wp!>EA`i>!Aj~Yo2Dw7-h+}_3x3uFT_5VvrTA;shUkS!*=7jLoJ#e#V6$``UqSqWND|l$UJ2~ki6(mbY_6g8OpQeyVR;D*BjWLoMz+V1@ znc;xKNlk~7Dq>oFOtvC*!OiH?)KV2ngmWy#fnsD} zvN$pm5br(TxBVzjeK)p2#JA&NoJ5{&`FY?*k!9XeIJj7maNq%9I<(D0$KEa+;MT62 z??9h~?J6zo94b1!LQ+onz;3ZJR|n>oKpxSb&gMq4f9XVK7kzLm-FMt5OM)TD$6n-H zfjzJSA7redmFGcV`c|6f{xAycCf!dn&}6C!`RWCVu15ni9Y*;uG7Qsn23eX~{;*Eh z8!s{)Zxj-7K!NnYlVYjzTf-Ck7&Jqm9zQ9YzDjWUy=-|5Wg@c zOh)`ue~(B{#gY&eEukq0{!n%Pqr)0aA7kA6YDlnU+KR>Dadk}_9fat+Iabl9>uX9-;N%tSAE@+Or(`MhkT7EEf)VQIY8yI@J(DL8i+T-5Pj;vg_Jb z8ZS`8#AE*}@**V_6dqH8w+7C#q*Dv&T(|<+0U= z8lj94nD7*Plprv=a_KQZm{py5Hp4&ye{_GJL?1Kl0j^+Q)Pau+i~2G)GJ|=aQ^+0k zbdI^2q-KQnF?4gkOtSe>Wv%86*{b;}CIcKsOX)fZRg#Mt9xB0{*!gUR5G-bfsKcLH z*pSAF@vV+s%6Tzr9fQUVnt>kqQR6rJwjiJiym*}OkIf5Ndmm-{Y_W|N6s!&ae}O&1 z8alP2d)P{>ZklQH7}H*hZ2}bQY81f4qw+gau{XTS(oFk{a`{M04aUz;yOu*XNg8ey0xquK=q7tdX(LTOF&u;oM**DimCvGr0 zYNFOW9h+YVf(`9&p4#=}-rOV`n3PE!K$(JUeaQ^FXQ9_D#YlogASv}C!)dXcJws+)y(Z+z%QrF` z3NE$W5Ho&l215(3*YsPz-2%>tgLZe7-&cMl| zC{NQoFbvo7Tz}wre^&DhwfU+v$v2D1pNEdf;eWc}V?2swt=l<88&^2g1r~tW&G6iv- zA2}#B{>vPNDky6O^tA(HhvwaD@0vC_4}h{d?!b=P(4LXm%ZvM%UiCUM zDl@KL*Hp5+Y-HTrSd{~IfcjrfD4zkQsQjG4Ds<$dE{DXaQ%EiZ0e^YP$8_se@tBMY z`VSL8!09rSf6+hXWeW8~TN`Ru2Gw38eSkOmRJYTjise++v8ClQUD?6DH8dJcnOcVSB4R=|0|- z_Z7J=D(46M!5Fb&J<6qy8>`F*3u|v~-Gfym+OU^z+zvx^iDu8m48)umw(D#%m*L(a zg9yYiY>;8dO~(=zgMme+MEV?Z$|W?;gdFr3f3DJbD1%}{OoGuE6PXY0&*ITA`NRFa zR#LbxzW==9#9cjcc7nI#e4mO=PIqhkfB5|h{&oK~-S6oPDs@6y#V?`9OJ5m-e|0{{ z`1%c$85Y5~Su?Hk*nJJlKeD6W2BszK_8Bt*w`U`<3jCg9{kw4k-o+Cs*b$V}h(r0e z%m(SOe1&v?@8#HWdBs|LRZxA=R~<6r#0&f~%IU1v>Zlrbsh&S*X|_b9vK3Rmf6Yf5 z%^LmV^@fh57l5c<0z#>)$QoVn;jaqFrfW~=lpNc`bekl6bKpV+w<#)PmVC^Xl)k7k zCmhIfCOSk}cxj4Xt4s93;1_X~Tepiw=AN1uN(pT>by|36kfI_nEj+Ok#V)!4TeAYo z^*d+ya+15p;`H&OCr?YeNRyo6e>iZ+njUs_#ARQI4U9il28V6Zfo!RE&j-mU8)S=e zBs-h7wn}@uNI4s>p}I?Y1@KA9tG1y1!44>Yu!imjD){w!G(V`{bMuubez1n#m1}Jj zZu6`$HMz!cD%y=?HNmqgeB!#U z78xKSN}(0#whEA1J6f-(Wy$K#dc}rRsk?3!FDoJ@?)iH8CMmO&G=;dOv{@3xPF*Wq zH<<3!R|))`WzkJtD*Uf3f8BLb>a8Tzz!{*V8n{85q`C=7%fC;H(K7oZ%vTsT+|k39 zyOimGQeI&Qc3oyrGy!kmASx7MG83kr^t%$bvW?5MajjNPBeeF|Fc($irg9*anacYp zt~C-}Y%t^~KbpbNw*q$%M5bXR?jX$^JI~$gjYJn)j6@ge(BAgwf7ITg_^dkC;zpuW z6MOPWJjmH$uxSm6rbH-F`=pX^pswAt$ zf^0CZdU1+;~wRfExrnK%?H-?V1=g5fq9_CQNkaw26 zQf2lLZ?$A%zK!_Ge+aW{4NWadEX(h5wn7HF)md6qoM>fs^~)vOx^1^#9jR-vt2CJk zY5&1qKU%kTXuJ{lt%@VB7qfJQ_b^2w&9ZsTG%W$uy3}oFnY%cJ>?rbe)zzAKb|LS# zfsw&bp2`4sRTVQcu={xphZO&3nS}gfFQWN8!=Q!<2PBQJf8@+){cdN>?$*%0zUNd1 zYP{1EC$CzPeo5qHR5~Z^Rq3Q?lV`S|wxpJn(Cyn0fc|y@&~GCE{XLLOR}@tJ=blpB zUdZ&il{{>v2UbzJNl6}BQPzb|v&F|U?~UdAlr|vgfA3-@@<_{wyeXS4OYv$)^L~iu7&k)1Mf5BZ&AkiGLp@imQyDBVh2hV6vbjK73 z#kFF7jyN@#x?o*Qpe}l#IixFkV>Q?Uy9xU=1R5#5b!Z5$*x;GijOil)l<-dDg|B~N zvtN%}1;T#ZZlqT94g;~-OdnNP>*z&%rn{c^bFR!@&f~QLu6?^n)0#19nsJqDt}|P{ ze}_rKCB3#~#MQk}`S_$iG{jt7Q^5KhPX>wF0ugdEr$ud`77ek48_$uoZEGB7!ph() zwx3)$okM~q*lQDSL2SwOr6KZ!q{D>lv}d~Z1t()o;t)r-3e>2zB?< zDN@Ki(I|cu%+&c3R1Cv9AI64VQ*bg-e+!thAz1|HCSi`2?vUiyUw~NpU@&gWjTgqL zBCl0ZIKiCKTCz$AR#uhNe)t6UePgx#@0|6izR#jcJCafq71HGdC#Lh})N!LN2K^mQ zO9nPx!B`hS8Uz!1DG{p2K5W&3nh%OYAu^~raA6QQ)SGIrqX|LetgzKcin)4qf43yY zJ+7NH5TdM5)EWMVW zm!@2ECrV$t@(7k5BO2KoS$cUU5pnl5_0wg5%METWKV4p3VSTQ?CBw+b`Q`IiBFG1Z z0X*5fL}WjNQzvM}{UF^uzYS7Ke`oNCYvQmnHeKHD=^8@?nUzLFtToi{0!7c)$nD^d z7h4@Iu7m0vzQPx))!*BDY>any1GalycR`w85ovy;MIDrXlL+-24)mj1e~AK@Q9ZS> z2P8fLKOCz4b@}!ILb~)XiT$$Yvx}8OsA=tf0@cvGbeXs zgmz<6yV?!K4O0$H3|u>Kw-jA8ffI`7IyURgh$4;F7Vv+2!M=yj5!(D04Cy}xg(a{b zi7$*mqGqOydn}P6)e((=W@4Yn%!E|17y6Q=n}F06WNXx@3i|wY^YFBsn^DtX;?-ft z;5*mCnJZG#qesVss{Ymne}wMl&OQv1f4nVllHd$zMEq?y1J)@i?5Z^<6SyFcp%d7q zymwE-y)ry&e`_Dncg&N75)TS>qXjt;`db}JD;E4arAGYnGpgT{1PfsJ+N4hpCfzUb zgZWi-B&i|F9F=Ep(5;p*+PpE>FBI?A=f%9bbPx4t=mF63aqhnte-=5NHg{GRh4l0O zlG&X3Q8D8OdvzynuU~h1bY9ETK|^)AGwqdnif0<7Ifl)xjd~Ut*sGv5gB$Yo%ZBldQn&rCIb$I`Ugy%Gj6rv zNyp={>AUychBZy$Ej+LC4K`_afO`HH`|(FjSM zs!&5p)j46HP>S9Y$Uss#r7mqC;xP8LA4JuiplV!Ek^R&F$Q{q3#;O8LQ+K2krj)xp zt?OFuT@xhxUgOcW@@NlXvZ0$kflnLwtTriDI?>-pe@kZ<7SC&$r(DrtCIi4!(dppN zd@4) zVU|4(E(SyU)R=m9$dlrfYx~V7p50@OQ428h8EQz?1(Km>)uD=V$c)* zf5nb`7)#X6v@U)`Wc00CvspL1T=;MZOo=;Ls!@|G7wsa;ZZNF}XfCemQV~lp@>U*A z{a!E^7lrc=WP%-VtwQBQe0&A(xzdn!*j2MXW33+-PDG|R3=Kv@%M5t{JlrsSK%P;R z9zcWBZ0+M|i)Qe$E|M47J~fR&k9^Prf2rYFOtd-3xUUXfkei}Yju%R>Pyob$Sgngw ztS1RbH)~rx#qdS91{)BKLr}kj(IIKN%oc2MfgW&MLM|R+CGe2q6d)=FxGmR*aw?}v zj?NS9GNu|+M+>Zwlgey*tD+WC(%a1rS+s^~Q{YzG6uwKF@X>is5TbzY@fs~xf1#0M zOOL&@g?&CEVQ0#B>N{LW0T`u(Y!U%ihPl#KfWPPq$&n(O?>sMl4XD;MFu%dSuq9pX zy^|Dv48Y;Vq-@*)n0=;CpP5S^FEJDR^OG)6Bf9N7Fkmfm`q+`U3y}|Np#Q-)q7!5dK%fU}9+*Mx<=Q9twNj zUb-idQdHa`&ZP?#rDdr6diw;MwzFf0-Z`T#D%p z$uEX~T9@KhiC1XtGTd-b>eq;Q)e=`;9iTb@ZL3p#;}%pweLtr3{?K*G?%H2M2X5p# z=jL@s9e&|0kLpC2D?DM;Qi=T!$R_6DLl~6x4a$YVeqtf+CLUW*vj--2bf$n~2+}2r z+0yo%u;0f##3obXqc|ybe?ODllz=GRojYf*QdDWHd-r~L(=n7FI`-D(P3m;e*5{X} zs;lCbNGSPr3=~qKDdpvca2ne;9kBG8zWlV)^Qm z4}^Gzfl7Ybe06nGF4kaXu@Mg#%YO2Xx%rW5>t8e;8BA##E-qbdeM4WjCVcKdfEN zZo)7OewA_9jqL@{e=fYpv`JJ#6{8w34tx2BL{2eLYPlv|R z(u*0q|N49Rv}Ra=`m~K_?YnSkHT3?6i;)!#3ek_7bmSt}EMbAos%JP01y>Dbd^B80 zA{E4N)I^6gsrbGYltyFv2VGQ9K&@Z=03?_P27ay=@VGFo59U@^kdY!5tO_kKe=UE$ z7d@ktyerJ6f4N1MwOVEaBwIaFb+(8uv46i)+uuzYqHL2-d;+xeeP?zVZf;jE%&~+V zu&i4TOZM}$!tFtAVAmBmDzJ)?LV*|`8Uy(oobD`z+eIOb`>A=~;A9buNNdb#Yq0Jy zVu`B~m7%?kNE5NPb^)yWT#A?$ah^_Xldf3Rz}^(()n@Vj$$SQ7|DCCM#3 zSd`sPz@*d!ig|yA&C}&%)P(pl(A#`H25Jpr=?Y~=Bph0ba)?uYlTglwN#Alwm8e~v zuEXE5k_i2d*vG|lI|J5Kg?Y_4#F@DJqrt>QV}E)D-u@#F)>sf5Cc%r zfswnDe`nYEr<4W30;GxKxOU>$u@m!3fl~7zv6j;kMBiu1KYRY;-Z`GpY1IX z@7a)p>%L&ifA9y?Egv%u)yQ$s;mW<^4g);aL`7u4k-_AO+)k;NKHMR_G&e_Ujj zDpkPu&kkl`yHc__lHKEc>z|Cx+JnULdl+02e>oj0X~e;Bu7{k)N*psNTN!=Qnkw^o zSbas-43>^8dgaXp`NWvIY4QWKkwmJ4>JbK8_3E@yWY1-rX|LFE4(Iay%H&&65SZmI zoK&r$xYh)hHf8inyDb>G*;7! zY4ZjE0RR8AT}zLfFc7}?SD>CEfg%hEe=THNsfYI1OAkG+U<1)=lOS!P%$OqsV@i1vZg3NVHD2rH;v|KI&c$NQ<~tRO?SKL; zA;m-GS+0y%z*t2PiU(%1?+ZET^s#jjdBQ)(-_#eaFQ?jGnH}H zNETG(d7?`cJ$+KQ^+^pGmYp3q>sH?Q6ug$&%9$p<9EHc_o$5V>=N4cgUdQWXt>%T! zSpn39C;%=5Ws|Z0l*bi~=P0t$64Nm9;jr}WKaV+yV^!>{k45osN9`6gfAXyE&12{9 zWpsMTHu#G7l!+L4zH|c4IFz>Ecj3M@*dufwk59}r*d*oU)#;}ww<1b_>Beex6-R}Y zA*V4-F^dE)6EDFV4+&)Gl@*3f1hVx>Z+Af$vXqQ-!nOOck#cn(n?{3@yC8w4vdn62 zJ{oF5LwRVZISo-r_9MQXe+e&;F7(^P4LOu((9y|3h=wnreGt=nY7s2bSk)xXlnjBg zTF)oEY!q=CGv8g0I(qnQ6HB)bX_n+^6K5axN!h5Z-qcmz=D2`2z!%4WfsFfU7qGov@TlNe+OrqAW9;E4dTc{ zoa66SUL-|HPLRn`Rpwg2Iym$X<&hvyI%6P(%Vb~hl-C_ZI_dUA=r51@iDd%LbA$9X z^j80>0f*((Z(kk!Ic;NLw9{xQHNh2FC~Ybg-)s5@00960v|US&+At8l@2{|Ws9>cH zIL3L<9;zbfrR||=f7N5;BsPr%0g;Aw5B=|*89Uwpn+jU>M8L_!c*f(`eBWRm+RCC` zx0F)SToS)ncp^?4DSpzJs&Lo=N`M&jAh;`nyxs_9rCvljBN_h+2!1iX4r!YwxfHn& ziGgaRTqjYw>WJn;)v%!R2H8gatl3h78co%d&Z}+z&>eh7+8wEe=?23vuE0_;%gyNlbf3ujQu(s|2*Ig&931C|8?Hw%- z#g>AdfbDDvl6~j5Us3KF@zuD|tU7`$mvDReeg!tQ0sma(E+`CLgGN3q65*@q=~*`= zLO0PmQ7Bwb;B#+n3%|WAsKVIJ?Ve=VShFX=9X<};-|byG&eHB3)@k3liAuf3|KJ$J zp{V-ae+=v01lSjVd@&0cB00960 z0yb~UKxYvf;+8Ukp2Q6-$sM5QM0h&tnwcm#I(aG-gO)r400030|D;`8Z__Xoe&<*C ze{n@ho95Njk0{)|zQsZW;5arp#e33sv|fdFcIN@Y zgTTEP71%Gh#(l2`Ys4lw#u(ALAsXS5f0T01AqMFWy`1RZ25c45K9go~9!G;SJv&9Y1V8u~!T|M2X(veRA0 z51zQV@WgAI6h6G{WMW3+kyo<|{4@QydUvu`IGecxVqRBp@%FDUf7_ul zM(DD=FTu!ezhWeS>{S#d9jqfworbRt#g3x zKR|50t191Ylz5};chd*{4&$rZ*H|a>9N9gX^@NwMdl>|b?2hYOWM5+wDEAYHV%Leq zmWh2)?F4X$$v}&KS29xK z>n?DrJujEVCjm(fw(_`q&&~FQDno-*`rQk~Ctl<;P;09(?deSq8gWLE}uPgCIbsKm}M5%5zs)ONu0DmiO zXhC>UlA01uTxb@<;wgByWz%#xhLn#ac@X&$DId`n?_r4L5|lwWz>3l& zy(rDLS)nLRuYAMxK+7Bc$0QY2YJacQDmN#`q5o4TWPVWqtfOS=&cWeGmy{HLG5bX} z0;Ypcni5&vj;eHwvQOfBRw4(i`V$g1FdZOfwW12)U5%u@*HCTD_SYFQzNYOo@>0~_ zdL_QuQbgZ-rm8mBp3bfL^=_xfe?Pa9RnD~+=lNXyV-v;EHijD3CjbBd|9}4i?_Wh^ z5}Y2%A>ff5I(Q_9Vvhi;;R+C^Odnjl5R4(B)D!K|)YQZ@L(@dlM7$m)&Q3IsW6?xv zK;)1Z5IF-75IK|t1mc)b0|Q{o-_Rf_)iA{{4cMzT1Qx-DW)^8cY?_#2l4faYVUS{k zsGp0nO7j$gf&HiK#3ImUQ-2^AZ$H}vGz4jAX=QAI(ap{T)(~YtBa=Zb8_-^B&_-u) z-#Rl5G;LZ~3ams@!6R9oPQHf5z{XXyQ;l*#b7<8rDpnvN`fO4oU)@xyZuwfd6 z9Y=*kHnDw*SOzc48qgO~E?m};J~7XC=&ks&6wlK2XVUc_MC(sUYE52UCV)z<-(!4G zP=^Cfe;9>f+zlvkUB(%A9Y3UkNhm}YBBWhcI1>CUn0FZbWPr!ET^`ZMi5ZU$gCE2` zz9L3bJk9@NV1MV8nQW~`Jk7Id?V=#R9sdwW(zpY3SI=NIV^BBrXhLZa(%-Qvp`z%k zx~cer_wD8AWm~107Vjy-FHfeBVJeYxNPpGQsuugCQ5*z~;?QXpheq6PdNC9V z_^lJxy>ms*lCZ8h6*)`7x|UYtED0Msp_FqcG~MTQjIbLx?&1055}lsMW-BJBH-Y1YN>Rg?-0T=@3@{qG^a!{t93*KhEFEHeE7gd9n zd*K(3=J4gC38%ud=1*TTnCUM!m`#m2G?s%O&rlb(3u60*4NEs-OLlCh{ExFoG4M-f-6EQpA=t4u6F7 zsM8~!akRaTcC;1g@@I?}_pGsmFy>4EUelHiy<$v8JoHz8G@1?07Mjg*JpwY`^KFKViLMSsRD6eZxuhAa8+Z+s=d?kVsWy);qJavmf)Z z>ltepK5*no*q-7v*er^)I#5whdi5z}MI51pRhIJ6dT3KBrj}eatm1mZ(ng;^^TydC zs%%%JGI*Wbicuf<8}gE`2>@OItL7xW7%S3d&)3Dgcu6u!)v(zBQC=d`$A90@am}T} zUS3UV5Yl8B4hUA578(znDJiiwI3Syi&W6_imSF1N(Qw}MKa0ha@0LHbU5*NWe}8YeE@8vPi!!s{POfn?H1~O(<*+T6#v8^z((F#tYw_q@ zE^v8$JkHEzIvWl78p^wQHcQhHE%JK^9Os^ z>`uf&uEABr z8f_Lf`DxkcdZoinLVv2=Ns_3{iq*rm{C#bTrQy!RBA83qq;XkAQb+Xk-E6)pqI&H7 zf$&E9I>Yhn%1{SZg0BQ0g3?Xy%7vz`do9FTxTm`lHb?8)M;w&b&>d#`K6n?GB=#fj z=b+ygH;nevp|)Y~8*S1jgg-b>vV>>C zNM^$L5{{o2%>-}0ADIb36>mcPioA>}RGqdY(I}w<9@H+oa;mIQ@u#o<-eRs?L~&I@ zYoGx}jhY2&;>s$*@@#wIK7vjeTqB_oO&wX>0BYj?%YVT^I&t&R0rZ_!L5Pilg}-E? zk_%fnKOva}w>IFM;>R!4i^{jsTR%x9g3DXor_fNvfvMVM66zUsWp-9Cv1#lEgKRdZ z|K~|E>c1bFcaveirhC*OMGL8ya*~<>C#kUxMPL3P1B;X7JZDsVGV5BB{AG<$PR3@a zsgk{@+JDRb+9Q((is4*C^dnECMAv~*3S@^NJS|$kPV)0oLPOpmp+wh8b5_rFN?D3^ zg5!}H67Nd3IAD{q;}vs;wg}#pObre4FWF^2{&(GY6qcvzaB@*pqxDdD1^gS=i{-YT1 zA%6jnixae`!Fx=58wT+1l^6mRz7j{1lg}eUGS=27PK(8x_f)@Ho%^akgqtdTX8Xe+@$N3czp*$IUF2a+RRml3>=cuf8N|MMr^t9 zNB%bZ>pxRo>NnqO6R5d8T^*~C?)I)yl5ro!W3i}4auk(C^wI&Ux8TM_)wVY@bPT$- zHNTZJ!9IQ(gAS+L5~Xh38`7+p3?+3`fDqFMd!Vi=vxWhD^+X-KKeDxDq*#$aG3lwh m(^O&rodkoWJUDp=sYra?>Ssz{2g(FL5Bfh9C>hVAdIA7u`(xVx delta 2620 zcmV-C3d8m5!~(Lv0kD)+e{a(;6oB9P6=sO7h0>*Nnl?-VZK47RwgDY4yi~b#P(g>b zNqgFl=Ui;ZZj&?#-598S*wVy4@#WY#=lH8*K&sFJsg8bu&ST{u6%!&HxXvQg>IG)x zjDMeBr5TQmaq-gdNO4%Zy3kyZFA?X6q^S3s}KCYz-*bW*c`Kk zB59V=2mckbRf1VbFY>$;%&#OG1mPe_k|^^15pvlhnZ~0eNz>6Fiq~US8Cuna+b5n3 z!!-3OU{(w+=FLzEMT~7G1?OLhg^H()?7n z8_c4h2U_5HTbAl?vQ#MxKfv;)~hn~(Be_;3CShcCb_YP-ZSJ z&j=116M%!3FgmS|btqY|>+^zbek}pnFLg}mJ7Sk5g6*r4vS4-k!1A54pNB8mFUou| zVRa7wM=Lf9DyG>d$MRpuAz4s($jo=Qw?duLvmUx6T((wW>pW`!R%tRmYx9g2gs3FF zVX&knr8=SwyA}O#lt&$QC>2z$rgmV%n0DDU!tjnpH?&}V`GKj2E?z5lY^~Fc(gq;M zceVDGa!@;8kUaru?9s1!m3ow9)J1p9L|qBpu~Jt>e|LhucMfJ+D3eC$j(tZP-5Cxm zpgXSFyv296_|6vJ*(kmPqw}HSI~wVa?ZG;ju7tONV&MeKfU2GC%?*+H4S1#OQ06jLS#B<89f6TCzG!vY%+eEfiiTHk38kV@yFBC59Us1pFY&a zW*C_vaW$|RTCt|pSZpArIaCX!cX+0dl);Oe<6@p(uk7y$YD)#MmW6K)ib)vMa&c42 ztMqbt6|;PBQw*=Tvq^P;h50CgSn2^RI)o{df2m@JG|M0sHB#$9EXG$+d9zVW1cC8( zP#9UnyDH%wf+|jXyR6D$9jmfnR)wln&Z?9W4yxYNOHZ%uRVQMlEN6!L>9yF=$2;O> z_60j^C!b_d&De$iRY;bV=dC-J&Gm-K52Z-XQYH1XY&EYy#zhZ)I|nIE?q(vsas zf8{CZ+6wTB9!d_pVph=k0SM(4_r7#eKpX&c#{=e{2M|s9{zQZgJNy?;LJnYq%lcq8EK3zx%Mx zIG4;OQP7HAzkJT6Fw5pS7hA*gSCH3oE{^Uvs7tvcxYqdKfz}*zG5e3kp&xjulruRR z_+cJuJ6gtF1ZYqzYS^n*tfy@QQrt&fPyJU0R0nib?JVR&XYv855!w2NsM6{u5TMF`L|p#`xOr0$BFszVW$NLWQw zU`YIT{GEJi4o=ci74o__6iW zVED07%I526ok2qvf8}UfVqvRe^Q+k!1nlX5<69CHD!wIGl{Uh6RCoA}$ZXCV z!go{=`j+^@{rHxm89QnqV@DMcz9rL6Z;}%^M&FX#U^TuauEr-YEsP=XgqJgcCv70` zI9bX}kA5Q@e*?D(;ZX*{10_Se&^l~#wwPZnK3-nGoxl6!@Nnp=+Dfm?TxFElA@WBR z68P3AwZh7)qyD5D)E`x}#8wRTM^#XN*!E!i#VF$v4V(BY@S)|K53}oq9%yi(VRi?H zRIGlP-RRS}{`v^=M9&gwep||xt|L43`vr9&iiC7f0y>CG zgN?Ty^ z@J(pX0vO8G9oNqR=x?BC~ZX<)n(ZM%E*au`IV<$ e?YCOIyx8$+Mvc?lR-HD~;`JA~x?%DfmH_~EBoJ@_ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 74f8329788a..41ec4f05cf3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-10"; + patchSuffix = "-24"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -59,14 +59,14 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git + /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git or something would complicate bootstrapping. - Fortunately it's not too big with 2.32-10. + Fortunately it's not too big. $ git checkout release/2.32/master; git describe - glibc-2.32-10-g0b9460d22e - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-10.patch.gz + glibc-2.32-24-g1d49bede4d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-24.patch.gz */ - ./2.32-10.patch.gz + ./2.32-24.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch From 8d9de193006d2a749311edb0da19f0c1470b6807 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Dec 2020 21:56:29 -0800 Subject: [PATCH 185/211] gnupg: 2.2.24 -> 2.2.25 (#106400) --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 9acd64a2c86..d6c96798b5e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.24"; + version = "2.2.25"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0ilcp7m1dvwnri3i7q9wanf5pvhwxk7h106pd62g0d5fz80b944h"; + sha256 = "02n3klqbyzxyil13sg4wa0pcwr7vs7zjaslis926yjxg8yr0fly5"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From b04fc593e7b55fe1f74421b11589f12a339c92e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 31 Dec 2020 14:48:55 +0700 Subject: [PATCH 186/211] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups --- pkgs/applications/audio/artyFX/default.nix | 6 +-- pkgs/applications/audio/eq10q/default.nix | 6 +-- .../applications/audio/eteroj.lv2/default.nix | 4 +- .../audio/game-music-emu/default.nix | 2 +- pkgs/applications/audio/kid3/default.nix | 13 +++--- pkgs/applications/audio/ncpamixer/default.nix | 4 +- pkgs/applications/audio/petrifoo/default.nix | 10 ++--- pkgs/applications/audio/sorcer/default.nix | 6 +-- pkgs/applications/audio/ympd/default.nix | 6 +-- .../audio/zynaddsubfx/default.nix | 4 +- .../editors/bonzomatic/default.nix | 3 +- .../editors/emacs-modes/melpa-packages.nix | 3 +- .../graphics/autopanosiftc/default.nix | 3 +- .../applications/graphics/freecad/default.nix | 2 +- pkgs/applications/graphics/freepv/default.nix | 4 +- pkgs/applications/graphics/pbrt/default.nix | 6 +-- .../graphics/scantailor/default.nix | 3 +- .../graphics/screencloud/default.nix | 7 ++-- .../graphics/smartdeblur/default.nix | 5 +-- pkgs/applications/misc/apvlv/default.nix | 6 +-- .../misc/dfilemanager/default.nix | 13 +++--- pkgs/applications/misc/keepassx/2.0.nix | 5 ++- pkgs/applications/misc/kiwix/default.nix | 6 +-- pkgs/applications/misc/lenmus/default.nix | 6 +-- pkgs/applications/misc/opencpn/default.nix | 8 ++-- pkgs/applications/misc/posterazor/default.nix | 6 +-- pkgs/applications/misc/sqliteman/default.nix | 3 +- pkgs/applications/misc/tellico/default.nix | 1 - .../networking/flent/http-getter.nix | 6 +-- .../purple-vk-plugin/default.nix | 3 +- .../ring-daemon/restbed.nix | 7 +--- .../networking/irc/quassel/default.nix | 4 +- .../networking/irc/weechat/default.nix | 9 ++--- .../office/tagainijisho/default.nix | 3 +- pkgs/applications/radio/gnuradio/ais.nix | 9 ++--- pkgs/applications/radio/gnuradio/gsm.nix | 6 +-- pkgs/applications/radio/gnuradio/nacl.nix | 6 +-- pkgs/applications/radio/gnuradio/osmosdr.nix | 7 ++-- pkgs/applications/radio/gnuradio/rds.nix | 6 +-- pkgs/applications/radio/tqsl/default.nix | 3 +- .../science/astronomy/openspace/default.nix | 2 +- .../science/biology/cmtk/default.nix | 2 +- .../biology/somatic-sniper/default.nix | 3 +- .../science/electronics/qfsm/default.nix | 8 ++-- .../science/electronics/qucs/default.nix | 3 +- .../science/logic/avy/default.nix | 3 +- .../science/logic/lean2/default.nix | 4 +- .../science/logic/mcrl2/default.nix | 5 +-- .../science/logic/monosat/default.nix | 3 +- .../machine-learning/shogun/default.nix | 3 +- .../science/misc/gplates/default.nix | 3 +- pkgs/applications/science/misc/root/5.nix | 6 +-- .../science/misc/vite/default.nix | 3 +- .../science/programming/scyther/cli.nix | 8 +--- .../science/robotics/yarp/default.nix | 5 +-- .../version-management/sit/default.nix | 5 ++- pkgs/applications/video/kodi/plugins.nix | 7 ++-- .../virtualization/xen/generic.nix | 4 +- .../shared-desktop-ontologies/default.nix | 9 ++--- pkgs/development/compilers/dale/default.nix | 16 +++----- pkgs/development/compilers/hhvm/default.nix | 8 ++-- pkgs/development/compilers/mono/generic.nix | 6 +-- pkgs/development/compilers/mono/llvm.nix | 3 +- pkgs/development/compilers/osl/default.nix | 8 ++-- pkgs/development/compilers/ponyc/default.nix | 3 +- pkgs/development/compilers/seexpr/default.nix | 3 +- .../interpreters/proglodyte-wasm/default.nix | 3 +- .../development/libraries/NSPlist/default.nix | 2 +- .../libraries/PlistCpp/default.nix | 4 +- pkgs/development/libraries/alure/default.nix | 3 +- pkgs/development/libraries/assimp/default.nix | 3 +- .../libraries/audio/jamomacore/default.nix | 6 +-- .../libraries/audio/libgme/default.nix | 4 +- .../libraries/avro-c++/default.nix | 7 +--- pkgs/development/libraries/box2d/default.nix | 8 ++-- pkgs/development/libraries/cegui/default.nix | 4 +- .../libraries/cpp-ipfs-api/default.nix | 3 +- .../libraries/cpp-netlib/default.nix | 5 +-- pkgs/development/libraries/cppcms/default.nix | 5 +-- pkgs/development/libraries/cppdb/default.nix | 5 +-- pkgs/development/libraries/csfml/default.nix | 3 +- pkgs/development/libraries/ctpp2/default.nix | 2 +- .../development/libraries/curlcpp/default.nix | 6 +-- pkgs/development/libraries/embree/2.x.nix | 10 ++--- pkgs/development/libraries/flann/default.nix | 2 +- .../libraries/freeglut/default.nix | 3 +- pkgs/development/libraries/gdcm/default.nix | 4 +- .../libraries/glbinding/default.nix | 4 +- .../libraries/google-cloud-cpp/default.nix | 6 +-- .../libraries/grantlee/default.nix | 3 +- .../libraries/grib-api/default.nix | 7 +--- pkgs/development/libraries/grpc/default.nix | 4 +- pkgs/development/libraries/hpx/default.nix | 6 +-- pkgs/development/libraries/libLAS/default.nix | 5 +-- .../libraries/libbladeRF/default.nix | 6 +-- .../libraries/libbluedevil/default.nix | 3 +- .../development/libraries/libdynd/default.nix | 2 +- .../libraries/libebur128/default.nix | 6 +-- .../libraries/libgroove/default.nix | 3 +- .../development/libraries/libharu/default.nix | 3 +- .../libraries/libjreen/default.nix | 7 ++-- .../libraries/libjson-rpc-cpp/default.nix | 6 +-- .../libraries/liblaxjson/default.nix | 2 +- .../libraries/libmusicbrainz/5.x.nix | 6 +-- .../libraries/libmusicbrainz/default.nix | 3 +- .../development/libraries/libnabo/default.nix | 3 +- .../libraries/libresample/default.nix | 4 +- .../libraries/libsnark/default.nix | 7 ++-- .../development/libraries/libtcod/default.nix | 3 +- .../development/libraries/libuecc/default.nix | 4 +- .../libraries/liquidfun/default.nix | 10 ++--- .../libraries/lucene++/default.nix | 4 +- .../libraries/mailcore2/default.nix | 6 +-- pkgs/development/libraries/mygui/default.nix | 10 ++--- .../libraries/nanoflann/default.nix | 2 +- .../libraries/nss_wrapper/default.nix | 5 +-- pkgs/development/libraries/ogre/1.10.x.nix | 9 ++--- pkgs/development/libraries/ogre/1.9.x.nix | 8 ++-- pkgs/development/libraries/ogre/default.nix | 8 ++-- .../libraries/opencollada/default.nix | 7 ++-- .../libraries/opensubdiv/default.nix | 5 ++- .../libraries/opentracing-cpp/default.nix | 3 +- .../libraries/portmidi/default.nix | 3 +- .../libraries/properties-cpp/default.nix | 5 ++- pkgs/development/libraries/ptex/default.nix | 5 +-- .../libraries/qimageblitz/default.nix | 3 +- pkgs/development/libraries/qjson/default.nix | 3 +- .../libraries/rabbitmq-c/default.nix | 3 +- .../libraries/rnnoise-plugin/default.nix | 2 +- .../libraries/science/math/clblas/default.nix | 4 +- .../libraries/science/math/metis/default.nix | 2 +- .../science/math/parmetis/default.nix | 3 +- .../science/math/superlu/default.nix | 2 +- .../science/robotics/ispike/default.nix | 8 ++-- .../libraries/unittest-cpp/default.nix | 2 +- pkgs/development/libraries/vigra/default.nix | 3 +- pkgs/development/libraries/vrpn/default.nix | 3 +- pkgs/development/libraries/vxl/default.nix | 3 +- pkgs/development/libraries/wt/default.nix | 6 +-- .../ocaml-modules/llvm/default.nix | 3 +- .../ruby-modules/gem-config/default.nix | 40 +++++++++---------- .../tools/analysis/hotspot/default.nix | 4 +- .../tools/analysis/ikos/default.nix | 3 +- .../analysis/include-what-you-use/default.nix | 2 - .../development/tools/analysis/rr/default.nix | 8 ++-- .../tools/build-managers/arpa2cm/default.nix | 2 +- pkgs/development/tools/minizinc/default.nix | 2 +- .../tools/misc/automoc4/default.nix | 14 ++++--- .../tools/misc/xc3sprog/default.nix | 3 +- .../tools/msgpack-tools/default.nix | 6 +-- pkgs/development/tools/rucksack/default.nix | 3 +- .../tools/solarus-quest-editor/default.nix | 22 +++++----- pkgs/development/tools/xcbuild/default.nix | 5 +-- pkgs/games/astromenace/default.nix | 3 +- pkgs/games/blobby/default.nix | 22 +++++----- pkgs/games/cockatrice/default.nix | 4 +- pkgs/games/holdingnuts/default.nix | 3 +- pkgs/games/ja2-stracciatella/default.nix | 5 +-- pkgs/games/mars/default.nix | 16 ++++---- pkgs/games/megaglest/default.nix | 28 ++++++------- pkgs/games/ninvaders/default.nix | 3 +- pkgs/games/opendungeons/default.nix | 8 ++-- pkgs/games/openlierox/default.nix | 5 ++- pkgs/games/openmw/default.nix | 14 ++++--- pkgs/games/privateer/default.nix | 7 ++-- pkgs/games/rigsofrods/default.nix | 14 +++---- pkgs/games/stuntrally/default.nix | 8 ++-- pkgs/games/trackballs/default.nix | 13 +++--- pkgs/games/xskat/default.nix | 34 ++++++---------- pkgs/misc/emulators/hatari/default.nix | 3 +- pkgs/misc/my-env/default.nix | 10 ++--- pkgs/misc/screensavers/xss-lock/default.nix | 7 ++-- pkgs/os-specific/darwin/darling/default.nix | 2 - .../darwin/swift-corelibs/libdispatch.nix | 3 +- pkgs/os-specific/linux/anbox/default.nix | 6 ++- pkgs/os-specific/linux/libwebcam/default.nix | 9 ++--- pkgs/servers/misc/taskserver/default.nix | 6 +-- pkgs/servers/rippled/default.nix | 4 +- pkgs/servers/sql/percona/5.6.x.nix | 5 +-- pkgs/servers/uhub/default.nix | 6 +-- .../audio/acoustid-fingerprinter/default.nix | 6 +-- pkgs/tools/cd-dvd/cdrkit/default.nix | 5 ++- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 6 +-- pkgs/tools/compression/lzham/default.nix | 4 +- pkgs/tools/filesystems/irods/common.nix | 5 +-- .../filesystems/unionfs-fuse/default.nix | 3 +- pkgs/tools/graphics/appleseed/default.nix | 7 ++-- pkgs/tools/graphics/gromit-mpx/default.nix | 5 +-- pkgs/tools/graphics/luxcorerender/default.nix | 12 +++--- pkgs/tools/graphics/yafaray-core/default.nix | 5 ++- .../fcitx-engines/fcitx-anthy/default.nix | 6 +-- .../fcitx-engines/fcitx-chewing/default.nix | 6 +-- .../fcitx-cloudpinyin/default.nix | 6 +-- .../fcitx-engines/fcitx-hangul/default.nix | 6 +-- .../fcitx-engines/fcitx-libpinyin/default.nix | 6 +-- .../fcitx-engines/fcitx-m17n/default.nix | 6 +-- .../fcitx-engines/fcitx-rime/default.nix | 5 ++- .../fcitx-table-extra/default.nix | 3 +- .../fcitx-table-other/default.nix | 3 +- .../fcitx-engines/fcitx-unikey/default.nix | 8 ++-- .../inputmethods/fcitx/fcitx-configtool.nix | 8 ++-- .../ibus-table-chinese/default.nix | 5 ++- pkgs/tools/inputmethods/ibus/ibus-qt.nix | 8 ++-- pkgs/tools/misc/aspcud/default.nix | 3 +- pkgs/tools/misc/bcunit/default.nix | 2 +- pkgs/tools/misc/ddate/default.nix | 12 +++--- pkgs/tools/misc/sdl-jstest/default.nix | 6 +-- pkgs/tools/misc/wv2/default.nix | 6 +-- pkgs/tools/networking/badvpn/default.nix | 12 +++--- pkgs/tools/security/haka/default.nix | 3 +- pkgs/tools/text/ebook-tools/default.nix | 13 +++--- pkgs/tools/text/jumanpp/default.nix | 4 +- 212 files changed, 611 insertions(+), 634 deletions(-) diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 8cf9bec2e3d..75494c0d37a 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: +{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { pname = "artyFX"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairomm libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { homepage = "http://openavproductions.com/artyfx/"; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index c614b96f638..6c627c835ae 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config , xorg }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index c86e7b5e9ba..5ae3292379e 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: stdenv.mkDerivation rec { pname = "eteroj.lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 7cc431583ed..fa93ca065de 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index c0900c56d0b..f4f76d2030e 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4 +, pkg-config, cmake, python3, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -15,12 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ - pkgconfig cmake python3 ffmpeg_3 phonon automoc4 - chromaprint docbook_xml_dtd_45 docbook_xsl libxslt - id3lib taglib mp4v2 flac libogg libvorbis zlib readline - qtbase qttools qtmultimedia qtquickcontrols ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ python3 ffmpeg_3 phonon automoc4 chromaprint + docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac + libogg libvorbis zlib readline qtbase qttools qtmultimedia + qtquickcontrols ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 89a0da5e0d6..a25f3bad5b5 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libpulseaudio ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configurePhase = '' make PREFIX=$out build/Makefile diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 322eba2b952..ea7b8074de2 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 -, pkgconfig, openssl }: +, pkg-config, openssl }: stdenv.mkDerivation rec { pname = "petri-foo"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; - buildInputs = - [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs - libsamplerate libsndfile libtool libxml2 pkgconfig openssl - ]; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs + libsamplerate libsndfile libtool libxml2 openssl ]; meta = with stdenv.lib; { description = "MIDI controllable audio sampler"; diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index ad5f8fda1a9..03c19a0db2a 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: +{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }: stdenv.mkDerivation rec { pname = "sorcer"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost cairomm libsndfile lv2 ntk python ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 8f86d6e7ba9..72c17aed52e 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: stdenv.mkDerivation rec { pname = "ympd"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mpd_clientlib openssl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ mpd_clientlib openssl ]; meta = { homepage = "https://www.ympd.org"; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 9a432f73d3f..4f00bcaf063 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg -, libXpm, minixml, ntk, pkgconfig, zlib, liblo +, libXpm, minixml, ntk, pkg-config, zlib, liblo }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; patchPhase = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index a12ccd257f8..4d02b6837ca 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; }; - buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; postFixup = '' wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5a02c97b6d0..429bbbaf396 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -583,7 +583,8 @@ let }; vterm = super.vterm.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" "-DUSE_SYSTEM_LIBVTERM=ON" diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 14af98ebc48..5c649b384c7 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; - buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpng libtiff libjpeg panotools libxml2 ]; patches = [ (fetchurl { diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f1e366b6569..1c272cf44e2 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -27,7 +27,7 @@ in mkDerivation rec { ]; buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts + coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 11d203746e1..a0356d12981 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index fa3034cb3b0..e699b453bcf 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: stdenv.mkDerivation { - version = "2018-08-15"; pname = "pbrt-v3"; @@ -18,12 +17,13 @@ stdenv.mkDerivation { ./openexr-cmake-3.12.patch ]; - buildInputs = [ git flex bison cmake zlib ]; + nativeBuildInputs = [ flex bison cmake ]; + buildInputs = [ zlib ]; meta = with stdenv.lib; { homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.bsd2; maintainers = [ maintainers.juliendehos ]; priority = 10; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index bc54f3aa627..c776aec3c42 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; - buildInputs = [ qt4 cmake libjpeg libtiff boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libjpeg libtiff boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 11e37c4bf64..f5478f684fe 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # for tracking usage. consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6"; consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216"; - + src = fetchFromGitHub { owner = "olav-st"; repo = "screencloud"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; }; - buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -28,8 +29,6 @@ stdenv.mkDerivation rec { substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" "" ''; - enableParallelBuilding = true; - # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not # to add the argument for us. dontAddPrefix = true; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 0df161cd473..d9877afad86 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { cd src ''; - enableParallelBuilding = true; - - buildInputs = [ cmake qt4 fftw ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 fftw ]; cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 48efafa74fc..aa052426e72 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ - pkgconfig + cmake + pkg-config wrapGAppsHook ]; buildInputs = [ - cmake poppler pcre libxkbcommon epoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 69c7f0dc17f..e7750cf7978 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,18 +1,17 @@ -{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: -let - version = "git-2016-01-10"; -in -mkDerivation { +stdenv.mkDerivation { pname = "dfilemanager"; - inherit version; + version = "git-2016-01-10"; + src = fetchgit { url = "git://git.code.sf.net/p/dfilemanager/code"; rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd"; }; - buildInputs = [ cmake qtbase qttools file solid ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools file solid ]; cmakeFlags = [ "-DQT5BUILD=true" ]; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index fdd11db509f..52feb338a15 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: stdenv.mkDerivation rec { pname = "keepassx2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; }; - buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index ff6b1e9de2d..068f7833c86 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, fetchurl, makeWrapper, pkg-config , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake @@ -38,7 +38,7 @@ let sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; unpackPhase = '' # not a nice src archive: all the files are in the root :( @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zip python zlib xapian which icu libmicrohttpd lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 532166cf6fb..2280f9a471e 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch +{ stdenv, pkg-config, fetchFromGitHub, fetchpatch , cmake, boost , portmidi, sqlite , freetype, libpng, pngpp, zlib @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost + boost portmidi sqlite freetype libpng pngpp zlib wxGTK30 wxsqlite3 diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index f5a88cbaee1..a93f4b24740 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext glib portaudio ]; cmakeFlags = [ @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; - enableParallelBuilding = true; - meta = { description = "A concise ChartPlotter/Navigator"; maintainers = [ stdenv.lib.maintainers.kragniz ]; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 674570ec3dd..391868503c2 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: +{ stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: stdenv.mkDerivation { name = "posterazor-1.5.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake unzip libXpm fltk13 freeimage ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; + buildInputs = [ libXpm fltk13 freeimage ]; unpackPhase = '' unzip $src -d posterazor diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index 27d5610956d..24fbb985bef 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; - buildInputs = [ cmake qt4 qscintilla ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 qscintilla ]; prePatch = '' sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index fa725ad9c96..7037b40816c 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { ]; buildInputs = [ - cmake exempi extra-cmake-modules karchive diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 2a3d294c5ca..2967c4e535f 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake -, curl, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, curl, pkg-config }: stdenv.mkDerivation { pname = "http-getter"; @@ -12,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl"; }; - buildInputs = [ cmake pkgconfig curl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl ]; meta = with stdenv.lib; { homepage = "https://github.com/tohojo/http-getter"; 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 76b242659e7..327827b74f3 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 @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; }; - buildInputs = [ pidgin cmake libxml2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin libxml2 ]; preConfigure = '' sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 775b9015eb0..5b7a402504d 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -19,11 +19,8 @@ stdenv.mkDerivation { inherit patches; - buildInputs = [ - cmake - asio - openssl - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ asio openssl ]; meta = with stdenv.lib; { description = "HTTP framework for building networked applications"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 76743621fc7..7981644be9f 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -54,8 +54,8 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; - buildInputs = - [ cmake makeWrapper qtbase ] + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ qtbase ] ++ lib.optionals buildCore [qtscript qca-qt5] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 404810e5f24..7343b7e1a55 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext -, zlib, curl, pkgconfig, libgcrypt +, zlib, curl, pkg-config, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv , asciidoctor # manpages , guileSupport ? true, guile @@ -37,7 +37,6 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - enableParallelBuilding = true; cmakeFlags = with stdenv.lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" @@ -48,10 +47,10 @@ let ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; + nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; buildInputs = with stdenv.lib; [ - ncurses openssl aspell gnutls gettext zlib curl pkgconfig - libgcrypt makeWrapper cmake asciidoctor - ] + ncurses openssl aspell gnutls gettext zlib curl + libgcrypt ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] ++ concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index d826b9f54f6..5216c896e72 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; - buildInputs = [ qt4 cmake sqlite ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 sqlite ]; meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 46d46d1c325..69b55c77121 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , makeWrapper, cppunit, gr-osmosdr, log4cpp , pythonSupport ? true, python, swig }: @@ -17,10 +17,9 @@ stdenv.mkDerivation { sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gr-osmosdr log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] + ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 4e2406fc07a..541817c18f9 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp + boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 3435d5cdb4f..41c28833a3b 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd , makeWrapper, libsodium, cppunit, log4cpp , pythonSupport ? true, python, swig }: @@ -16,9 +16,9 @@ stdenv.mkDerivation { sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp + boost gnuradio uhd makeWrapper libsodium cppunit log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 9eb6fe648d0..7d91b23e7f0 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper +{ stdenv, fetchgit, cmake, pkg-config, makeWrapper , boost , pythonSupport ? true, python, swig , airspy @@ -23,10 +23,9 @@ stdenv.mkDerivation rec { sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ - cmake makeWrapper boost log4cpp - airspy gnuradio hackrf libbladeRF rtl-sdr uhd + boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 72838569bb3..9d73176b929 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp , makeWrapper, pythonSupport ? true, python, swig }: @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost gnuradio makeWrapper log4cpp + boost gnuradio makeWrapper log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index fd5f5505a67..3f060f91543 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - cmake expat openssl zlib diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index 566fd61f1a7..ca8651aa9e6 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - makeWrapper cmake curl boost gdal glew soil libX11 libXi libXxf86vm libXcursor libXrandr libXinerama ]; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 41805c15aed..7aef4c07281 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 17d9c3dbb55..298bb98ec99 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./somatic-sniper.patch ]; - buildInputs = [ cmake zlib ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ncurses ]; enableParallelBuilding = false; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 9b6e75c77ba..a50609e84a8 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: +{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 cmake graphviz ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 graphviz ]; patches = [ ./drop-hardcoded-prefix.patch @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 62a9ae8b73b..9b143f1c3f1 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { ./cmakelists.patch ]; - buildInputs = [ flex bison qt4 libX11 cmake gperf adms ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ qt4 libX11 gperf adms ]; meta = { description = "Integrated circuit simulator"; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6b48c1e3448..6f8120c7b8e 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake zlib boost.out boost.dev ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 612c9d6f92a..9ac4f2a6c6b 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl"; }; - buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python gperftools ]; preConfigure = '' patchShebangs bin/leantags diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index eb83eaf79c5..584988f2b40 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake libGLU libGL qt5.qtbase boost ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL qt5.qtbase boost ]; meta = with stdenv.lib; { description = "A toolset for model-checking concurrent systems and protocols"; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 63440213920..19fba6e2993 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -31,7 +31,8 @@ let core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src patches; - buildInputs = [ cmake zlib gmp jdk8 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib gmp jdk8 ]; cmakeFlags = [ "-DBUILD_STATIC=OFF" diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index a2c26de7a2d..f5ead883799 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; + nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 4bef967bc08..ade58b28ab6 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 doxygen graphviz gmp mpfr (boost.override { enablePython = true; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index cab26577bd0..a800a1938c8 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 0d749bb9be4..6f7735db82e 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 libGLU libGL ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 6623f5def4c..0acf0989c63 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -6,12 +6,8 @@ stdenv.mkDerivation { inherit src meta; - buildInputs = [ - cmake - glibc.static - flex - bison - ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ glibc.static ]; patchPhase = '' # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index df2c569a31c..aa0062f8f3a 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; }; - buildInputs = [ cmake ace ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ace ]; cmakeFlags = [ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index d19f9862fca..7a082033af4 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -13,8 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf"; }; - buildInputs = [ cmake libzip gnupg ] ++ - (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []); + nativeBuildInputs = [ cmake ]; + buildInputs = [ libzip gnupg ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 12c16a744b0..f957722ce75 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -47,7 +47,8 @@ let self = rec { sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; - buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain libcec_platform tinyxml ]; }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: @@ -75,8 +76,8 @@ let self = rec { dontStrip = true; - buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] - ++ extraBuildInputs; + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; inherit extraRuntimeDependencies; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 7cd02e69c5e..4b03bb5da46 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,5 +1,5 @@ config: -{ stdenv, cmake, pkgconfig, which +{ stdenv, cmake, pkg-config, which # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib @@ -66,7 +66,7 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake which diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 7e628567b6e..d3dfadeb5b3 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shared-desktop-ontologies-0.11.0"; - + src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; - - buildInputs = [ cmake ]; - + + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sander ]; }; } - diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index cbe4e7ec926..ef32b37ef99 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -1,18 +1,16 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , libffi , llvm_6 , doCheck ? false , perl }: -let version = "20181024"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "dale"; - inherit version; + version = "20181024"; src = fetchFromGitHub { owner = "tomhrr"; @@ -21,16 +19,14 @@ in stdenv.mkDerivation { sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libffi llvm_6 ] - ++ stdenv.lib.optional doCheck perl; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libffi llvm_6 ]; inherit doCheck; + checkInputs = [ perl ]; checkTarget = "tests"; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Lisp-flavoured C"; longDescription = '' diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 08ba9e46814..c06e94a038f 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached +{ stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake pkg-config flex bison ]; buildInputs = - [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl - libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap + [ boost libunwind libmysqlclient libmemcached pcre gdb git perl + libevent gd curl libxml2 icu openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 gmp libyaml libedit libvpx imagemagick fribidi gperf which @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { ./flexible-array-members-gcc6.patch ]; - enableParallelBuilding = true; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index ca3b3147807..40d85be5a24 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which +{ stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; - nativeBuildInputs = [ gnumake42 ]; + nativeBuildInputs = [ automake bison cmake pkg-config which gnumake42 ]; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which + [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index d08a4ebef24..71405f30d5c 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7"; }; - buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 2c00420c362..b1f9dae4fcd 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -18,13 +18,13 @@ in clangStdenv.mkDerivation rec { }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; - enableParallelBuilding = true; preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; - + + nativeBuildInputs = [ cmake boost_static flex bison]; buildInputs = [ - cmake zlib openexr openimageio llvm - boost_static flex bison partio pugixml + zlib openexr openimageio llvm + partio pugixml util-linux # needed just for hexdump python # CMake doesn't check this? ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 0bfaba914a7..f9e4ad742cf 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation (rec { name = "v1.5.0.tar.gz"; }; - buildInputs = [ makeWrapper which libxml2 cmake z3 ]; + nativeBuildInputs = [ cmake makeWrapper which ]; + buildInputs = [ libxml2 z3 ]; propagatedBuildInputs = [ cc ]; # Sandbox disallows network access, so disabling problematic networking tests diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 580fc3b761d..4bf89973d7e 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; }; - buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; meta = with stdenv.lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://www.disneyanimation.com/technology/seexpr.html"; diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 8ebbf6cf501..3569f66aed0 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -14,7 +14,8 @@ let # set this to nonempty string to disable default cmake configure ''; - buildInputs = [ cmake clang python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ clang python ]; buildPhase = "make clang-debug-no-tests"; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index bfee9961984..9cf5e919548 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index f7703b731b9..3501fa8b435 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; }; - buildInputs = [ cmake boost NSPlist pugixml ]; - + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost NSPlist pugixml ]; meta = with stdenv.lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 59926f52b07..1f4dafeb362 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"; }; - buildInputs = [ cmake openal ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openal ]; meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index c1972aa1ca8..9c5b75999f1 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "00vxzfcrs856qnyk806wqr67nmpjk06mjby0fqmyhm6i1jj2hg1w"; }; - buildInputs = [ cmake boost zlib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost zlib ]; meta = with stdenv.lib; { description = "A library to import various 3D model formats"; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7c9b3ef67c9..c08b25fea37 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: +{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: stdenv.mkDerivation rec { version = "1.0-beta.1"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ]; meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 3ac8293986d..d70b6cfbde8 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -20,9 +20,7 @@ in stdenv.mkDerivation { sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy"; }; - buildInputs = [ cmake ]; - - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ cmake removeReferencesTo ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 3e7bc67d25b..c147b3f0b5e 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -11,11 +11,8 @@ stdenv.mkDerivation { sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k"; }; - buildInputs = [ - cmake - python2 - boost - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python2 boost ]; preConfigure = '' substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 1672970d505..e93d4b549a2 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto -, libXi, pkgconfig }: +, libXi, pkg-config }: stdenv.mkDerivation rec { pname = "box2d"; @@ -12,10 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "Box2D-${version}/Box2D"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - unzip cmake libGLU libGL freeglut libX11 xorgproto libXi - ]; + nativeBuildInputs = [ cmake unzip pkg-config ]; + buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index aaa93f19131..7397bdceb76 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; - - buildInputs = [ cmake ogre freetype boost expat ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ogre freetype boost expat ]; meta = with stdenv.lib; { homepage = "http://cegui.org.uk/"; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 3c5921541a7..623ab59d3ee 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g"; }; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 50c4e05dfa1..e7079ac0386 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ cmake boost openssl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost openssl ]; cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; - enableParallelBuilding = true; - # The test driver binary lacks an RPath to the library's libs preCheck = '' export LD_LIBRARY_PATH=$PWD/libs/network/src diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 0063db95770..7673d257a3e 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; - enableParallelBuilding = true; - - buildInputs = [ cmake pcre zlib python openssl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ pcre zlib python openssl ]; cmakeFlags = [ "--no-warn-unused-cli" diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index fc65dd73920..6ad27152b38 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; - enableParallelBuilding = true; - - buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ sqlite libmysqlclient postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index ab63b7a21f2..61d1d53da63 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { rev = version; sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm"; }; - buildInputs = [ cmake sfml ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 82bbdfc2fc1..2e3f6a86d49 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' # include to fix undefined getcwd diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index ead4d1b76bd..6efc28b4c05 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlcpp"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; }; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; meta = with stdenv.lib; { homepage = "https://josephp91.github.io/curlcpp/"; @@ -21,4 +22,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rszibele ]; }; } - diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index d8e102a0d40..083dbbc7450 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: @@ -14,11 +14,11 @@ stdenv.mkDerivation { }; cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; - enableParallelBuilding = true; - - buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; meta = with stdenv.lib; { - description = "High performance ray tracing kernels from Intel"; + description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index f65d283fd1d..a61d11c2578 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ unzip cmake python ]; + nativeBuildInputs = [ unzip cmake python ]; meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index d23147095fc..6d4e560e93b 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index d05e44eae3e..b04828c92dd 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { cd ../build ''; - enableParallelBuilding = true; - buildInputs = [ cmake vtk_7 ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 9ce5a23f970..9b67b9695cc 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: + stdenv.mkDerivation rec { pname = "glbinding"; version = "3.1.0"; @@ -10,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; }; - buildInputs = [ cmake libGLU xlibsWrapper ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU xlibsWrapper ]; meta = with stdenv.lib; { homepage = "https://github.com/cginternals/glbinding/"; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 7528925088e..a3a549a6324 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -16,7 +16,7 @@ let sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; postPatch = '' @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ]; - nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ]; + nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index a8e692bdd51..627a345efad 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = { description = "Qt4 port of Django template system"; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index db884957d1e..0a057ba4aa1 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" "" ''; - buildInputs = [ cmake - netcdf - gfortran + nativeBuildInputs = [ cmake gfortran ]; + buildInputs = [ netcdf libpng openjpeg ] ++ stdenv.lib.optionals enablePython [ @@ -42,8 +41,6 @@ stdenv.mkDerivation rec { "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}" ]; - enableParallelBuilding = true; - doCheck = true; # Only do tests that don't require downloading 120MB of testdata diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index c41bd5ff5aa..346d04390c3 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf , gflags, abseil-cpp, libnsl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index ba7da8f5b77..f83d0aff32e 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: +{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: stdenv.mkDerivation rec { pname = "hpx"; @@ -12,9 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hwloc gperftools ]; - nativeBuildInputs = [ cmake pkgconfig python ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config python ]; meta = { description = "C++ standard library for concurrency and parallelism"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 27db14e7166..714708a6e0d 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -4,13 +4,12 @@ stdenv.mkDerivation rec { name = "libLAS-1.8.1"; src = fetchurl { - url = "https://download.osgeo.org/liblas/${name}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index b2853011b14..31800a17408 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: let @@ -23,9 +23,9 @@ in stdenv.mkDerivation { sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 - buildInputs = [ cmake git doxygen help2man tecla libusb1 ] + buildInputs = [ tecla libusb1 ] ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d9639cf5c14..bf72720019c 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index cc9018421fe..2450ac6a9ea 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { "-Wno-error=deprecated-copy" ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" ]; outputDoc = "dev"; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index cb529192298..e349af41bcb 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake speexdsp ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ speexdsp ]; meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 3fea527c450..52cdf5e9027 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./no-warnings-as-errors.patch ]; - buildInputs = [ cmake libav SDL2 chromaprint libebur128 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libav SDL2 chromaprint libebur128 ]; meta = with stdenv.lib; { description = "Streaming audio processing library"; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 68dba64618f..634a991f49b 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; - buildInputs = [ zlib libpng cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libpng ]; meta = { description = "Cross platform, open source library for generating PDF files"; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 141598839b0..2c14d270f26 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: +{ stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: stdenv.mkDerivation rec { pname = "libjreen"; @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 gsasl ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 gsasl ]; meta = { description = "C++ Jabber library using Qt framework"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 03d77c11bec..eec93ef11a8 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig +, doxygen, catch, pkg-config }: stdenv.mkDerivation rec { @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { cp -r Install/* $out ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ jsoncpp argtable curl libmicrohttpd doxygen catch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index b932f9e928b..ef50c106eae 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Library for parsing JSON config files"; diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 2fdcdc7d86d..7c8cdd1df1a 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: stdenv.mkDerivation rec { version = "5.1.0"; pname = "libmusicbrainz"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake neon libdiscid libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ neon libdiscid libxml2 ]; src = fetchFromGitHub { owner = "metabrainz"; diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 0db539a23af..d5568cdb3d6 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "libmusicbrainz-3.0.3"; - buildInputs = [ cmake neon libdiscid ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ neon libdiscid ]; src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 4c3ceee1e56..e9b47e6d406 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17vxlmszzpm95vvfdxnm98d5p297i10fyblblj6kf0ynq8r2mpsh"; }; - buildInputs = [cmake eigen boost]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen boost ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 85d8d5c586b..80dd4e05b21 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { preConfigure = '' cat debian/patches/1001_shlib-cmake.patch | patch -p1 ''; - buildInputs = [ cmake ]; - + nativeBuildInputs = [ cmake ]; + meta = { description = "A real-time library for sampling rate conversion library"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 227353e0a9f..6de498f6d29 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; @@ -7,7 +7,8 @@ in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; version = stdenv.lib.substring 0 8 rev; - buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; @@ -19,8 +20,6 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index c8c59b15f3a..420a4c6ad20 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ]; - buildInputs = [ cmake SDL libGLU libGL upx zlib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL libGLU libGL upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index ff6801ef18f..e5d21e2d8f7 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; }; - buildInputs = [ cmake ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Very small Elliptic Curve Cryptography library"; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 1beae81ad16..21d3bc47663 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,6 +1,6 @@ { stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: -let +let sourceInfo = rec { version="1.1.0"; name="liquidfun-${version}"; @@ -16,7 +16,8 @@ stdenv.mkDerivation { }; inherit (sourceInfo) name version; - buildInputs = [ cmake libGLU libGL libX11 libXi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; @@ -26,10 +27,10 @@ stdenv.mkDerivation { sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h" ''; - + configurePhase = '' mkdir Build - cd Build; + cd Build; cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. ''; @@ -45,4 +46,3 @@ stdenv.mkDerivation { homepage = "https://google.github.io/liquidfun/"; }; } - diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 3d54cf5e7c1..0dcd53a0772 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; - buildInputs = [ cmake boost gtest ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost gtest ]; - enableParallelBuilding = true; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index d5f20f6761c..4e5a5fdbcdb 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl +, libuchardet, pkg-config, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libetpan cmake icu cyrus_sasl libctemplate libuchardet glib + libetpan icu cyrus_sasl libctemplate libuchardet glib html-tidy libxml2 libuuid openssl ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 894d35eb3d8..4b86868d2aa 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, - boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } : + boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let renderSystem = if withOgre then "3" else "4"; @@ -14,11 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ] - ++ (if withOgre then [ ogre ] else [libGL libGLU]); + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libX11 unzip ois freetype libuuid boost ] + ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 3bd6bb02a05..649ce91cbd8 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index c03b0944778..2b9321c7a90 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "nss_wrapper-1.1.11"; @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index fe23181cfc6..6bf239d061e 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit @@ -21,13 +21,12 @@ stdenv.mkDerivation { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; - + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake libGLU libGL + [ libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 29c83a2962e..8e0156d8452 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake libGLU libGL + [ libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 491ff4edddc..8eb6db729ed 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -2,7 +2,7 @@ , cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkgconfig +, libX11, libXmu, libSM, pkg-config , libXxf86vm, libICE , unzip , libXrender @@ -23,19 +23,17 @@ stdenv.mkDerivation rec { ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake unzip pkg-config ]; buildInputs = [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM pkgconfig + libX11 libXmu libSM libXxf86vm libICE libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; - nativeBuildInputs = [ unzip ]; - meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 388c473125b..4c88f164b37 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre , darwin}: stdenv.mkDerivation rec { @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 35a8358b514..080db7fad14 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? config.cudaSupport or false, cudatoolkit , darwin @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ cmake pkgconfig libGLU libGL python3 + [ libGLU libGL python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index a31350a5f96..76342abaa2d 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx"; }; - buildInputs = [ cmake ]; + + nativeBuildInputs = [ cmake ]; meta = { description = "C++ implementation of the OpenTracing API"; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index a0001691302..d96e15edd81 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ln -s libportmidi.so "$out/lib/libporttime.so" ''; - buildInputs = [ unzip cmake /*jdk*/ alsaLib ]; + nativeBuildInputs = [ unzip cmake ]; + buildInputs = [ alsaLib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index fb998169595..ef4de40a800 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen +{ stdenv, fetchurl, cmake, pkg-config, gtest, doxygen , graphviz, lcov }: stdenv.mkDerivation rec { @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; }; - buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest doxygen graphviz lcov ]; patchPhase = '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index b4571d07fbf..09b3ce23e08 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -14,9 +14,8 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ zlib python cmake pkg-config ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib python pkg-config ]; # Can be removed in the next release # https://github.com/wdas/ptex/pull/42 diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 51253676341..899f1d1f00b 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; patches = [ ./qimageblitz-9999-exec-stack.patch ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index ab4a96e65ea..ee1c36c3244 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs"; }; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; meta = with stdenv.lib; { description = "Lightweight data-interchange format"; diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index d24bce96997..7cb29357c49 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1iv7aww4pam8497s524xjxbbxypyqd01qgrb0b429y3q9x06m4sw"; }; - buildInputs = [ cmake openssl popt xmlto ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl popt xmlto ]; meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 9ec9eabebeb..c359c753388 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 8a474e06e55..a22cf914cf6 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake gfortran blas python @@ -53,8 +53,6 @@ stdenv.mkDerivation rec { OpenCL ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 8d6381c8d48..d5861d9db33 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; - buildInputs = [ unzip cmake ]; + nativeBuildInputs = [ unzip cmake ]; meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 8f24356c733..050e8f1b285 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj"; }; - buildInputs = [ cmake mpi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ mpi ]; # metis and GKlib are packaged with distribution # AUR https://aur.archlinux.org/packages/parmetis/ has reported that diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index ff59297bd83..892ccb4da11 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8"; }; - buildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ cmake gfortran ]; propagatedBuildInputs = [ blas ]; diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 39f412e8dd5..70488426b01 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, cmake, boost -}: +{ stdenv, fetchurl, cmake, boost }: stdenv.mkDerivation rec { pname = "ispike"; @@ -10,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; }; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; @@ -19,6 +19,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; - - } diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 7dd8e071567..17b64d99971 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; doCheck = false; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 8720a39f301..16b4b3c3755 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,8 @@ in stdenv.mkDerivation rec { sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; }; in [ clangPatch ]; - buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng libtiff numpy openexr python ]; preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index b45c83ab1ae..85d6fba459d 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake libGLU libGL ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ libGLU libGL ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 58622cb98cb..4adab259a42 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8"; }; - buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ libtiff expat zlib libpng libjpeg ]; cmakeFlags = [ # BUILD_OUL wants old linux headers for videodev.h, not available diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 7c819487a33..60b2021f17a 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu +{ stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz }: @@ -19,9 +19,9 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake boost doxygen qt48Full libharu + boost doxygen qt48Full libharu pango fcgi firebird libmysqlclient postgresql graphicsmagick glew openssl pcre ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 24fde437d5c..d141e59d45e 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { inherit (llvm) src; - buildInputs = [ python cmake ocaml findlib ctypes ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python ocaml findlib ctypes ]; propagatedBuildInputs = [ llvm ]; patches = [ (fetchpatch { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 83749bd21a5..ba2bb33b5a6 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -19,7 +19,7 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick -, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi +, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx @@ -41,7 +41,7 @@ in { atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; - nativeBuildInputs = [ rake bundler pkgconfig ]; + nativeBuildInputs = [ rake bundler pkg-config ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ]; }; @@ -61,12 +61,12 @@ in }; cairo = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; @@ -75,7 +75,7 @@ in }; cld3 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ protobuf ]; }; @@ -180,12 +180,12 @@ in }; ffi = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libffi ]; }; gdk_pixbuf2 = attrs: { - nativeBuildInputs = [ pkgconfig bundler rake ]; + nativeBuildInputs = [ pkg-config bundler rake ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; @@ -195,7 +195,7 @@ in }; gio2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; @@ -212,13 +212,13 @@ in }; glib2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre ]; }; gtk2 = attrs: { nativeBuildInputs = [ - binutils pkgconfig + binutils pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; @@ -238,12 +238,12 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = toString [ @@ -320,7 +320,7 @@ in cmake bison flex - pkgconfig + pkg-config python3 ]; @@ -417,7 +417,7 @@ in pango = attrs: { nativeBuildInputs = [ - pkgconfig + pkg-config fribidi harfbuzz pcre @@ -475,7 +475,7 @@ in }; rmagick = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ imagemagick which ]; }; @@ -484,7 +484,7 @@ in }; ruby-libvirt = attrs: { - buildInputs = [ libvirt pkgconfig ]; + buildInputs = [ libvirt pkg-config ]; buildFlags = [ "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" @@ -519,8 +519,8 @@ in }; rugged = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cmake openssl libssh2 zlib ]; + nativeBuildInputs = [ cmake pkg-config which ]; + buildInputs = [ openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -587,7 +587,7 @@ in }; tiny_tds = attrs: { - nativeBuildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkg-config openssl ]; buildInputs = [ freetds ]; }; @@ -616,7 +616,7 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ rake pkgconfig bundler ]; + nativeBuildInputs = [ rake pkg-config bundler ]; buildInputs = [ xapian zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index f04d060290f..de29b29df31 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -27,8 +27,8 @@ mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake elfutils extra-cmake-modules kconfigwidgets @@ -50,8 +50,6 @@ mkDerivation rec { mkdir -p 3rdparty/perfparser/.git ''; - enableParallelBuilding = true; - meta = { description = "A GUI for Linux perf"; longDescription = '' diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 7108e9311b8..26c7b6dd0b7 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; - buildInputs = [ cmake boost tbb gmp clang llvm sqlite python + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost tbb gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 8bda0ac2223..67157218154 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; - enableParallelBuilding = true; - postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 5e80d5b096d..92f2494dbe2 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { version = "5.4.0"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { # see https://github.com/mozilla/rr/issues/2269 preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config which ]; buildInputs = [ - cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto + libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; - # FIXME #doCheck = true; diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index ef3062c6ca5..9ed9da0d268 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "CMake Module library for the ARPA2 project"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 1d01ef97f40..bcaa3e56507 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "minizinc"; inherit version; - buildInputs = [ cmake flex bison ]; + nativeBuildInputs = [ cmake flex bison ]; src = fetchFromGitHub { owner = "MiniZinc"; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index 1cabb1f0223..22942e2a658 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "automoc4-0.9.88"; - + pname = "automoc4"; + version = "0.9.88"; + src = fetchurl { - url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2"; + url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2"; sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"; }; - - buildInputs = [ cmake qt4 ]; - + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; + meta = with stdenv.lib; { homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 1ccd6c2ec4f..e54dc7844e7 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb-compat-0_1 libftdi ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 65bc8feab6b..c04a93eeee4 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: +{ stdenv, fetchurl, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { pname = "msgpack-tools"; version = "0.6"; @@ -32,8 +33,7 @@ stdenv.mkDerivation rec { cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz ''; - - buildInputs = [ cmake unzip ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Command-line tools for converting between MessagePack and JSON"; diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 2734cdd3596..c6da50288a7 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; }; - buildInputs = [ cmake liblaxjson freeimage ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ liblaxjson freeimage ]; meta = with stdenv.lib; { description = "Texture packer and resource bundler"; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index d44622e7e59..b76b4fe9809 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,9 +1,7 @@ -{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, - SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis, solarus, - qtbase, qttools, glm }: +{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs +, openal, libmodplug, libvorbis, solarus, qtbase, qttools, glm }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "solarus-quest-editor"; version = "1.6.4"; @@ -13,13 +11,13 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; }; - - buildInputs = [ cmake luajit SDL2 - SDL2_image SDL2_ttf physfs - openal libmodplug libvorbis - solarus qtbase qttools glm ]; - meta = with lib; { + nativeBuildInputs = [ cmake ]; + + buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal + libmodplug libvorbis solarus qtbase qttools glm ]; + + meta = with stdenv.lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; longDescription = '' Solarus is a game engine for Zelda-like ARPG games written in lua. @@ -31,5 +29,5 @@ mkDerivation rec { maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; }; - + } diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index cb2e6edd0e1..f02933e921e 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -47,8 +47,6 @@ in stdenv.mkDerivation { --replace "#if HAVE_LIBCOMPRESSION" "#if 0" ''; - enableParallelBuilding = true; - # TODO: instruct cmake not to put it in /usr, rather than cleaning up postInstall = '' mv $out/usr/* $out @@ -59,7 +57,8 @@ in stdenv.mkDerivation { cmakeFlags = [ "-GNinja" ]; - buildInputs = [ cmake zlib libxml2 libpng ninja ] + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib libxml2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; meta = with stdenv.lib; { diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 7f1ca325746..1882f5a9b68 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index ea8bddfa16d..98c31f4e9fe 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,24 +1,21 @@ -{stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib -, pkgconfig, unzip}: +{ stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: + stdenv.mkDerivation rec { - version = "1.0"; pname = "blobby-volley"; + version = "1.0"; src = fetchurl { url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image libGLU libGL cmake physfs boost zip zlib - unzip]; + nativeBuildInputs = [ cmake pkg-config zip ]; + buildInputs = [ SDL2 SDL2_image libGLU libGL physfs boost zlib ]; preConfigure='' sed -e '1i#include ' -i src/NetworkMessage.cpp ''; - inherit unzip; - postInstall = '' cp ../data/Icon.bmp "$out/share/blobby/" mv "$out/bin"/blobby{,.bin} @@ -26,13 +23,12 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/blobby" ''; - meta = { + meta = with stdenv.lib; { description = ''A blobby volleyball game''; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; homepage = "http://blobby.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; - inherit version; }; } diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index ac31de4e4c2..f8b90f87a72 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -14,10 +14,10 @@ mkDerivation rec { }; buildInputs = [ - cmake qtbase qtmultimedia protobuf qttools qtwebsockets + qtbase qtmultimedia protobuf qttools qtwebsockets ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; meta = { homepage = "https://github.com/Cockatrice/Cockatrice"; diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index d0cee8d76cf..39ee7af30f3 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -25,7 +25,8 @@ in stdenv.mkDerivation rec { substituteInPlace src/system/SysAccess.c --replace /usr/share $out/share ''; - buildInputs = [ cmake SDL qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL qt4 ]; meta = with stdenv.lib; { homepage = "http://www.holdingnuts.net/"; diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 89d75dd837f..4dfcc53d339 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { inherit src; inherit version; - buildInputs = [ cmake SDL2 fltk boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 fltk boost ]; patches = [ ./remove-rust-buildstep.patch @@ -41,8 +42,6 @@ stdenv.mkDerivation { cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; - enableParallelBuilding = true; - meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 53ffb4e4b2d..bab1279fb05 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchgit, cmake, libGLU, libGL, sfml, fribidi, taglib }: +{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, sfml, fribidi, taglib }: stdenv.mkDerivation rec { - name = "mars-${version}-${rev}"; + pname = "mars"; version = "0.7.5"; - rev = "c855d04409"; - src = fetchgit { - url = "https://github.com/thelaui/M.A.R.S..git"; - inherit rev; + + src = fetchFromGitHub { + owner = "thelaui"; + repo = "M.A.R.S."; + rev = "c855d044094a1d92317e38935d81ba938946132e"; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake libGLU libGL sfml fribidi taglib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index b7ab42ed730..0660d196f1e 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc +{ stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -28,17 +28,17 @@ stdenv.mkDerivation { sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out \ - -DBUILD_MEGAGLEST=On \ - -DBUILD_MEGAGLEST_MAP_EDITOR=On \ - -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ - -DBUILD_MEGAGLEST_MODEL_VIEWER=On - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=$out" + "-DBUILD_MEGAGLEST=On" + "-DBUILD_MEGAGLEST_MAP_EDITOR=On" + "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On" + "-DBUILD_MEGAGLEST_MODEL_VIEWER=On" + ]; postInstall = '' for i in $out/bin/*; do @@ -48,11 +48,11 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; homepage = "http://megaglest.org/"; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index 26462c1eef5..7005ef8512f 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi"; }; - buildInputs = [ cmake ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses ]; meta = with stdenv.lib; { description = "Space Invaders clone based on ncurses"; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 64b6c07f4a2..f0cb8120170 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: +{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkg-config }: stdenv.mkDerivation rec { pname = "opendungeons"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./cmakepaths.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ogre cegui boost sfml openal ois ]; 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"; homepage = "https://opendungeons.github.io"; - license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; + license = with licenses; [ gpl3Plus zlib mit cc-by-sa-30 cc0 ofl cc-by-30 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 66c9420591d..7bda06b8457 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib -, libxml2, pkgconfig, curl, cmake, libzip }: +, libxml2, pkg-config, curl, cmake, libzip }: stdenv.mkDerivation { name = "openlierox-0.58rc3"; @@ -28,8 +28,9 @@ stdenv.mkDerivation { cp -R ../share/gamedir/* $out/share/OpenLieroX ''; + nativeBuildInputs = [ cmake pkg-config curl ]; buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2 - pkgconfig curl cmake libzip ]; + libzip ]; meta = { homepage = "http://openlierox.net"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 22f3ea8d6ad..663e0ecc157 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 -, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: +{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 +, boost, cmake, SDL2, unshield, openal, libXt, pkg-config }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -10,7 +10,9 @@ let sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); -in mkDerivationWith stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { version = "0.46.0"; pname = "openmw"; @@ -23,8 +25,8 @@ in mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" @@ -33,7 +35,7 @@ in mkDerivationWith stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 16d0036b658..9f555b88bcb 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation { sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ boost cmake ffmpeg_3 freeglut glib gtk2 libjpeg libpng + [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal - pixman pkgconfig python27 SDL ]; + pixman python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 9aa51bf344e..89743c3cf3e 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, + pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU libGL boost + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; - meta = { + meta = with stdenv.lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = "http://rigsofrods.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 98a3ca88317..5b8650029aa 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig +{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkg-config , makeWrapper, enet, libXcursor, bullet, openal }: stdenv.mkDerivation rec { @@ -26,13 +26,11 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = "http://stuntrally.tuxfamily.org/"; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 35c0b828775..3eee4f17af1 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: -with stdenv.lib; - stdenv.mkDerivation rec { pname = "trackballs"; version = "1.3.2"; src = fetchFromGitHub { owner = "trackballs"; - repo = "trackballs"; + repo = pname; rev = "v${version}"; sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18="; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; - meta = { + meta = with stdenv.lib; { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 5fa91a0395c..5f0f867f183 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -1,37 +1,29 @@ {stdenv, fetchurl, libX11, imake, gccmakedep}: +stdenv.mkDerivation rec { + pname = "xskat"; + version = "4.0"; -let - s = # Generated upstream information - rec { - baseName="xskat"; - version="4.0"; - name="${baseName}-${version}"; + nativeBuildInputs = [ gccmakedep ]; + buildInputs = [ libX11 imake ]; - url="http://www.xskat.de/xskat-4.0.tar.gz"; - hash="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - sha256="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - }; - buildInputs = [ libX11 imake gccmakedep ]; -in - -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; src = fetchurl { - inherit (s) url sha256; + url = "http://www.xskat.de/xskat-${version }.tar.gz"; + sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; + preInstall = '' sed -i Makefile \ -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* MANPATH .*| MANPATH = $out/man|" ''; + installTargets = [ "install" "install.man" ]; - meta = { - inherit (s) version; + + meta = with stdenv.lib; { description = ''Famous german card game''; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.free; + platforms = platforms.unix; + license = licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = "http://www.xskat.de/"; }; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 03397bd244c..267944a8bfc 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # For pthread_cancel cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; - buildInputs = [ zlib SDL cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib SDL ]; meta = { homepage = "http://hatari.tuxfamily.org/"; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index fb8de9b6a71..8a35525b3e8 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,15 +6,15 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx SDL_net]; }; }; } - # Then you can install it by: + # Then you can install it by: # $ nix-env -i env-sdl - # And you can load it simply calling: + # And you can load it simply calling: # $ load-env-sdl # and this will update your env vars to have 'make' and 'gcc' finding the SDL # headers and libs. @@ -29,7 +29,7 @@ let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: pkgs.myEnvFun { inherit name; - buildInputs = buildInputs + buildInputs = buildInputs ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags; extraCmds = '' diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index b7b0e27ad46..fcd2e877b26 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs +{ stdenv, fetchFromGitHub, cmake, docutils, pkg-config, glib, libpthreadstubs , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { @@ -11,9 +11,8 @@ stdenv.mkDerivation { sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake docutils glib libpthreadstubs libXau - libXdmcp xcbutil ]; + nativeBuildInputs = [ cmake pkg-config docutils ]; + buildInputs = [ glib libpthreadstubs libXau libXdmcp xcbutil ]; meta = with stdenv.lib; { description = "Use external locker (such as i3lock) as X screen saver"; diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index 846831d0a87..ef9afafbcd3 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { cp src/libaks/include/* $out/include ''; - # buildInputs = [ cmake bison flex ]; - meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; license = licenses.gpl3; diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix index bd143b6071b..a5b4b2a52df 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation rec { rev = "f83b5a498bad8e9ff8916183cf6e8ccf677c346b"; sha256 = "1czkyyc9llq2mnqfp19mzcfsxzas0y8zrk0gr5hg60acna6jkz2l"; }; - buildInputs = [ cmake apple_sdk_sierra.sdk xnu-new ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ apple_sdk_sierra.sdk xnu-new ]; } diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 5f8ca7ac46f..f7182f24f81 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl -, cmake, pkgconfig, dbus, makeWrapper +, cmake, pkg-config, dbus, makeWrapper , gtest , boost , libcap @@ -55,11 +55,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + cmake + pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig dbus boost libcap gtest systemd mesa glib + dbus boost libcap gtest systemd mesa glib SDL2 SDL2_image protobuf protobufc properties-cpp lxc python libGL ]; diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index 5cccc82b843..5f87a89496b 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libxml2 }: @@ -19,11 +19,8 @@ stdenv.mkDerivation rec { ./uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch ]; - buildInputs = [ - cmake - pkgconfig - libxml2 - ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libxml2 ]; postPatch = '' substituteInPlace ./uvcdynctrl/CMakeLists.txt \ diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index e5024e6694e..4cd2e13e4a5 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "taskserver"; version = "1.1.0"; - enableParallelBuilding = true; - src = fetchurl { url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz"; sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v"; @@ -30,8 +28,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ cmake libuuid gnutls ]; + buildInputs = [ libuuid gnutls ]; + nativeBuildInputs = [ cmake makeWrapper ]; meta = { description = "Server for synchronising Taskwarrior clients"; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index c95d043106c..24a4c50813e 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkg-config , openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: let @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { hardeningDisable = ["format"]; cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; - nativeBuildInputs = [ pkgconfig cmake git ]; + nativeBuildInputs = [ pkg-config cmake git ]; buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ]; preConfigure = '' diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 46913525336..3089a0d5c99 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697"; }; - buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake bison perl ]; + buildInputs = [ ncurses openssl zlib libaio ]; cmakeFlags = [ "-DFEATURE_SET=community" diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 05c67b0ce1c..9f4f34e30e8 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd +{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index e2824bc07b6..23ea1c44dc3 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: +{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }: stdenv.mkDerivation rec { pname = "acoustid-fingerprinter"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qt4 taglib chromaprint ffmpeg ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ qt4 taglib chromaprint ffmpeg ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 251eee66f9c..e5d7a842e6c 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i"; }; - buildInputs = [cmake libcap zlib bzip2 perl]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcap zlib bzip2 perl ]; hardeningDisable = [ "format" ]; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { cdrkit is not affiliated with any of these authors; it is now an independent project. ''; - + homepage = "http://cdrkit.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 9e5ee52fca8..e187d49b783 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: +{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; shortRev = builtins.substring 0 7 rev; @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libtiff ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libtiff ]; propagatedBuildInputs = [ tesseract ]; meta = { diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index 9c18e4d69fe..e3d48702da8 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation { sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v"; }; - buildInputs = [ cmake ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index dfa7530ac64..2062a8442e6 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -5,9 +5,8 @@ with stdenv; { - enableParallelBuilding = true; - - buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ]; + nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 359d8b7abbe..13ea14e5e36 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ./prevent-kill-on-shutdown.patch ]; - buildInputs = [ cmake fuse ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fuse ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index e9e57595e3d..67e49936f5b 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, +{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, eigen, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper }: @@ -18,10 +18,11 @@ in stdenv.mkDerivation rec { rev = version; sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5"; }; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig boost_static guile eigen libpng python + boost_static guile eigen libpng python libGLU qt4 openexr openimageio opencolorio xercesc - osl seexpr makeWrapper + osl seexpr ]; NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index b8c344258bb..7c55b6558a4 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu , wrapGAppsHook @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ - cmake gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3afb6ebd987..29aea9d5097 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 +{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre @@ -30,17 +30,17 @@ in stdenv.mkDerivation { inherit sha256; }; + nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ]; buildInputs = - [ embree2 pkgconfig cmake zlib boost_static libjpeg + [ embree2 zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc libGLU pcre bison - flex libX11 libpthreadstubs python libXdmcp libxkbcommon - epoxy at-spi2-core dbus doxygen + tbb qt5.full c-blosc libGLU pcre + libX11 libpthreadstubs python libXdmcp libxkbcommon + epoxy at-spi2-core dbus # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.adwaita-icon-theme - makeWrapper (stdenv.lib.getLib dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 9a52d453185..3e2f9484b19 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib +{ stdenv, fetchFromGitHub, cmake, pkg-config, opencv, zlib , libxml2, freetype, libjpeg, libtiff, swig, openexr , ilmbase, boost165 , withPython ? true, python3 @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff + boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase ] ++ stdenv.lib.optional withPython python3; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index d1e7f85f75f..d8438abe611 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }: +{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-anthy"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx anthy gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx anthy gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index d9b202f7ef1..c934724ff48 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }: +{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-chewing"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext libchewing ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext libchewing ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 043b4438b3c..813b995da51 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }: +{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, curl }: stdenv.mkDerivation rec { pname = "fcitx-cloudpinyin"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ai347wv3qdjzcbh0j9hdjpzwvh2kk57324xbxq37nzagrdgg5x0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext curl ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext curl ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index c9a40b84a6d..d6424bdee30 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }: +{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-hangul"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx libhangul gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx libhangul gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 02724a94be3..e9f7511abdb 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: +{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev fcitx gettext libpinyin glib pcre dbus ]; # With a typical installation via NixOS option i18n.inputMethod.fcitx.engines, # the FCITXDIR environment variable is set to $out of fcitx-with-plugins, diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index 8b25b2846ff..ed0aa2e79d5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }: +{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-m17n"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext m17n_lib m17n_db ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext m17n_lib m17n_db ]; preInstall = '' substituteInPlace im/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 1410dcc1f1c..5b1ed99bb7e 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: +{ stdenv, fetchurl, cmake, pkg-config, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "fcitx-rime"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix index 833e417ae91..3ec639a05cc 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef"; }; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fcitx gettext ]; preInstall = '' substituteInPlace tables/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index ffee83875a1..970c57a3f4a 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq"; }; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fcitx gettext ]; preInstall = '' substituteInPlace tables/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 1deff93e201..91702b50913 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }: +{ stdenv, fetchurl, cmake, fcitx, gettext, pkg-config }: stdenv.mkDerivation rec { pname = "fcitx-unikey"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fcitx gettext ]; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace data/cmake_install.cmake \ --replace ${fcitx} $out ''; - + meta = with stdenv.lib; { isFcitxEngine = true; homepage = "https://github.com/fcitx/fcitx-unikey"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index ae9d8d0f53f..1fd6f2daf2e 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' @@ -32,4 +31,3 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"; ''; } - diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 316593990d9..402013d8c5d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, pkgconfig, ibus, ibus-table, python3, cmake }: +{ stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }: let src = fetchFromGitHub { @@ -51,7 +51,8 @@ in stdenv.mkDerivation { rm -rf $HOME ''; - buildInputs = [ pkgconfig ibus ibus-table python3 cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ibus ibus-table python3 ]; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 4e6b92f77c5..709462c5e96 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: +{ stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }: stdenv.mkDerivation rec { pname = "ibus-qt"; @@ -9,10 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - ibus cmake qt4 icu doxygen - ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; + buildInputs = [ ibus qt4 icu ]; cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index b58f603ce59..a42e6c4a428 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; - buildInputs = [ boost clasp cmake gringo re2c ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost clasp gringo re2c ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 203735d79b0..95a9d6f98f8 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # https://gitlab.linphone.org/BC/public/bcunit/issues/1 version = "unstable-2019-11-19"; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 04a89ec3dd0..024572eaa7a 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake} : +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = stdenv.lib.platforms.all; + license = licenses.publicDomain; + maintainers = with maintainers; [ kovirobi ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index bb1bf6b0a37..13b143559e9 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: +{ stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation { pname = "sdl-jstest"; @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = [ SDL SDL2 ncurses ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; - + nativeBuildInputs = [ cmake pkg-config docbook_xsl git ]; + meta = with stdenv.lib; { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index abac98d855f..8ed0455a33e 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libgsf, glib, libxml2 }: +{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index c9ebc12b0db..ab898a86936 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash, debug ? false}: +{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -10,15 +10,15 @@ let sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; - buildInputs = [ - cmake openssl nss nspr - ]; + compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ pkgconfig ]; - inherit buildInputs; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + openssl nss nspr + ]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 9468ee2843b..7474cb0715d 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { sed -i 's,/etc,'$out'/etc,' doc/user/tool_suite_haka.rst ''; - buildInputs = [ cmake swig wireshark check rsync libpcap gawk libedit pcre ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ swig wireshark check rsync libpcap gawk libedit pcre ]; enableParallelBuilding = true; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 2a6af785692..b69ae66e1e2 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: +{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { name = "ebook-tools-0.2.2"; @@ -8,18 +8,19 @@ stdenv.mkDerivation rec { sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libxml2 libzip ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libxml2 libzip ]; - preConfigure = + preConfigure = '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index ecadb4a89d8..37d7577dfe6 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, cmake, protobuf }: + stdenv.mkDerivation rec { pname = "jumanpp"; version = "2.0.0-rc2"; @@ -7,7 +8,8 @@ stdenv.mkDerivation rec { url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; - buildInputs = [ cmake protobuf ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; meta = with stdenv.lib; { description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; From fcbc6c84e5c9a2ddc1ad18396636daf45c04a17c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 31 Dec 2020 23:11:09 +0700 Subject: [PATCH 187/211] sorcer: update license --- pkgs/applications/audio/sorcer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 03c19a0db2a..b20188bfb47 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; From 863054f9da86c21df62a856fe0bfdfe109a60f36 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 1 Jan 2021 19:44:58 +0700 Subject: [PATCH 188/211] firehol: move patches into files --- .../networking/firehol/default.nix | 66 +++---------------- .../networking/firehol/firehol-ping6.patch | 29 ++++++++ .../firehol/firehol-sysconfdir.patch | 5 ++ .../firehol/firehol-uname-command.patch | 11 ++++ 4 files changed, 53 insertions(+), 58 deletions(-) create mode 100644 pkgs/applications/networking/firehol/firehol-ping6.patch create mode 100644 pkgs/applications/networking/firehol/firehol-sysconfdir.patch create mode 100644 pkgs/applications/networking/firehol/firehol-uname-command.patch diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index de523b14ba6..83f4d267f95 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -20,69 +20,19 @@ stdenv.mkDerivation rec { patches = [ # configure tries to determine if `ping6` or the newer, combined # `ping` is installed by using `ping -6` which would fail. - (pkgs.writeText "firehol-ping6.patch" - '' - --- a/m4/ax_check_ping_ipv6.m4 - +++ b/m4/ax_check_ping_ipv6.m4 - @@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], - - AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], - [ - - ac_cv_ping_6_opt=no - - if test -n "$PING"; then - - echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - - $PING -6 -c 1 ::1 > conftest.out 2>&1 - - if test "$?" = 0; then - - ac_cv_ping_6_opt=yes - - fi - - cat conftest.out >&AS_MESSAGE_LOG_FD - - rm -f conftest.out - - fi - + ac_cv_ping_6_opt=yes - + #if test -n "$PING"; then - + # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD - + # $PING -6 -c 1 ::1 > conftest.out 2>&1 - + # if test "$?" = 0; then - + # ac_cv_ping_6_opt=yes - + # fi - + # cat conftest.out >&AS_MESSAGE_LOG_FD - + # rm -f conftest.out - + #fi - ]) - - AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ - '') + ./firehol-ping6.patch # put firehol config files in /etc/firehol (not $out/etc/firehol) # to avoid error on startup, see #35114 - (pkgs.writeText "firehol-sysconfdir.patch" - '' - --- a/sbin/install.config.in.in - +++ b/sbin/install.config.in.in - @@ -4 +4 @@ - -SYSCONFDIR="@sysconfdir_POST@" - +SYSCONFDIR="/etc" - '') + ./firehol-sysconfdir.patch - # we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname - # will be interpreted as IFS -> error. this might be considered an upstream bug - # but only appears when there are dashes in the command path - (pkgs.writeText "firehol-uname-command.patch" - '' - --- a/sbin/firehol - +++ b/sbin/firehol - @@ -10295,7 +10295,7 @@ - kmaj=$1 - kmin=$2 - - - set -- $($UNAME_CMD -r) - + set -- $("$UNAME_CMD" -r) - eval $kmaj=\$1 $kmin=\$2 - } - kernel_maj_min KERNELMAJ KERNELMIN - '') + # we must quote "$UNAME_CMD", or the dash in + # /nix/store/...-coreutils-.../bin/uname will be interpreted as + # IFS -> error. this might be considered an upstream bug but only + # appears when there are dashes in the command path + ./firehol-uname-command.patch ]; - + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ curl iprange iproute ipset iptables iputils kmod diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/applications/networking/firehol/firehol-ping6.patch new file mode 100644 index 00000000000..7e06e503ef6 --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-ping6.patch @@ -0,0 +1,29 @@ +--- a/m4/ax_check_ping_ipv6.m4 ++++ b/m4/ax_check_ping_ipv6.m4 +@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], + + AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], + [ +- ac_cv_ping_6_opt=no +- if test -n "$PING"; then +- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD +- $PING -6 -c 1 ::1 > conftest.out 2>&1 +- if test "$?" = 0; then +- ac_cv_ping_6_opt=yes +- fi +- cat conftest.out >&AS_MESSAGE_LOG_FD +- rm -f conftest.out +- fi ++ ac_cv_ping_6_opt=yes ++ #if test -n "$PING"; then ++ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD ++ # $PING -6 -c 1 ::1 > conftest.out 2>&1 ++ # if test "$?" = 0; then ++ # ac_cv_ping_6_opt=yes ++ # fi ++ # cat conftest.out >&AS_MESSAGE_LOG_FD ++ # rm -f conftest.out ++ #fi + ]) + + AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch new file mode 100644 index 00000000000..c541dd585ac --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-sysconfdir.patch @@ -0,0 +1,5 @@ +--- a/sbin/install.config.in.in ++++ b/sbin/install.config.in.in +@@ -4,1 +4,1 @@ +-SYSCONFDIR="@sysconfdir_POST@" ++SYSCONFDIR="/etc" diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/applications/networking/firehol/firehol-uname-command.patch new file mode 100644 index 00000000000..92ab4cd9321 --- /dev/null +++ b/pkgs/applications/networking/firehol/firehol-uname-command.patch @@ -0,0 +1,11 @@ +--- a/sbin/firehol ++++ b/sbin/firehol +@@ -10295,7 +10295,7 @@ + kmaj=$1 + kmin=$2 + +- set -- $($UNAME_CMD -r) ++ set -- $("$UNAME_CMD" -r) + eval $kmaj=\$1 $kmin=\$2 + } + kernel_maj_min KERNELMAJ KERNELMIN From 3496ce2a0c9dede15f05b25c8560eb702acc72bd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 1 Jan 2021 20:46:40 +0700 Subject: [PATCH 189/211] treewide: remove trailing whitespaces --- .../audio/aj-snapshot/default.nix | 6 ++-- .../audio/jack-oscrolloscope/default.nix | 2 +- pkgs/applications/audio/jackmeter/default.nix | 2 +- .../applications/blockchains/bitcoin-gold.nix | 2 +- pkgs/applications/blockchains/pivx.nix | 4 +-- .../display-managers/ly/default.nix | 6 ++-- pkgs/applications/editors/dhex/default.nix | 2 +- .../session-management-for-emacs/default.nix | 6 ++-- .../editors/kdevelop5/kdevelop-pg-qt.nix | 4 +-- .../editors/monodevelop/default.nix | 2 +- .../graphics/apitrace/default.nix | 6 ++-- .../applications/graphics/drawing/default.nix | 2 +- pkgs/applications/graphics/fstl/default.nix | 2 +- pkgs/applications/graphics/kcc/default.nix | 2 +- .../sane/backends/brscan4/default.nix | 2 +- .../misc/audio/wavrsocvt/default.nix | 2 +- pkgs/applications/misc/candle/default.nix | 2 +- .../deadd-notification-center/default.nix | 2 +- pkgs/applications/misc/fme/default.nix | 2 +- .../misc/fusee-interfacee-tk/default.nix | 32 +++++++++---------- .../extractWinRscIconsToStdFreeDesktopDir.sh | 2 +- .../misc/minergate-cli/default.nix | 2 +- .../applications/misc/nanoblogger/default.nix | 2 +- pkgs/applications/misc/phwmon/default.nix | 4 +-- .../applications/misc/playonlinux/default.nix | 4 +-- pkgs/applications/misc/sleepyhead/default.nix | 2 +- pkgs/applications/misc/ssocr/default.nix | 2 +- .../misc/xrandr-invert-colors/default.nix | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index f781aad905d..2a2e15d9849 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; longDescription = '' - Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. - Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. - ALSA, on the other hand, only provides routing facilities for MIDI clients. + Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. + Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. + ALSA, on the other hand, only provides routing facilities for MIDI clients. You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 08263f2abdd..18915329ca9 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv jack_oscrolloscope $out/bin/ ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "A simple waveform viewer for JACK"; homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2a75b384af5..d049cf81b11 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ]; - meta = { + meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7205e882c31..c108304ee37 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - + pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; version = "0.15.2"; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 6d6f881ae65..eb4651e586e 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -4,7 +4,7 @@ , util-linux, qtbase ? null, qttools ? null , enableUpnp ? false , disableWallet ? false -, disableDaemon ? false +, disableDaemon ? false , withGui ? false }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ optionals withGui [ "--with-gui=yes" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - + enableParallelBuilding = true; doChecks = true; postBuild = '' diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index f16dd62bb1a..d36c5418932 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ly"; version = "0.2.1"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { rev = version; sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; fetchSubmodules = true; - }; + }; buildInputs = [ linux-pam ]; makeFlags = [ "FLAGS=-Wno-error" ]; installPhase = '' mkdir -p $out/bin - cp bin/ly $out/bin + cp bin/ly $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 0a635b7ba82..c4f43e71fe6 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index e4b739af051..61749a89fde 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; - + src = fetchurl { url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; buildInputs = [emacs]; - + installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = { /* installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index ad83bd43af2..40e46d9295f 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -7,14 +7,14 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - + buildInputs = [ qtbase ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 3a21eec07f4..527228742c4 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > + > EOF done diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e6865d2d8f0..84a00544531 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. # `RUNPATH` doesn't propagate throughout the whole application, but only # from the module performing the `dlopen()`. - # + # # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` # files in $out/lib/apitrace/wrappers. - # + # # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` # and other dispatcher libraries, and run `dlopen()` by themselves. - # + # # As `RUNPATH` doesn't propagate through the whole library, and they're now the # library doing the real `dlopen()`, they also need to have # `/run-opengl-driver[-32]` added to their `RUNPATH`. diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index fb68276b168..a0d28689ae7 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.4.13"; format = "other"; - + src = fetchFromGitHub { owner = "maoschanz"; repo = pname; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c96ea765d43..75c43f06d2c 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { preBuild = '' qmake qt/fstl.pro ''; - + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index da358918972..bbbd4ed351b 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "KindleComicConverter"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; - + propagatedBuildInputs = with python3Packages ; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 2ada41ac98a..4ad5c24ddd6 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { name = "brscan4-0.4.8-1"; - src = + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index ebb04a30ab8..7f8ff3d6d21 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' - tar -zxf $src + tar -zxf $src ''; installPhase = '' diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 842ef2262d9..eb4ac9c9b34 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - + sourceRoot = "source/src"; installPhase = '' diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 98fe799b110..00820874bce 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp $src $out/bin/deadd-notification-center chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 34d5a45b8ea..5af6ae03f24 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; - + src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index 91a7b0ed37f..90ab3b11c13 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -1,40 +1,40 @@ -{ stdenv , fetchFromGitHub , python3 , makeWrapper }: +{ stdenv , fetchFromGitHub , python3 , makeWrapper }: -let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); -in stdenv.mkDerivation rec { +let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); +in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; version = "1.0.1"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "nh-server"; repo = pname; - rev = "V${version}"; + rev = "V${version}"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' + installPhase = '' mkdir -p $out/bin - - # The program isn't just called app, so I'm renaming it based on the repo name + + # The program isn't just called app, so I'm renaming it based on the repo name # It also isn't a standard program, so we need to append the shebang to the top - echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk + echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk cat app.py >> $out/bin/fusee-interfacee-tk - chmod +x $out/bin/fusee-interfacee-tk - - # app.py depends on these to run - cp *.py $out/bin/ + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ cp intermezzo.bin $out/bin/intermezzo.bin ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; - longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; maintainers = with maintainers; [ kristian-brucaj ]; license = licenses.gpl2; }; -} +} diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh index 04485b146a0..dec7367379e 100755 --- a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh @@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 61b900c4012..67ce5326286 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index cf7689367bd..a4969a34a86 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out - cat > $out/bin/nb << EOF + cat > $out/bin/nb << EOF #!${bash}/bin/bash $out/nb "\$@" EOF diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 017383a79a2..5800bcebef9 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; - + patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" ''; - + installPhase = '' mkdir -p $out/bin $out/share/applications ./install.sh diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3acb7754505..42412820c48 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = stdenv.lib.makeBinPath [ cabextract python gettext @@ -70,7 +70,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + buildInputs = [ xorg.libX11 libGL python diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 17c5ec9be26..56063c737ab 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -24,7 +24,7 @@ in mkDerivation { patchPhase = '' patchShebangs configure ''; - + installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications cp -r sleepyhead/SleepyHead.app $out/Applications diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index c52573785ef..d3a5eb7ec24 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; }; - nativeBuildInputs = [ imlib2 libX11 ]; + nativeBuildInputs = [ imlib2 libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 9d57b4fcfac..dabdad137af 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -22,5 +22,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; - }; + }; } From 16cf68dc7acd1503cb43cb28897143c4c26c21d0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jan 2021 20:08:54 +0100 Subject: [PATCH 190/211] mesa: 20.3.1 -> 20.3.2 (#108152) This also applies the macOS patch unconditionally to avoid breakages in the future. --- pkgs/development/libraries/mesa/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c96d1edfadf..55264888e2a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.1"; + version = "20.3.2"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "03vqm9kqrcpijg6bxldj0bg360z8d7c767n3b16jdc1apd4inxdg"; + sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; }; prePatch = "patchShebangs ."; @@ -65,10 +65,9 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # Fix for pre macOS SDK 10.13 - # TODO(r-burns) can be applied unconditionally, at the cost of a mass linux rebuild - (fetchpatch { + # Fix for pre macOS SDK 10.13: + (fetchpatch { # util: Disable memstream for Apple builds + # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; }) From 9dd208fa6e72939ec11b1b2b4aed444535e8ed6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Jan 2021 20:39:05 +0100 Subject: [PATCH 191/211] python3Packages.pep517: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index a5636656984..90dc5046199 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8e6199cf1288d48a0c44057f112acf18aa5ebabbf73faa242f598fbe145ba29e"; + sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"; }; nativeBuildInputs = [ From 494ed4d6ee6f3d3b25a0b5d45f3f9e8dd1c45ccf Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 26 Dec 2020 16:55:33 +0100 Subject: [PATCH 192/211] systemd: patch runtime dlopen calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location). --- pkgs/os-specific/linux/systemd/default.nix | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e6cb589c9bf..2822bffdb51 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -160,6 +160,90 @@ stdenv.mkDerivation { --replace \ "find_program('objcopy'" \ "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" + '' + (let + + # The folllowing dlopen patches ensure that all the features that are + # implemented via dlopen(3) are available (or explicitly deactivated) by + # pointing dlopen to the absolute store path instead of relying on the + # linkers runtime lookup code. + # + # All of the dlopen calls have to be handled. When new ones are introduced + # by upstream (or one of our patches) they must be explicitly declared, + # otherwise the build will fail. + # + # As of systemd version 247 we've seen a few errors like `libpcre2.… not + # found` when using e.g. --grep with journalctl. Those errors should + # become less unexpected now. + # + # There are generally two classes of dlopen(3) calls. Those that we want to + # support and those that should be deactivated / unsupported. This change + # enforces that we handle all dlopen calls explicitly. Meaning: There is + # not a single dlopen call in the source code tree that we did not + # explicitly handle. + # + # In order to do this we introduced a list of attributes that maps from + # shared object name to the package that contains them. The package can be + # null meaning the reference should be nuked and the shared object will + # never be loadable during runtime (because it points at an invalid store + # path location). + # + # To get a list of dynamically loaded libraries issue something like + # `grep -ri 'dlopen("lib' $src` and update the below list. + dlopenLibs = [ + # We did never provide support for libxkbcommon & qrencode + { name = "libxkbcommon.so.0"; pkg = null; } + { name = "libqrencode.so.4"; pkg = null; } + + # We did not provide libpwquality before so it is safe to disable it for + # now. + { name = "libpwquality.so.1"; pkg = null; } + + # Only include cryptsetup if it is enabled. We might not be able to + # provide it during "bootstrap" in e.g. the minimal systemd build as + # cryptsetup has udev (aka systemd) in it's dependencies. + { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } + + # We are using libidn2 so we only provide that and ignore the others. + # Systemd does this decision during configure time and uses ifdef's to + # enable specific branches. We can safely ignore (nuke) the libidn "v1" + # libraries. + { name = "libidn2.so.0"; pkg = libidn2; } + { name = "libidn.so.12"; pkg = null; } + { name = "libidn.so.11"; pkg = null; } + + # journalctl --grep requires libpcre so lets provide it + { name = "libpcre2-8.so.0"; pkg = pcre2; } + ]; + + patchDlOpen = dl: let + library = "${lib.makeLibraryPath [dl.pkg]}/${dl.name}"; + in if dl.pkg == null then '' + # remove the dependency on the library by replacing it with an invalid path + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' + done + '' else '' + # ensure that the library we provide actually exists + if ! [ -e ${library} ]; then + echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`' + exit 1 + fi + # make the path to the dependency explicit + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' + done + ''; + in # patch all the dlopen calls to contain absolute paths to the libraries + lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs) + # finally ensure that there are no left-over dlopen calls that we didn't handle + + '' + if grep -qr 'dlopen("[^/]' src; then + echo "Found unhandled dlopen calls: " + grep -r 'dlopen("[^/]' src + exit 1 + fi ''; outputs = [ "out" "man" "dev" ]; From 37539e776833f9d89c8bdff95208a09d5eb0e30b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 26 Dec 2020 17:03:34 +0100 Subject: [PATCH 193/211] nixos/tests/systemd-journal: ensure that --grep works Previously, after the version bump to v247, we broke journalctl --grep as libpcre2 was lazily loaded during runtime using dlopen(3). This ensures that we have a test case that alerts us when it fails again. --- nixos/tests/systemd-journal.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index c50c151ae10..b0a3f62ce1c 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -13,6 +13,8 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' machine.wait_for_unit("multi-user.target") + machine.succeed("journalctl --grep=systemd") + machine.succeed( "${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'" ) From 3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 3 Jan 2021 16:43:56 +0700 Subject: [PATCH 194/211] treewide: remove enableParallelBuilding = true if using cmake --- pkgs/applications/audio/cantata/default.nix | 2 -- pkgs/applications/audio/clementine/default.nix | 4 +--- pkgs/applications/audio/csound/default.nix | 2 -- pkgs/applications/audio/kid3/default.nix | 2 -- pkgs/applications/audio/lmms/default.nix | 1 - pkgs/applications/audio/qmmp/default.nix | 2 -- pkgs/applications/audio/radiotray-ng/default.nix | 2 -- pkgs/applications/audio/rosegarden/default.nix | 2 -- pkgs/applications/audio/soundkonverter/default.nix | 2 +- pkgs/applications/audio/traverso/default.nix | 1 - pkgs/applications/blockchains/bitcoin-abc.nix | 2 -- pkgs/applications/blockchains/dero.nix | 2 -- pkgs/applications/blockchains/masari.nix | 2 -- pkgs/applications/blockchains/sumokoin.nix | 2 -- pkgs/applications/editors/aseprite/default.nix | 2 -- pkgs/applications/editors/neovim/default.nix | 1 - pkgs/applications/editors/neovim/qt.nix | 2 -- pkgs/applications/editors/rstudio/default.nix | 2 -- pkgs/applications/editors/sigil/default.nix | 2 -- pkgs/applications/editors/texmacs/default.nix | 2 -- pkgs/applications/graphics/antimony/default.nix | 2 -- pkgs/applications/graphics/digikam/default.nix | 2 -- pkgs/applications/graphics/hugin/default.nix | 2 -- pkgs/applications/graphics/kgraphviewer/default.nix | 2 -- pkgs/applications/graphics/meshlab/default.nix | 2 -- pkgs/applications/graphics/nomacs/default.nix | 2 -- pkgs/applications/graphics/photivo/default.nix | 2 -- pkgs/applications/graphics/photoqt/default.nix | 2 -- pkgs/applications/graphics/rawtherapee/default.nix | 2 -- pkgs/applications/graphics/renderdoc/default.nix | 2 -- pkgs/applications/graphics/scantailor/default.nix | 2 -- pkgs/applications/graphics/solvespace/default.nix | 1 - pkgs/applications/misc/albert/default.nix | 2 -- pkgs/applications/misc/blender/default.nix | 2 -- pkgs/applications/misc/elf-dissector/default.nix | 2 -- pkgs/applications/misc/far2l/default.nix | 2 -- pkgs/applications/misc/gammu/default.nix | 2 -- pkgs/applications/misc/lenmus/default.nix | 2 -- pkgs/applications/misc/opentx/default.nix | 2 -- pkgs/applications/misc/prusa-slicer/default.nix | 2 -- pkgs/applications/misc/pwsafe/default.nix | 1 - pkgs/applications/misc/qlandkartegt/default.nix | 2 -- pkgs/applications/misc/qlandkartegt/garmindev.nix | 2 -- pkgs/applications/misc/qolibri/default.nix | 2 -- pkgs/applications/misc/qsyncthingtray/default.nix | 2 -- pkgs/applications/misc/slade/default.nix | 2 -- pkgs/applications/misc/slade/git.nix | 2 -- pkgs/applications/misc/subsurface/default.nix | 2 -- pkgs/applications/misc/tasksh/default.nix | 2 -- pkgs/applications/misc/timewarrior/default.nix | 2 -- pkgs/applications/misc/xsuspender/default.nix | 2 -- pkgs/applications/networking/browsers/falkon/default.nix | 2 -- pkgs/applications/networking/ids/zeek/default.nix | 2 -- .../networking/instant-messengers/psi/default.nix | 1 - .../instant-messengers/telegram/tdesktop/default.nix | 2 -- pkgs/applications/networking/irc/quassel/default.nix | 2 -- pkgs/applications/networking/owncloud-client/default.nix | 2 -- pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 2 -- pkgs/applications/networking/p2p/ktorrent/default.nix | 2 -- pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 -- .../applications/networking/sniffers/wireshark/default.nix | 2 -- pkgs/applications/office/gnucash/default.nix | 2 -- pkgs/applications/office/kmymoney/default.nix | 2 -- pkgs/applications/office/ledger/default.nix | 2 -- pkgs/applications/office/scribus/default.nix | 2 -- pkgs/applications/office/scribus/unstable.nix | 2 -- pkgs/applications/radio/dsd/default.nix | 2 -- pkgs/applications/radio/gnss-sdr/default.nix | 7 ++----- pkgs/applications/radio/gnuradio/ais.nix | 2 -- pkgs/applications/radio/gnuradio/gsm.nix | 2 -- pkgs/applications/radio/gnuradio/limesdr.nix | 2 -- pkgs/applications/radio/gnuradio/nacl.nix | 2 -- pkgs/applications/radio/gnuradio/osmosdr.nix | 2 -- pkgs/applications/radio/gnuradio/rds.nix | 2 -- pkgs/applications/radio/gqrx/default.nix | 2 -- pkgs/applications/radio/svxlink/default.nix | 1 - pkgs/applications/radio/uhd/default.nix | 2 -- pkgs/applications/radio/welle-io/default.nix | 2 -- pkgs/applications/science/biology/EZminc/default.nix | 2 -- pkgs/applications/science/biology/ants/default.nix | 2 -- pkgs/applications/science/biology/dcm2niix/default.nix | 1 - pkgs/applications/science/biology/megahit/default.nix | 2 -- pkgs/applications/science/biology/messer-slim/default.nix | 7 ++----- pkgs/applications/science/biology/minc-tools/default.nix | 2 -- pkgs/applications/science/biology/niftyreg/default.nix | 1 - pkgs/applications/science/biology/niftyseg/default.nix | 1 - pkgs/applications/science/biology/obitools/obitools3.nix | 2 -- pkgs/applications/science/chemistry/d-seams/default.nix | 1 - pkgs/applications/science/chemistry/openmolcas/default.nix | 2 -- .../applications/science/electronics/appcsxcad/default.nix | 2 -- pkgs/applications/science/electronics/caneda/default.nix | 2 -- pkgs/applications/science/electronics/csxcad/default.nix | 2 -- pkgs/applications/science/electronics/dsview/default.nix | 2 -- pkgs/applications/science/electronics/openems/default.nix | 2 -- pkgs/applications/science/logic/abc/default.nix | 1 - pkgs/applications/science/logic/cvc4/default.nix | 3 --- pkgs/applications/science/logic/fast-downward/default.nix | 2 -- pkgs/applications/science/logic/lean/default.nix | 1 - pkgs/applications/science/logic/stp/default.nix | 3 --- .../science/machine-learning/shogun/default.nix | 2 -- pkgs/applications/science/math/caffe/default.nix | 2 -- pkgs/applications/science/math/cntk/default.nix | 2 -- pkgs/applications/science/math/mxnet/default.nix | 2 -- pkgs/applications/science/misc/openmodelica/default.nix | 2 -- pkgs/applications/science/misc/openmvs/default.nix | 2 -- pkgs/applications/science/misc/root/5.nix | 2 -- pkgs/applications/science/misc/root/default.nix | 2 -- pkgs/applications/science/misc/simgrid/default.nix | 2 -- pkgs/applications/science/physics/elmerfem/default.nix | 2 -- pkgs/applications/video/kodi/default.nix | 3 --- pkgs/data/themes/kde2/default.nix | 1 - pkgs/data/themes/qtcurve/default.nix | 2 -- pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix | 2 -- pkgs/development/compilers/glslang/default.nix | 1 - pkgs/development/compilers/julia/1.0.nix | 2 -- pkgs/development/compilers/julia/1.3.nix | 2 -- pkgs/development/compilers/julia/1.5.nix | 2 -- pkgs/development/compilers/ldc/generic.nix | 2 -- pkgs/development/compilers/llvm/10/clang/default.nix | 2 -- pkgs/development/compilers/llvm/10/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/10/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/10/libunwind.nix | 2 -- pkgs/development/compilers/llvm/10/lld.nix | 2 -- pkgs/development/compilers/llvm/10/lldb.nix | 2 -- pkgs/development/compilers/llvm/10/llvm.nix | 2 -- pkgs/development/compilers/llvm/10/openmp.nix | 2 -- pkgs/development/compilers/llvm/11/clang/default.nix | 2 -- pkgs/development/compilers/llvm/11/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/11/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/11/libunwind.nix | 2 -- pkgs/development/compilers/llvm/11/lld.nix | 2 -- pkgs/development/compilers/llvm/11/lldb.nix | 2 -- pkgs/development/compilers/llvm/11/llvm.nix | 2 -- pkgs/development/compilers/llvm/11/openmp.nix | 2 -- pkgs/development/compilers/llvm/5/clang/default.nix | 2 -- pkgs/development/compilers/llvm/5/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/5/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/5/lld.nix | 2 -- pkgs/development/compilers/llvm/5/lldb.nix | 2 -- pkgs/development/compilers/llvm/5/llvm.nix | 2 -- pkgs/development/compilers/llvm/5/openmp.nix | 2 -- pkgs/development/compilers/llvm/6/clang/default.nix | 2 -- pkgs/development/compilers/llvm/6/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/6/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/6/lld.nix | 2 -- pkgs/development/compilers/llvm/6/lldb.nix | 2 -- pkgs/development/compilers/llvm/6/llvm.nix | 2 -- pkgs/development/compilers/llvm/6/openmp.nix | 2 -- pkgs/development/compilers/llvm/7/clang/default.nix | 2 -- pkgs/development/compilers/llvm/7/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/7/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/7/lld.nix | 2 -- pkgs/development/compilers/llvm/7/lldb.nix | 2 -- pkgs/development/compilers/llvm/7/llvm.nix | 2 -- pkgs/development/compilers/llvm/7/openmp.nix | 2 -- pkgs/development/compilers/llvm/8/clang/default.nix | 2 -- pkgs/development/compilers/llvm/8/compiler-rt.nix | 1 - pkgs/development/compilers/llvm/8/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/8/libunwind.nix | 2 -- pkgs/development/compilers/llvm/8/lld.nix | 2 -- pkgs/development/compilers/llvm/8/lldb.nix | 2 -- pkgs/development/compilers/llvm/8/llvm.nix | 2 -- pkgs/development/compilers/llvm/8/openmp.nix | 2 -- pkgs/development/compilers/llvm/9/clang/default.nix | 2 -- pkgs/development/compilers/llvm/9/compiler-rt.nix | 2 -- pkgs/development/compilers/llvm/9/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/9/libunwind.nix | 2 -- pkgs/development/compilers/llvm/9/lld.nix | 2 -- pkgs/development/compilers/llvm/9/lldb.nix | 2 -- pkgs/development/compilers/llvm/9/llvm.nix | 2 -- pkgs/development/compilers/llvm/9/openmp.nix | 2 -- pkgs/development/compilers/lobster/default.nix | 1 - pkgs/development/compilers/mono/llvm.nix | 2 -- pkgs/development/compilers/nextpnr/default.nix | 1 - pkgs/development/compilers/ponyc/default.nix | 2 -- pkgs/development/compilers/squeak/default.nix | 2 -- pkgs/development/interpreters/supercollider/default.nix | 6 ++---- pkgs/development/libraries/alembic/default.nix | 2 -- pkgs/development/libraries/arrayfire/default.nix | 2 -- pkgs/development/libraries/audio/mbelib/default.nix | 2 -- pkgs/development/libraries/avro-c++/default.nix | 2 -- pkgs/development/libraries/avro-c/default.nix | 2 -- pkgs/development/libraries/beignet/default.nix | 4 ---- pkgs/development/libraries/boringssl/default.nix | 1 - pkgs/development/libraries/bullet/default.nix | 2 -- pkgs/development/libraries/bullet/roboschool-fork.nix | 2 -- pkgs/development/libraries/c-blosc/default.nix | 2 -- pkgs/development/libraries/cpp-hocon/default.nix | 2 -- pkgs/development/libraries/criterion/default.nix | 2 -- pkgs/development/libraries/curlpp/default.nix | 1 - pkgs/development/libraries/dlib/default.nix | 1 - pkgs/development/libraries/doctest/default.nix | 2 -- pkgs/development/libraries/double-conversion/default.nix | 2 -- pkgs/development/libraries/draco/default.nix | 2 -- pkgs/development/libraries/drumstick/default.nix | 2 -- pkgs/development/libraries/eccodes/default.nix | 2 -- pkgs/development/libraries/fcppt/default.nix | 2 -- pkgs/development/libraries/flatbuffers/default.nix | 1 - pkgs/development/libraries/freeglut/default.nix | 2 -- pkgs/development/libraries/freetds/default.nix | 2 -- pkgs/development/libraries/gbenchmark/default.nix | 1 - pkgs/development/libraries/git2/default.nix | 2 -- pkgs/development/libraries/glfw/3.x.nix | 2 -- pkgs/development/libraries/hotpatch/default.nix | 1 - pkgs/development/libraries/itk/4.x.nix | 2 -- pkgs/development/libraries/itk/default.nix | 2 -- pkgs/development/libraries/kmsxx/default.nix | 2 -- pkgs/development/libraries/kpmcore/default.nix | 2 -- pkgs/development/libraries/leatherman/default.nix | 2 -- pkgs/development/libraries/libechonest/default.nix | 1 - pkgs/development/libraries/libgaminggear/default.nix | 2 -- pkgs/development/libraries/libjson-rpc-cpp/default.nix | 2 -- pkgs/development/libraries/libktorrent/default.nix | 2 -- pkgs/development/libraries/libnabo/default.nix | 2 -- pkgs/development/libraries/libnats-c/default.nix | 1 - pkgs/development/libraries/libpointmatcher/default.nix | 2 -- pkgs/development/libraries/libressl/default.nix | 2 -- pkgs/development/libraries/librime/default.nix | 2 -- pkgs/development/libraries/libtins/default.nix | 1 - pkgs/development/libraries/libtoxcore/default.nix | 2 -- pkgs/development/libraries/libunarr/default.nix | 2 -- pkgs/development/libraries/libwhereami/default.nix | 2 -- pkgs/development/libraries/medfile/default.nix | 2 -- pkgs/development/libraries/metal/default.nix | 2 -- pkgs/development/libraries/mimalloc/default.nix | 1 - pkgs/development/libraries/mlt/qt-5.nix | 2 -- pkgs/development/libraries/msgpack/generic.nix | 7 +------ pkgs/development/libraries/ngt/default.nix | 2 -- pkgs/development/libraries/nlohmann_json/default.nix | 2 -- pkgs/development/libraries/nuspell/default.nix | 2 -- .../development/libraries/nvidia-texture-tools/default.nix | 2 -- pkgs/development/libraries/ogrepaged/default.nix | 2 -- pkgs/development/libraries/opae/default.nix | 1 - pkgs/development/libraries/openbr/default.nix | 2 -- pkgs/development/libraries/opencollada/default.nix | 2 -- pkgs/development/libraries/opencv/3.x.nix | 2 -- pkgs/development/libraries/opencv/4.x.nix | 2 -- pkgs/development/libraries/opencv/default.nix | 2 -- pkgs/development/libraries/opensubdiv/default.nix | 2 -- pkgs/development/libraries/openxr-loader/default.nix | 1 - pkgs/development/libraries/pangolin/default.nix | 2 -- pkgs/development/libraries/partio/default.nix | 2 -- pkgs/development/libraries/pcl/default.nix | 2 -- pkgs/development/libraries/physfs/default.nix | 2 -- pkgs/development/libraries/physics/geant4/default.nix | 1 - pkgs/development/libraries/poco/default.nix | 2 -- pkgs/development/libraries/precice/default.nix | 1 - pkgs/development/libraries/qca2/default.nix | 2 -- pkgs/development/libraries/qt-5/modules/qtbase.nix | 2 -- pkgs/development/libraries/range-v3/default.nix | 2 -- .../libraries/science/biology/mirtk/default.nix | 2 -- .../libraries/science/electronics/qcsxcad/default.nix | 2 -- pkgs/development/libraries/science/math/caffe2/default.nix | 1 - pkgs/development/libraries/science/math/itpp/default.nix | 2 -- .../libraries/science/math/liblapack/default.nix | 2 -- .../libraries/science/math/or-tools/default.nix | 2 -- .../libraries/science/math/scalapack/default.nix | 2 -- pkgs/development/libraries/simgear/default.nix | 2 -- pkgs/development/libraries/telepathy/qt/default.nix | 1 - pkgs/development/libraries/tiledb/default.nix | 2 -- pkgs/development/libraries/vc/0.7.nix | 2 -- pkgs/development/libraries/vc/default.nix | 2 -- pkgs/development/libraries/vigra/default.nix | 2 -- pkgs/development/libraries/vmmlib/default.nix | 2 -- pkgs/development/libraries/vtk/generic.nix | 2 -- pkgs/development/libraries/vulkan-loader/default.nix | 1 - pkgs/development/libraries/vxl/default.nix | 2 -- pkgs/development/libraries/wt/default.nix | 2 -- pkgs/development/libraries/x265/default.nix | 3 --- pkgs/development/libraries/xgboost/default.nix | 2 -- pkgs/development/libraries/zeromq/4.x.nix | 2 -- pkgs/development/python-modules/dlib/default.nix | 1 - pkgs/development/python-modules/hoomd-blue/default.nix | 2 -- pkgs/development/python-modules/libgpuarray/default.nix | 2 -- pkgs/development/python-modules/pyside/apiextractor.nix | 2 -- pkgs/development/python-modules/pyside/default.nix | 2 -- pkgs/development/python-modules/pyside/generatorrunner.nix | 2 -- pkgs/development/python-modules/pyside/shiboken.nix | 2 -- pkgs/development/python-modules/scipy/default.nix | 2 -- pkgs/development/tools/analysis/kcov/default.nix | 2 -- pkgs/development/tools/analysis/retdec/default.nix | 2 -- pkgs/development/tools/analysis/snowman/default.nix | 2 -- pkgs/development/tools/bloaty/default.nix | 2 -- pkgs/development/tools/boomerang/default.nix | 2 -- pkgs/development/tools/misc/cli11/default.nix | 2 -- pkgs/development/tools/misc/creduce/default.nix | 3 --- pkgs/development/tools/misc/kdbg/default.nix | 3 --- pkgs/development/tools/misc/uncrustify/default.nix | 2 -- pkgs/development/tools/rtags/default.nix | 2 -- pkgs/development/tools/spirv-tools/default.nix | 1 - pkgs/development/tools/trellis/default.nix | 1 - .../development/tools/vulkan-validation-layers/default.nix | 2 -- pkgs/games/arx-libertatis/default.nix | 1 - pkgs/games/dhewm3/default.nix | 2 -- pkgs/games/dwarf-fortress/dfhack/default.nix | 1 - pkgs/games/dwarf-fortress/unfuck.nix | 2 -- pkgs/games/enyo-doom/default.nix | 2 -- pkgs/games/eternity-engine/default.nix | 2 -- pkgs/games/flightgear/default.nix | 2 -- pkgs/games/freeorion/default.nix | 7 +------ pkgs/games/gzdoom/default.nix | 2 -- pkgs/games/katago/default.nix | 2 -- pkgs/games/leela-zero/default.nix | 2 -- pkgs/games/mudlet/default.nix | 2 -- pkgs/games/multimc/default.nix | 2 -- pkgs/games/odamex/default.nix | 2 -- pkgs/games/openclonk/default.nix | 2 -- pkgs/games/openjk/default.nix | 1 - pkgs/games/openmw/default.nix | 2 -- pkgs/games/openrct2/default.nix | 2 -- pkgs/games/openspades/default.nix | 2 -- pkgs/games/quake2/yquake2/default.nix | 2 -- pkgs/games/quake2/yquake2/games.nix | 2 -- pkgs/games/rigsofrods/default.nix | 2 -- pkgs/games/riko4/default.nix | 3 --- pkgs/games/solarus/default.nix | 2 -- pkgs/games/spring/springlobby.nix | 2 -- pkgs/games/stepmania/default.nix | 2 -- pkgs/games/super-tux-kart/default.nix | 2 -- pkgs/games/the-butterfly-effect/default.nix | 1 - pkgs/games/warsow/engine.nix | 2 -- pkgs/games/wesnoth/default.nix | 2 -- pkgs/games/widelands/default.nix | 2 -- pkgs/games/zandronum/default.nix | 2 -- pkgs/games/zdoom/default.nix | 2 -- pkgs/games/zdoom/zdbsp.nix | 3 +-- pkgs/misc/apulse/default.nix | 2 -- pkgs/misc/dumb/default.nix | 2 +- pkgs/misc/emulators/citra/default.nix | 1 - pkgs/misc/emulators/dolphin-emu/default.nix | 2 -- pkgs/misc/emulators/dolphin-emu/master.nix | 1 - pkgs/misc/emulators/emulationstation/default.nix | 2 -- pkgs/misc/emulators/melonDS/default.nix | 1 - pkgs/misc/emulators/mgba/default.nix | 1 - pkgs/misc/emulators/retroarch/cores.nix | 2 -- pkgs/misc/emulators/rpcs3/default.nix | 2 -- pkgs/misc/lightspark/default.nix | 2 -- pkgs/os-specific/linux/bpftrace/default.nix | 2 -- pkgs/os-specific/linux/roccat-tools/default.nix | 2 -- pkgs/servers/domoticz/default.nix | 2 -- pkgs/servers/foundationdb/cmake.nix | 3 +-- pkgs/servers/http/h2o/default.nix | 1 - pkgs/servers/nosql/arangodb/default.nix | 2 -- pkgs/servers/sql/mariadb/connector-c/default.nix | 2 -- pkgs/servers/sql/mariadb/default.nix | 2 -- pkgs/servers/tmate-ssh-server/default.nix | 1 - pkgs/servers/ttyd/default.nix | 1 - pkgs/servers/tvheadend/default.nix | 6 ++---- pkgs/servers/xmpp/biboumi/default.nix | 1 - pkgs/servers/zoneminder/default.nix | 2 -- pkgs/shells/fish/default.nix | 2 -- pkgs/tools/X11/nx-libs/default.nix | 2 -- pkgs/tools/X11/virtualgl/lib.nix | 2 -- pkgs/tools/admin/tigervnc/default.nix | 2 -- pkgs/tools/archivers/innoextract/default.nix | 2 -- pkgs/tools/backup/httrack/qt.nix | 2 -- pkgs/tools/compression/zopfli/default.nix | 2 -- pkgs/tools/filesystems/ceph/default.nix | 2 -- pkgs/tools/filesystems/cryfs/default.nix | 2 -- pkgs/tools/filesystems/encfs/default.nix | 2 -- pkgs/tools/filesystems/securefs/default.nix | 2 -- pkgs/tools/graphics/appleseed/default.nix | 1 - pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 2 -- pkgs/tools/graphics/vulkan-tools/default.nix | 1 - .../inputmethods/fcitx-engines/fcitx-rime/default.nix | 2 -- pkgs/tools/misc/flameshot/default.nix | 2 -- pkgs/tools/misc/fltrdr/default.nix | 2 -- pkgs/tools/misc/heimdall/default.nix | 2 -- pkgs/tools/misc/partition-manager/default.nix | 2 -- pkgs/tools/misc/tmate/default.nix | 1 - pkgs/tools/networking/pcapc/default.nix | 2 -- pkgs/tools/networking/pingtcp/default.nix | 2 -- pkgs/tools/package-management/apt/default.nix | 2 -- pkgs/tools/package-management/packagekit/qt.nix | 2 -- pkgs/tools/security/haka/default.nix | 2 -- pkgs/tools/security/lastpass-cli/default.nix | 2 -- pkgs/tools/security/nmap/qt.nix | 2 -- pkgs/tools/system/facter/default.nix | 2 -- 378 files changed, 15 insertions(+), 724 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 85806ca9a0d..bbdcbc21b78 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -75,8 +75,6 @@ in mkDerivation { nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index d9d1a11ce1d..042d5b4b13a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -79,8 +79,6 @@ let "-DSPOTIFY_BLOB=OFF" ]; - enableParallelBuilding = true; - passthru.unfree = unfree; postInstall = '' @@ -122,7 +120,7 @@ let ln -s "${free}/share/$dir" "$out/share/$dir" done ''; - enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index d91e550334b..e7d264675e2 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { # version and remove fluidsynth 1.x from nixpkgs again. version = "6.15.0"; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index f4f76d2030e..84894aeee5c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index b01c4055e40..8513c1aae78 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -37,7 +37,6 @@ mkDerivation rec { ]; cmakeFlags = [ "-DWANT_QT5=ON" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { description = "DAW similar to FL Studio (music production software)"; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index e6f41711fdf..2863ae3a61c 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -51,8 +51,6 @@ mkDerivation rec { libsamplerate ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; homepage = "http://qmmp.ylsoftware.com/"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 014906594a7..8b61bc07a69 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - enableParallelBuilding = true; - checkInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 8bda179df14..416f4906d6e 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation (rec { alsaLib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 992dd728e76..e8704ff6191 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { stripLen = 1; }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 63ba44bec35..94bce19b7e1 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -18,7 +18,6 @@ mkDerivation { cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ]; - enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 81825d3d5b0..d2b69a32ab5 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -32,8 +32,6 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - enableParallelBuilding = true; - meta = { description = "Peer-to-peer electronic cash system (Cash client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 8aa693d2871..373170fe8ff 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "Secure, private blockchain with smart contracts based on Monero"; homepage = "https://dero.io/"; diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index dfa005abb6e..25301a87aea 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - enableParallelBuilding = true; - meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index beb294d2dfe..ee817b58195 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { "-DLMDB_INCLUDE=${lmdb}/include" ]; - enableParallelBuilding = true; - meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 4ba8932fec2..b44dc7c6d4f 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -96,8 +96,6 @@ stdenv.mkDerivation rec { rm -rf "$out"/include "$out"/lib ''; - enableParallelBuilding = true; - passthru = { inherit skia; }; meta = with lib; { diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b546aae790a..b4ad25f60c2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -48,7 +48,6 @@ in ]; dontFixCmake = true; - enableParallelBuilding = true; buildInputs = [ gperf diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 323f08c23f8..5a75a9284f0 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -27,8 +27,6 @@ let nativeBuildInputs = [ cmake doxygen ]; - enableParallelBuilding = true; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt \ diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3fe845a067b..97e8378d94e 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { popd ''; - enableParallelBuilding = true; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 18437f5ff49..6bf1ca5ada3 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -36,8 +36,6 @@ mkDerivation rec { ''${qtWrapperArgs[@]} ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 9c37d00c9ee..f967f28f4df 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -31,8 +31,6 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ guile_1_8 diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 363f3b8c84d..95be29abba5 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -40,8 +40,6 @@ in "-DGITBRANCH=${gitBranch}" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1e4b397db23..8196d8008f7 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -109,8 +109,6 @@ mkDerivation rec { threadweaver ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 7314ff893b0..1a8a552aa4f 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 9b96b30c62b..eaef8c13b7c 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { kconfig kinit kio kparts kwidgetsaddons ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 50962d54eb2..67b64ee575c 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -84,8 +84,6 @@ mkDerivation rec { # | hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index d23c02dbbdf..d79a3566574 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -27,8 +27,6 @@ mkDerivation rec { sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; - enableParallelBuilding = true; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 09b5bd37839..3c89f3ffac0 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation { buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 71c63bc82aa..4f470b014af 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -37,8 +37,6 @@ mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; - enableParallelBuilding = true; - meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4371bc5838e..14a46bbfcc8 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake ''; - enableParallelBuilding = true; - meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index c1255c016f4..c2edecb858f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -61,8 +61,6 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index c776aec3c42..5e05072f7b5 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 libjpeg libtiff boost ]; - enableParallelBuilding = true; - meta = { homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index bd084b4287d..18d8d546a77 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { json_c fontconfig gtkmm3 pangomm glew libGLU xorg.libpthreadstubs xorg.libXdmcp pcre ]; - enableParallelBuilding = true; preConfigure = '' patch CMakeLists.txt <