From 305ac4dade5758c58e8ab1666ad0197fd305828d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 3 Jul 2018 22:41:48 -0700
Subject: [PATCH 01/74] meson: 0.46.1 -> 0.47.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/meson/versions.
These checks were done:
- built on NixOS
- /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/meson passed the binary check.
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesonconf had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesonintrospect had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/mesontest had a zero exit code or showed the expected version
- /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0/bin/wraptool passed the binary check.
- 2 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 0.47.0 with grep in /nix/store/r959bxd7pgfd9crp3fagw4x6j6pl105l-meson-0.47.0
- directory tree listing: https://gist.github.com/921992f726772b72a0e2ccd9591141b1
- du listing: https://gist.github.com/22365bf0c1a1ab300e07e36d205c7eb7
---
pkgs/development/tools/build-managers/meson/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f14f6adf5fef..c0af01929785 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -2,12 +2,12 @@
targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec {
- version = "0.46.1";
+ version = "0.47.0";
pname = "meson";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
+ sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6";
};
postFixup = ''
From a5967365c7904b776aa77aeb55d76479449a4dd4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:25:44 +0000
Subject: [PATCH 02/74] [cpan2nix] perlPackages.ArchiveTar: 2.28 -> 2.30
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f04c80069914..4b2623176772 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -479,10 +479,10 @@ let self = _self // overrides; _self = with self; {
};
ArchiveTar = buildPerlPackage rec {
- name = "Archive-Tar-2.28";
+ name = "Archive-Tar-2.30";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
- sha256 = "2e9144f6c96f6d3d76cd14f4e871e8defc4542cdd39245a16fca29090648a70d";
+ sha256 = "4a5a172cfefe08cb2d32f99ed388a3b55967588bbf254e950bc8a48a8bf1d2e5";
};
meta = {
description = "Manipulates TAR archives";
From a0c9eba186f3464c947e7812063dc15eb7a135b4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:25:48 +0000
Subject: [PATCH 03/74] [cpan2nix] perlPackages.CPANPerlReleases: 3.62 -> 3.68
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4b2623176772..732cd837ab13 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2855,10 +2855,10 @@ let self = _self // overrides; _self = with self; {
};
CPANPerlReleases = buildPerlPackage rec {
- name = "CPAN-Perl-Releases-3.62";
+ name = "CPAN-Perl-Releases-3.68";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
- sha256 = "1w4xxb2fypsxrrmdhnznmskm0y9i10hkwgi60lwizlyhb9ck8bzb";
+ sha256 = "00d97zlg0npa8sr9d8lzj2zqwx7vkq6cypccdm2g669ls5h82shs";
};
meta = {
homepage = https://github.com/bingos/cpan-perl-releases;
From af39b67429c054a2ce725ef249d271cb1d0ca3a9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:26:00 +0000
Subject: [PATCH 04/74] [cpan2nix] perlPackages.CpanelJSONXS: 4.02 -> 4.04
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 732cd837ab13..f1fef37659c9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2765,10 +2765,10 @@ let self = _self // overrides; _self = with self; {
};
CpanelJSONXS = buildPerlPackage rec {
- name = "Cpanel-JSON-XS-4.02";
+ name = "Cpanel-JSON-XS-4.04";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
- sha256 = "e9fe45a0b5bf553076bd395ed04766d58683557f818af559cd82d33409846d20";
+ sha256 = "e128702a266b9a690bd3d380f726c229f9d6d795e8e206b9d32309d06825b2cd";
};
meta = {
description = "CPanel fork of JSON::XS, fast and correct serializing";
From 43e16ee52d62844e5a0d6e984846cdfbf758e5cd Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:26:57 +0000
Subject: [PATCH 05/74] [cpan2nix] perlPackages.MCE: 1.835 -> 1.836
---
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 f1fef37659c9..b64651abd7ae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8849,10 +8849,10 @@ let self = _self // overrides; _self = with self; {
};
MCE = buildPerlPackage rec {
- name = "MCE-1.835";
+ name = "MCE-1.836";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.835.tar.gz;
- sha256 = "1dxs7gvj97vr1ns74k3inix1i80d8b2j942crnapdx9j90j6cqvi";
+ url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.836.tar.gz;
+ sha256 = "04nkcbs27plwq31w541phfci3391s10p2xv5lmry5wq7fbdw5iwy";
};
meta = {
description = "Many-Core Engine for Perl providing parallel processing capabilities";
From b498522a34b95a7b56a613cdd321eb0ff377ba57 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:27:02 +0000
Subject: [PATCH 06/74] [cpan2nix] perlPackages.ModernPerl: 1.20170117 ->
1.20180701
---
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 b64651abd7ae..03a8969c8141 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9567,11 +9567,11 @@ let self = _self // overrides; _self = with self; {
};
ModernPerl = buildPerlModule {
- name = "Modern-Perl-1.20170117";
+ name = "Modern-Perl-1.20180701";
src = fetchurl {
- url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20170117.tar.gz;
- sha256 = "5df2a83461163212db22b9c3353606a1a123616820fe50675041c34f004b3628";
+ url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180701.tar.gz;
+ sha256 = "cfdf390bc565599ef90ef086a81233dc1dfc7867676dc28e1deedcd7e5543da6";
};
meta = {
homepage = https://github.com/chromatic/Modern-Perl;
From 4116af0ad4e8fa90795de2186a6dbc11ee2f4bf8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:27:03 +0000
Subject: [PATCH 07/74] [cpan2nix] perlPackages.ModuleCoreList: 5.20180420 ->
5.20180626
---
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 03a8969c8141..5a3aabbc1284 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9701,10 +9701,10 @@ let self = _self // overrides; _self = with self; {
};
ModuleCoreList = buildPerlPackage {
- name = "Module-CoreList-5.20180420";
+ name = "Module-CoreList-5.20180626";
src = fetchurl {
- url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180420.tar.gz;
- sha256 = "1bp22m50rjv8qjvygciy60j7kblksvhglsdgaabhmrqcmx5ysj5p";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180626.tar.gz;
+ sha256 = "1x9r0s4rlqziccb05p4k3aljx242ssx1abw5yl5ixn2c0g9ykll1";
};
meta = {
homepage = http://dev.perl.org/;
From 27fc694b31ec7d90eb9f5df7c348768b00f910dd Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:27:06 +0000
Subject: [PATCH 08/74] [cpan2nix] perlPackages.Mojolicious: 7.84 -> 7.87
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5a3aabbc1284..7e50e54c3969 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10005,10 +10005,10 @@ let self = _self // overrides; _self = with self; {
};
};
Mojolicious = buildPerlPackage rec {
- name = "Mojolicious-7.84";
+ name = "Mojolicious-7.87";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
- sha256 = "7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc";
+ sha256 = "898a24a4344eaafe97cf0b8da2fbc89e0e21cc328f5e5a39a44774f8144989b1";
};
meta = {
homepage = https://mojolicious.org/;
From 393d172f1e74d3413a176fa0de4f4056c763ba97 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:27:10 +0000
Subject: [PATCH 09/74] [cpan2nix] perlPackages.NetPing: 2.66 -> 2.68
---
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 7e50e54c3969..ec51acd06e39 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11336,10 +11336,10 @@ let self = _self // overrides; _self = with self; {
};
NetPing = buildPerlPackage {
- name = "Net-Ping-2.66";
+ name = "Net-Ping-2.68";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.66.tar.gz;
- sha256 = "a477b29e543695343513e65f3aff885a353ecebb612741e79f0bad5622e4b9e4";
+ url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.68.tar.gz;
+ sha256 = "d01ac2fcdf684c4a23a07104fbb147cfbdbda47fd5b660912124258f29afd7e3";
};
meta = {
description = "Check a remote host for reachability";
From ed63e3860424dc232b4bf19e9cda90fb2da0b728 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:27:38 +0000
Subject: [PATCH 10/74] [cpan2nix] perlPackages.StringCRC32: 1.6 -> 1.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 ec51acd06e39..8f77620dd9a6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13826,10 +13826,10 @@ let self = _self // overrides; _self = with self; {
};
StringCRC32 = buildPerlPackage rec {
- name = "String-CRC32-1.6";
+ name = "String-CRC32-1.7";
src = fetchurl {
- url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz;
- sha256 = "0mf545w014f9rwp2020h17dn8kfp7q1zgwrsfv0rpn89c61in8bh";
+ url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.7.tar.gz;
+ sha256 = "1j1bwbxcgxfbgw708rfrni3spwnnmnf717vq9s64nd63jmc4w5lg";
};
meta = {
maintainers = with maintainers; [ ];
From 1b8b38a59bba4c776861e99b3fe858e9ac252a06 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:28:00 +0000
Subject: [PATCH 11/74] [cpan2nix] perlPackages.TextCSV_XS: 1.35 -> 1.36
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8f77620dd9a6..2670702d19c9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16142,10 +16142,10 @@ let self = _self // overrides; _self = with self; {
};
TextCSV_XS = buildPerlPackage rec {
- name = "Text-CSV_XS-1.35";
+ name = "Text-CSV_XS-1.36";
src = fetchurl {
url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz";
- sha256 = "2b4f111e9486b230b02bfabbbf50c453f959d18ec17351a930e41f0959b358b7";
+ sha256 = "c321b09ad98a332138f25f55afb83befd7c045134085c7cb280fc325e688942c";
};
meta = {
homepage = https://metacpan.org/pod/Text::CSV_XS;
From 91b20629f6a5cce65de4008216279cf4015c6d0f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:03 +0000
Subject: [PATCH 12/74] [cpan2nix] perlPackages.TestWarn: 0.35 -> 0.36
---
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 2670702d19c9..eb546a2769a4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15902,10 +15902,10 @@ let self = _self // overrides; _self = with self; {
};
TestWarn = buildPerlPackage {
- name = "Test-Warn-0.35";
+ name = "Test-Warn-0.36";
src = fetchurl {
- url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.35.tar.gz;
- sha256 = "1ialnc0q5277p7v01mvk7nljw8qx5qr5wiqzhmvbz8y87jb11r14";
+ url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz;
+ sha256 = "1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c";
};
propagatedBuildInputs = [ SubUplevel ];
meta = {
From 9e1e47b28f9158e024c1f5bc467438b7d16f6f0a Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:07 +0000
Subject: [PATCH 13/74] [cpan2nix] perlPackages.ack: 2.22 -> 2.24
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eb546a2769a4..39e519eae0e9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -27,10 +27,10 @@ let self = _self // overrides; _self = with self; {
ack = buildPerlPackage rec {
- name = "ack-2.22";
+ name = "ack-2.24";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
- sha256 = "0v0gdv1ja12ks4yp1nb93z1lh14s869dr4mfjb3nkgw6pkdl3i02";
+ sha256 = "002gwl2h3h1j8b2xfsi279ga5l264w7rch9cxgg15rwgml4l14vj";
};
outputs = ["out" "man"];
# use gnused so that the preCheck command passes
From d107807c6230f63ac1afac0fcda7564fa842fc1b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:12 +0000
Subject: [PATCH 14/74] [cpan2nix] perlPackages.CryptJWT: 0.021 -> 0.022
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 39e519eae0e9..502df9f70e40 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2949,10 +2949,10 @@ let self = _self // overrides; _self = with self; {
};
CryptJWT = buildPerlPackage rec {
- name = "Crypt-JWT-0.021";
+ name = "Crypt-JWT-0.022";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
- sha256 = "7227a10d185d6550fea855ef44bb8fb927d8c8644cfb16e0b674959bf103df5f";
+ sha256 = "eb0a591f91c431929d8788dc26cc8cd98d1dc37af2a45b5754ca5039c8282476";
};
propagatedBuildInputs = [ CryptX JSONMaybeXS ];
meta = {
From bc95e3b851c5e97202d62d3d8ea57696838209b9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:17 +0000
Subject: [PATCH 15/74] [cpan2nix] perlPackages.FileShareDir: 1.112 -> 1.116
---
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 502df9f70e40..139a41ac5c17 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6089,16 +6089,17 @@ let self = _self // overrides; _self = with self; {
};
FileShareDir = buildPerlPackage {
- name = "File-ShareDir-1.112";
+ name = "File-ShareDir-1.116";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.112.tar.gz;
- sha256 = "196vf98l6pasrpdcpd840321fknknhyidhsm1y5ifx74lrk5ac7q";
+ url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz;
+ sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar";
};
propagatedBuildInputs = [ ClassInspector ];
meta = {
description = "Locate per-dist and per-module shared files";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ buildInputs = [ FileShareDirInstall ];
};
FileShareDirInstall = buildPerlPackage {
From 0fb11ab7507500873769efc54a912f219e5c3fdb Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:30 +0000
Subject: [PATCH 16/74] [cpan2nix] perlPackages.TimeDurationParse: 0.13 -> 0.14
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 139a41ac5c17..e6819574b4d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16785,10 +16785,10 @@ let self = _self // overrides; _self = with self; {
};
TimeDurationParse = buildPerlPackage rec {
- name = "Time-Duration-Parse-0.13";
+ name = "Time-Duration-Parse-0.14";
src = fetchurl {
url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
- sha256 = "0affdzhsiy7dr6dzj2p6m9lynmjh53k31bprfsfa21pz8551hjj1";
+ sha256 = "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc";
};
buildInputs = [ TimeDuration ];
propagatedBuildInputs = [ ExporterLite ];
From 9765be21a043e84de9a7de707ac0e3aa0f1cb7b1 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:35 +0000
Subject: [PATCH 17/74] [cpan2nix] perlPackages.ClassAccessorGrouped: 0.10012
-> 0.10014
---
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 e6819574b4d4..8d2416d93c65 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1908,10 +1908,10 @@ let self = _self // overrides; _self = with self; {
};
ClassAccessorGrouped = buildPerlPackage {
- name = "Class-Accessor-Grouped-0.10012";
+ name = "Class-Accessor-Grouped-0.10014";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz;
- sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe";
+ url = mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz;
+ sha256 = "35d5b03efc09f67f3a3155c9624126c3e162c8e3ca98ff826db358533a44c4bb";
};
buildInputs = [ TestException ];
propagatedBuildInputs = [ ModuleRuntime ];
From 7551f5200d7d64a0319acb53892cd306b63a73b9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:37 +0000
Subject: [PATCH 18/74] [cpan2nix] perlPackages.DevelPatchPerl: 1.48 -> 1.52
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8d2416d93c65..7c85fdca9c35 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3992,10 +3992,10 @@ let self = _self // overrides; _self = with self; {
};
DevelPatchPerl = buildPerlPackage rec {
- name = "Devel-PatchPerl-1.48";
+ name = "Devel-PatchPerl-1.52";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
- sha256 = "1zlh1pmlihzcabj2zyfdnrqj6kfl3n9769yfrs296wxgaa7bra96";
+ sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf";
};
propagatedBuildInputs = [ Filepushd ModulePluggable ];
meta = {
From 3404161c95ccc070cec0673d2f52abe4497f1fed Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:29:49 +0000
Subject: [PATCH 19/74] [cpan2nix] perlPackages.FileFindObjectRule: 0.0307 ->
0.0309
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7c85fdca9c35..218845f76be9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5814,10 +5814,10 @@ let self = _self // overrides; _self = with self; {
};
FileFindObjectRule = buildPerlModule rec {
- name = "File-Find-Object-Rule-0.0307";
+ name = "File-Find-Object-Rule-0.0309";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
- sha256 = "571d92c1bbd749b03a5e063b65cdef081b8063fe190fca7ed2e37af7ccb5a99a";
+ sha256 = "a184e11b271646c1b5b40ac01ca15d87750dc2b16a66dda3be0bd8976ece21e3";
};
propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ];
meta = {
From 39ba936d09fb858f6ce3bcb7aba775464611d1dd Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:30:00 +0000
Subject: [PATCH 20/74] [cpan2nix] perlPackages.FileHandleUnget: 0.1628 ->
0.1629
---
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 218845f76be9..8deb75e364ac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5875,12 +5875,12 @@ let self = _self // overrides; _self = with self; {
};
FileHandleUnget = buildPerlPackage rec {
- name = "FileHandle-Unget-0.1628";
+ name = "FileHandle-Unget-0.1629";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
- sha256 = "9ef4eb765ddfdc35b350905d8dd0a1e12139eabc586652811bfab41972100fdf";
+ sha256 = "65925ec334d239c79f4a446716fb0816acb010de495ffd6b23d677f5bcc54362";
};
- buildInputs = [ FileSlurp URI ];
+ buildInputs = [ FileSlurp TestCompile UNIVERSALrequire URI ];
meta = {
homepage = https://github.com/coppit/filehandle-unget/;
description = "FileHandle which supports multi-byte unget";
From c51b582583be71a6a8060c523caaaa3d0003ef81 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:30:32 +0000
Subject: [PATCH 21/74] [cpan2nix] perlPackages.MailMboxMessageParser: 1.5105
-> 1.5106
---
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 8deb75e364ac..37908248a14a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9085,12 +9085,12 @@ let self = _self // overrides; _self = with self; {
};
MailMboxMessageParser = buildPerlPackage rec {
- name = "Mail-Mbox-MessageParser-1.5105";
+ name = "Mail-Mbox-MessageParser-1.5106";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
- sha256 = "641edd8b7ab74de671ab4931311413c1bd037a1c3eaa0a0c97451cd7b104f2d8";
+ sha256 = "d65fc8e8ce84273abbc14220d15813d93ddf6c7a256cdc24de156cb6c08923be";
};
- buildInputs = [ FileSlurp TextDiff URI ];
+ buildInputs = [ FileSlurp TestCompile TextDiff URI ];
propagatedBuildInputs = [ FileHandleUnget ];
meta = {
homepage = https://github.com/coppit/mail-mbox-messageparser;
From 292340b7fd8ae68148d4dddebbd45f05a557f4ab Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:30:46 +0000
Subject: [PATCH 22/74] [cpan2nix] perlPackages.grepmail: 5.3104 -> 5.3105
---
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 37908248a14a..d9d59e8544e4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6663,12 +6663,12 @@ let self = _self // overrides; _self = with self; {
};
grepmail = buildPerlPackage rec {
- name = "grepmail-5.3104";
+ name = "grepmail-5.3105";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
- sha256 = "7969e569ec54b2f569a5af56ac4d884c630ad850974658219b0b6953e97b5d3d";
+ sha256 = "c74fb7a0cd4549d98c78395c2485b00788ca655109358ca0ec550ea71588a5d4";
};
- buildInputs = [ FileSlurp URI ];
+ buildInputs = [ FileSlurp TestCompile URI ];
propagatedBuildInputs = [ MailMboxMessageParser TimeDate ];
outputs = [ "out" ];
meta = {
From d1549963d11c0d25a3e20db5ee7e5b0d35a37dd9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:30:58 +0000
Subject: [PATCH 23/74] [cpan2nix] perlPackages.ArchiveTarWrapper: 0.27 -> 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 d9d59e8544e4..4476678a3847 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -491,10 +491,10 @@ let self = _self // overrides; _self = with self; {
};
ArchiveTarWrapper = buildPerlPackage rec {
- name = "Archive-Tar-Wrapper-0.27";
+ name = "Archive-Tar-Wrapper-0.31";
src = fetchurl {
- url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.27.tar.gz;
- sha256 = "0ll0p8yh54yb9y9ykaf60icj3frs0lndwz3k4k4ql9fywx40mcck";
+ url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.31.tar.gz;
+ sha256 = "18rvqzy7m900ikq7r4hxpja21wcsh3z6rz7qhs4ksgc0dpdqb9qd";
};
propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ];
meta = {
From 0a2747c4edb5c0df40d26126dde037f695eb7d84 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:31:26 +0000
Subject: [PATCH 24/74] [cpan2nix] perlPackages.GoferTransporthttp: cleanup
---
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 4476678a3847..29d6d8212f8f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6601,7 +6601,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz;
sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b";
};
- propagatedBuildInputs = [ mod_perl2 DBI HTTPMessage LWP URI ];
+ propagatedBuildInputs = [ DBI LWP mod_perl2 ];
doCheck = false; # no make target 'test'
meta = {
description = "HTTP transport for DBI stateless proxy driver DBD::Gofer";
From f5c1eff5688ec09dd05f626600b7ee54a8621e8f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:31:55 +0000
Subject: [PATCH 25/74] [cpan2nix] perlPackages.Appperlbrew: 0.83 -> 0.84
---
pkgs/top-level/perl-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 29d6d8212f8f..950d9c1928a1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -315,10 +315,10 @@ let self = _self // overrides; _self = with self; {
};
Appperlbrew = buildPerlModule rec {
- name = "App-perlbrew-0.83";
+ name = "App-perlbrew-0.84";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz";
- sha256 = "0sdz0y90pk49cw4njfm1jq7zppha6kdx7i1d6nk41672nqrphdhb";
+ sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la";
};
buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ];
propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ];
From 97f9cbbe88ad3e36d694d0fa68cf489574bd3da8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:31:57 +0000
Subject: [PATCH 26/74] [cpan2nix] perlPackages.TestCleanNamespaces: 0.22 ->
0.23
---
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 950d9c1928a1..36a019881c0a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14896,10 +14896,10 @@ let self = _self // overrides; _self = with self; {
};
TestCleanNamespaces = buildPerlPackage {
- name = "Test-CleanNamespaces-0.22";
+ name = "Test-CleanNamespaces-0.23";
src = fetchurl {
- url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz;
- sha256 = "862a221994dd413b2f350450f22c96f57cac78784b1aca1a8fc763fc5449aaca";
+ url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.23.tar.gz;
+ sha256 = "c7bf97f3c786b75f84341135904b492a1a36646aa65db3e0fd15a3cbe0864872";
};
buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ];
propagatedBuildInputs = [ PackageStash SubIdentify ];
From e594ca2678fea280e4132226d7165d11a4d78a9c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:32:00 +0000
Subject: [PATCH 27/74] [cpan2nix] perlPackages.AppCLI: 0.49 -> 0.50
---
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 36a019881c0a..fc4ad8d7e290 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -250,10 +250,10 @@ let self = _self // overrides; _self = with self; {
};
AppCLI = buildPerlPackage {
- name = "App-CLI-0.49";
+ name = "App-CLI-0.50";
src = fetchurl {
- url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.49.tar.gz;
- sha256 = "0gv4dcscxiacdrb9aqxc9mdl1w8wszicmg2q86zlz31ya5spjvv3";
+ url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz;
+ sha256 = "0ick5agl02rx2pjfxl97d0f9qksy8pjn0asmwm3gn6dm7a1zblsi";
};
propagatedBuildInputs = [ CaptureTiny ClassLoad ];
buildInputs = [ TestKwalitee TestPod ];
From c2b9a398b75df6a0d0bda31d26a1cb5b285f1eaa Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 06:32:11 +0000
Subject: [PATCH 28/74] [cpan2nix] perlPackages.MooseXEmulateClassAccessorFast:
0.00903 -> 0.009032
---
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 fc4ad8d7e290..959d1e975ec2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10463,10 +10463,10 @@ let self = _self // overrides; _self = with self; {
};
MooseXEmulateClassAccessorFast = buildPerlPackage {
- name = "MooseX-Emulate-Class-Accessor-Fast-0.00903";
+ name = "MooseX-Emulate-Class-Accessor-Fast-0.009032";
src = fetchurl {
- url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz;
- sha256 = "1lkn1h4sxr1483jicsgsgzclbfw63g2i2c3m4v4j9ar75yrb0kh8";
+ url = mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz;
+ sha256 = "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2";
};
buildInputs = [ TestException ];
propagatedBuildInputs = [ Moose namespaceclean ];
From 98b525895546794aa79dce9dcb155b6a35b20622 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 8 Jul 2018 22:28:43 +0000
Subject: [PATCH 29/74] [staging] pcre: 8.41 -> 8.42 (#43165)
---
pkgs/development/libraries/pcre/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 973798b849bc..e8bfb51cf9ee 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -9,7 +9,7 @@ with stdenv.lib;
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
let
- version = "8.41";
+ version = "8.42";
pname = if (variant == null) then "pcre"
else if (variant == "cpp") then "pcre-cpp"
else variant;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2";
- sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76";
+ sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c";
};
outputs = [ "bin" "dev" "out" "doc" "man" ];
From f4c4a4cc1bcdf163be1c54ee477624f51574136c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 13:42:21 -0400
Subject: [PATCH 30/74] watch: remove
This can be built in the procps-ng/default.nix expression.
---
pkgs/os-specific/linux/procps-ng/default.nix | 10 ++++++--
pkgs/os-specific/linux/procps/watch.nix | 25 --------------------
pkgs/top-level/all-packages.nix | 2 --
3 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 pkgs/os-specific/linux/procps/watch.nix
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index bd69145521c1..ad9f71911517 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
nativeBuildInputs = [ pkgconfig ];
- makeFlags = "usrbin_execdir=$(out)/bin";
+ makeFlags = [ "usrbin_execdir=$(out)/bin" ]
+ ++ lib.optionals stdenv.isDarwin [ "watch" "PKG_LDFLAGS="];
enableParallelBuilding = true;
@@ -23,12 +24,17 @@ stdenv.mkDerivation rec {
[ "ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes" ];
+ installPhase = if stdenv.isDarwin then ''
+ install -m 0755 -D watch $out/bin/watch
+ install -m 0644 -D watch.1 $out/share/man/man1/watch.1
+ '' else null;
+
meta = {
homepage = https://gitlab.com/procps-ng/procps;
description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
license = lib.licenses.gpl2;
- platforms = lib.platforms.linux ++ lib.platforms.cygwin;
+ platforms = lib.platforms.linux ++ lib.platforms.cygwin ++ lib.platforms.darwin;
maintainers = [ lib.maintainers.typetetris ];
};
}
diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix
deleted file mode 100644
index 4511b9cf843e..000000000000
--- a/pkgs/os-specific/linux/procps/watch.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
- name = "watch-0.2.0";
-
- src = fetchurl {
- url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
- sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
- };
-
- buildInputs = [ ncurses ];
-
- makeFlags = "watch usrbin_execdir=$(out)/bin" +
- (if stdenv.isDarwin then " PKG_LDFLAGS=" else "");
-
- enableParallelBuilding = true;
-
- installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
-
- meta = {
- homepage = https://sourceforge.net/projects/procps/;
- description = "Utility for watch the output of a given command at intervals";
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 457698ccec62..b95eee52006e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14226,8 +14226,6 @@ with pkgs;
procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
- watch = callPackage ../os-specific/linux/procps/watch.nix { };
-
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
# See `xenPackages` source for explanations.
From 8ab5cc32025744d15747b96be373a066504784aa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 16:09:25 -0400
Subject: [PATCH 31/74] unixtools: add watch command
---
pkgs/top-level/aliases.nix | 2 +-
pkgs/top-level/all-packages.nix | 6 +++---
pkgs/top-level/unix-tools.nix | 9 ++++++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b653dfc7db69..1a5bf546a204 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -219,7 +219,7 @@ mapAliases ({
pltScheme = racket; # just to be sure
polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
- procps = procps-ng; # added 2018-04-25
+ procps-ng = procps; # added 2018-06-08
prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27
pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b95eee52006e..bee738475257 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14223,8 +14223,8 @@ with pkgs;
prayer = callPackage ../servers/prayer { };
- procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
- else unixtools.procps;
+ procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
+ else unixtools.procps;
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
@@ -21867,7 +21867,7 @@ with pkgs;
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
inherit (unixtools) hexdump ps logger eject umount
mount wall hostname more sysctl getconf
- getent locale killall xxd;
+ getent locale killall xxd watch;
fts = if hostPlatform.isMusl then netbsd.fts else null;
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cc6a8e0592a8..f92e90fed772 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -148,6 +148,13 @@ let
wall = {
linux = pkgs.utillinux;
};
+ watch = {
+ linux = pkgs.procps;
+
+ # watch is the only command from procps that builds currently on
+ # Darwin. Unfortunately no other implementations exist currently!
+ darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
+ };
write = {
linux = pkgs.utillinux;
darwin = pkgs.darwin.basic_cmds;
@@ -166,7 +173,7 @@ let
# Compatibility derivations
# Provided for old usage of these commands.
compat = with bins; lib.mapAttrs makeCompat {
- procps = [ ps sysctl top ];
+ procps = [ ps sysctl top watch ];
utillinux = [ fsck fdisk getopt hexdump mount
script umount whereis write col ];
nettools = [ arp hostname ifconfig netstat route ];
From b802570fc249eb2beae4fb5b80f39a8bdbd6c290 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 19:19:01 -0400
Subject: [PATCH 32/74] procps: clarify compatibility
---
pkgs/os-specific/linux/procps-ng/default.nix | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index ad9f71911517..7f1e93c072da 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchurl, ncurses, pkgconfig }:
+{ lib, stdenv, fetchurl, ncurses, pkgconfig
+
+# procps is mostly Linux-only. Most commands require a running Linux
+# system (or very similar like that found in Cygwin). The one
+# exception is ‘watch’ which is portable enough to run on pretty much
+# any UNIX-compatible system.
+, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }:
stdenv.mkDerivation rec {
name = "procps-${version}";
@@ -14,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
makeFlags = [ "usrbin_execdir=$(out)/bin" ]
- ++ lib.optionals stdenv.isDarwin [ "watch" "PKG_LDFLAGS="];
+ ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="];
enableParallelBuilding = true;
@@ -24,7 +30,7 @@ stdenv.mkDerivation rec {
[ "ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes" ];
- installPhase = if stdenv.isDarwin then ''
+ installPhase = if watchOnly then ''
install -m 0755 -D watch $out/bin/watch
install -m 0644 -D watch.1 $out/share/man/man1/watch.1
'' else null;
@@ -34,7 +40,7 @@ stdenv.mkDerivation rec {
description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
license = lib.licenses.gpl2;
- platforms = lib.platforms.linux ++ lib.platforms.cygwin ++ lib.platforms.darwin;
+ platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.typetetris ];
};
}
From 7e4ce2cfcbb217bb66e068803b549a4d1fa98673 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 16:09:47 -0400
Subject: [PATCH 33/74] unixtools: refactor
---
pkgs/top-level/unix-tools.nix | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index f92e90fed772..3f8fdf7d8883 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform, lib
-, stdenv }:
+{ pkgs, buildEnv, runCommand, hostPlatform, lib, stdenv }:
# These are some unix tools that are commonly included in the /usr/bin
# and /usr/sbin directory under more normal distributions. Along with
@@ -11,21 +10,25 @@
# instance, if your program needs to use "ps", just list it as a build
# input, not "procps" which requires Linux.
+with lib;
+
let
version = "1003.1-2008";
singleBinary = cmd: providers: let
- provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
- manpage = "${lib.getOutput "man" providers.${hostPlatform.parsed.kernel.name}}/share/man/man1/${cmd}.1.gz";
+ provider = providers.${hostPlatform.parsed.kernel.name};
+ bin = "${getBin provider}/bin/${cmd}";
+ manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
in runCommand "${cmd}-${version}" {
- meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
+ meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
+ passthru = { inherit provider; };
} ''
- if ! [ -x "${provider}" ]; then
+ if ! [ -x "${bin}" ]; then
echo "Cannot find command ${cmd}"
exit 1
fi
- install -D "${provider}" "$out/bin/${cmd}"
+ install -D "${bin}" "$out/bin/${cmd}"
if [ -f "${manpage}" ]; then
install -D "${manpage}" $out/share/man/man1/${cmd}.1.gz
@@ -33,13 +36,13 @@ let
'';
# more is unavailable in darwin
- # just use less
+ # so we just use less
more_compat = runCommand "more-${version}" {} ''
mkdir -p $out/bin
ln -s ${pkgs.less}/bin/less $out/bin/more
'';
- bins = lib.mapAttrs singleBinary {
+ bins = mapAttrs singleBinary {
# singular binaries
arp = {
linux = pkgs.nettools;
@@ -53,12 +56,12 @@ let
linux = pkgs.utillinux;
};
getconf = {
- linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
+ linux = if hostPlatform.libc == "glibc" then pkgs.glibc
else pkgs.netbsd.getconf;
darwin = pkgs.darwin.system_cmds;
};
getent = {
- linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
+ linux = if hostPlatform.libc == "glibc" then pkgs.glibc
else pkgs.netbsd.getent;
darwin = pkgs.netbsd.getent;
};
@@ -165,10 +168,11 @@ let
};
};
- makeCompat = name': value: buildEnv {
- name = name' + "-compat-${version}";
- paths = value;
- };
+ makeCompat = pname: paths:
+ buildEnv {
+ name = "${pname}-${version}";
+ inherit paths;
+ };
# Compatibility derivations
# Provided for old usage of these commands.
From f1a14f98446c0d65152542eb1196c4112cce843a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 19:23:10 -0400
Subject: [PATCH 34/74] unixtools: link instead of copying
This is better for disk space.
---
pkgs/top-level/unix-tools.nix | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 3f8fdf7d8883..52c3de3166ff 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -22,16 +22,19 @@ let
in runCommand "${cmd}-${version}" {
meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
passthru = { inherit provider; };
+ preferLocalBuild = true;
} ''
- if ! [ -x "${bin}" ]; then
- echo "Cannot find command ${cmd}"
+ if ! [ -x ${bin} ]; then
+ echo Cannot find command ${cmd}
exit 1
fi
- install -D "${bin}" "$out/bin/${cmd}"
+ mkdir -p $out/bin
+ ln -s ${bin} $out/bin/${cmd}
- if [ -f "${manpage}" ]; then
- install -D "${manpage}" $out/share/man/man1/${cmd}.1.gz
+ if [ -f ${manpage} ]; then
+ mkdir -p $out/share/man/man1
+ ln -s ${manpage} $out/share/man/man1/${cmd}.1.gz
fi
'';
From 739c835515036fcc21cd5f32fc0e37991df5dc18 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 9 Jul 2018 20:43:34 +0200
Subject: [PATCH 35/74] stdenv-setup: Remove superfluous check for /bin/sh
The line was essentially checking whether /bin/sh exists and is
executable and if that's the case, the isScript function returns
successfully.
When asking the author of this line on IRC it seems that even they can't
remember or imagine what this was supposed to be.
In summary: Whenever /bin/sh doesn't exist during a build, *any* file
given to isScript is reported as being a script even if it isn't.
This is kinda counter-intuitive and not something what somebody would
expect from a function called "isScript".
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
---
pkgs/stdenv/generic/setup.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 87465df1482a..26d28609d877 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -220,7 +220,6 @@ isScript() {
local fn="$1"
local fd
local magic
- if ! [ -x /bin/sh ]; then return 0; fi
exec {fd}< "$fn"
read -r -n 2 -u "$fd" magic
exec {fd}<&-
From 271e4780cf9f1ddbb061148a6b61ec21b04c7b86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jul 2018 13:29:38 -0700
Subject: [PATCH 36/74] shared-mime-info: 1.9 -> 1.10 (#42948)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/shared-mime-info/versions.
These checks were done:
- built on NixOS
- /nix/store/3lvy4cp08h73b9cb5sw8nl5n3nxlahry-shared-mime-info-1.10/bin/update-mime-database passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.10 with grep in /nix/store/3lvy4cp08h73b9cb5sw8nl5n3nxlahry-shared-mime-info-1.10
- directory tree listing: https://gist.github.com/f14528d0cfdffdfd9120e68517e35c73
- du listing: https://gist.github.com/aeb5692bf3cce624ed41c38c8735082f
---
pkgs/data/misc/shared-mime-info/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 64b0fd0c38a4..f1df81f2db41 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
, libxml2, glib}:
-let version = "1.9"; in
+let version = "1.10"; in
stdenv.mkDerivation rec {
name = "shared-mime-info-${version}";
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
- sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw";
+ sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
};
nativeBuildInputs = [
From f8db20fb3ae382eba1ba2b160fe24739f43c0bd7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 9 Jul 2018 15:16:15 -0500
Subject: [PATCH 37/74] pciutils: use standardized equivalent for
canonicalize_file_name
Fixes w/musl.
---
pkgs/tools/system/pciutils/default.nix | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 0ee17ffcc38b..9acf41c62ef8 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -22,6 +22,16 @@ stdenv.mkDerivation rec {
installTargets = "install install-lib";
+ # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path).
+ # This is documented to be equivalent, see `man 3 canonicalize_file_name`.
+ # Fixes w/musl.
+ # Upstream PR: https://github.com/pciutils/pciutils/pull/6
+ postPatch = ''
+ substituteInPlace lib/sysfs.c \
+ --replace "canonicalize_file_name(path)" \
+ "realpath(path, NULL)"
+ '';
+
# Get rid of update-pciids as it won't work.
postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
From db8bebf816e106c66d5d4ea213c351b3ca060149 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jul 2018 13:33:28 -0700
Subject: [PATCH 38/74] wayland-protocols: 1.14 -> 1.15 (#43151)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions.
These checks were done:
- built on NixOS
- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.15 with grep in /nix/store/acbjqscvbj2a369m2cmx5waxpab9b3fp-wayland-protocols-1.15
- directory tree listing: https://gist.github.com/ed6b2fe913e7aa8189e99f99b8d56511
- du listing: https://gist.github.com/f55c3123eacd3a802f5007f3d8f49d3d
---
pkgs/development/libraries/wayland/protocols.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 33bce4d6216f..7b619ebb35e4 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "wayland-protocols-${version}";
- version = "1.14";
+ version = "1.15";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n";
+ sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys";
};
nativeBuildInputs = [ pkgconfig ];
From 6f0c92fda98f2acc836df6bc80fe69dec9e66a27 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 9 Jul 2018 23:06:25 +0200
Subject: [PATCH 39/74] meson: set auto_features=disabled
---
pkgs/development/tools/build-managers/meson/setup-hook.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 36a7fe23ef5b..b98225c1305f 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -17,6 +17,7 @@ mesonConfigurePhase() {
--includedir=${!outputInclude}/include \
--mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
--localedir=${!outputLib}/share/locale \
+ -Dauto_features=disabled \
$mesonFlags"
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
From 373bdced7fa570d83695b83a5db939a180d290b9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Jul 2018 00:02:06 +0200
Subject: [PATCH 40/74] =?UTF-8?q?gnome2.GConf:=202.32.4=20=E2=86=92=203.2.?=
=?UTF-8?q?6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update and clean up the expression. For example, GTK was only used for
removed utility and examples.
---
.../gnome-2/platform/GConf/default.nix | 30 +++++++++++--------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 778a1cc920f1..afba6e15ebdd 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,29 +1,33 @@
{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:
+, polkit, intltool }:
-assert withGtk -> (gtk2 != null);
-
-stdenv.mkDerivation {
- name = "gconf-2.32.4";
+stdenv.mkDerivation rec {
+ name = "gconf-${version}";
+ version = "3.2.6";
src = fetchurl {
- url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
- sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
+ url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz";
+ sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
};
outputs = [ "out" "dev" "man" ];
- buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ]
+ buildInputs = [ ORBit2 libxml2 ]
# polkit requires pam, which requires shadow.h, which is not available on
# darwin
- ++ stdenv.lib.optional (!stdenv.isDarwin) polkit
- ++ stdenv.lib.optional withGtk gtk2;
+ ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
- propagatedBuildInputs = [ glib ];
+ propagatedBuildInputs = [ glib dbus-glib ];
nativeBuildInputs = [ pkgconfig intltool ];
- configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0"
+ configureFlags =
# fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
- ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
+ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://projects.gnome.org/gconf/;
+ description = "Deprecated system for storing application preferences";
+ platforms = platforms.linux;
+ };
}
From 28b6f74c3f4402156c6f3730d2ddad8cffcc3445 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Jul 2018 00:34:32 +0200
Subject: [PATCH 41/74] gnome3.gconf: remove
---
pkgs/applications/altcoins/parity-ui/env.nix | 4 +--
.../editors/lighttable/default.nix | 4 +--
pkgs/applications/editors/typora/default.nix | 4 +--
pkgs/applications/misc/gksu/default.nix | 4 +--
pkgs/applications/misc/hyper/default.nix | 4 +--
pkgs/applications/misc/pdfmod/default.nix | 4 +--
pkgs/applications/misc/simplenote/default.nix | 4 +--
pkgs/applications/misc/terminus/default.nix | 4 +--
.../networking/browsers/opera/default.nix | 4 +--
.../networking/browsers/vivaldi/default.nix | 4 +--
.../instant-messengers/discord/default.nix | 4 +--
.../instant-messengers/franz/default.nix | 4 +--
.../mattermost-desktop/default.nix | 4 +--
.../signal-desktop/default.nix | 4 +--
.../skypeforlinux/default.nix | 4 +--
.../instant-messengers/slack/default.nix | 4 +--
.../wire-desktop/default.nix | 6 ++--
.../networking/super-productivity/default.nix | 4 +--
pkgs/desktops/gnome-3/core/gconf/default.nix | 34 -------------------
pkgs/desktops/gnome-3/default.nix | 4 ---
.../gnome-3/devtools/nemiver/default.nix | 30 ++++++++++------
.../gnome-3/games/aisleriot/default.nix | 21 +++++++-----
pkgs/games/planetaryannihilation/default.nix | 4 +--
pkgs/misc/gnash/default.nix | 8 ++---
.../network-manager/fortisslvpn.nix | 2 +-
.../network-manager/openconnect.nix | 2 +-
pkgs/top-level/all-packages.nix | 12 ++++---
27 files changed, 85 insertions(+), 106 deletions(-)
delete mode 100644 pkgs/desktops/gnome-3/core/gconf/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
index a273bf33d100..4068d4fb9300 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
-, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }:
+, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
let
packages = [
@@ -9,7 +9,7 @@ let
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb libsecret gnome3.gconf
+ xorg.libxcb libsecret gnome2.GConf
];
libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index c5f8278f649d..dfd6543c5985 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify
+, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
}:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
- fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
+ fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
xorg.libXcursor
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 082bc2a2536c..93ee70e4148b 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango
, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
rpath = stdenv.lib.makeLibraryPath [
alsaLib
- gnome3.gconf
+ gnome2.GConf
gdk_pixbuf
pango
gnome3.defaultIconTheme
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index d4f2a056a9f6..6adc805b7284 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu,
+{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring
+ gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring
];
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 65b85868bc59..4903997611bc 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
- stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+ stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
];
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 47be9dc8200e..2c0d642863ed 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib
, mono, gtk-sharp-2_0, gnome-sharp, hyena
-, which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook
+, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
--add-flags "$out/lib/pdfmod/PdfMod.exe" \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
--prefix MONO_GAC_PREFIX : ${gnome-sharp} \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
'';
dontStrip = true;
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 513c5facc6b2..436d3ee4233e 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
-, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
+, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
- xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf
+ xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
xorg.libxcb
];
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index d2a2936680f9..f76f7035662b 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs
@@ -8,7 +8,7 @@ let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
- libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
+ libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat libudev libpulseaudio
];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 37ea44bb28d6..efbfee487c6d 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -11,7 +11,7 @@
, freetype
, gdk_pixbuf
, glib
-, gnome3
+, gnome2
, gtk3
, libX11
, libxcb
@@ -55,7 +55,7 @@ let
freetype.out
gdk_pixbuf.out
glib.out
- gnome3.gconf
+ gnome2.GConf
gtk3.out
libX11.out
libXScrnSaver.out
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 8eae85099fb7..14a8bfd048b4 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,7 +4,7 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz
, gstreamer, gst-plugins-base, libxml2
-, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2
, nss, nspr
, patchelf, makeWrapper
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
- gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
+ gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
libPath = stdenv.lib.makeLibraryPath buildInputs
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ae0951ba99a1..09ead9b3de65 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
-, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
+, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath [
libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
- gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite
+ gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
];
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index db3cafb355f6..b253e41ae7d8 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2
-, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
+, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
- gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc
+ gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
];
runtimeDependencies = [ udev.lib libnotify ];
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index 60e883e8b9d1..a9ce8a96f970 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gnome3, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
+{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
@@ -14,7 +14,7 @@ let
freetype
gdk_pixbuf
glib
- gnome3.gconf
+ gnome2.GConf
gtk2
pango
libX11
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 89a3005b1279..48fcfa19d976 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
-, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
+, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, udev
@@ -17,7 +17,7 @@ let
freetype
gdk_pixbuf
glib
- gnome3.gconf
+ gnome2.GConf
gtk3
pango
libX11
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 9ac3d870312d..5899ca92eb0c 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
let
@@ -22,7 +22,7 @@ let
glibc
libsecret
- gnome3.gconf
+ gnome2.GConf
gdk_pixbuf
gtk3
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 32648ee34c90..7fedde2ad3ec 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
+, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
, systemd, wget, xorg }:
let
@@ -18,7 +18,7 @@ let
fontconfig
freetype
glib
- gnome3.gconf
+ gnome2.GConf
gdk_pixbuf
gtk3
pango
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 4e26d7683e69..0745836271ae 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib
+{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
@@ -15,7 +15,7 @@ let
freetype
gdk_pixbuf
glib
- gnome3.gconf
+ gnome2.GConf
gtk2
pango
hunspell
@@ -93,7 +93,7 @@ in
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
-
+
meta = {
description = "A modern, secure messenger";
homepage = https://wire.com/;
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 7c613a8a45a9..80210d898b39 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
+, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
, systemd, wget, xorg, xprintidle-ng }:
let
@@ -18,7 +18,7 @@ let
fontconfig
freetype
glib
- gnome3.gconf
+ gnome2.GConf
gdk_pixbuf
gtk3
pango
diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix
deleted file mode 100644
index 3e7ba45b03ae..000000000000
--- a/pkgs/desktops/gnome-3/core/gconf/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, python, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
- versionMajor = "3.2";
- versionMinor = "6";
- moduleName = "GConf";
-
- origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
- name = "gconf-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
- sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
- };
-
- buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk;
- propagatedBuildInputs = [ glib dbus-glib ];
- nativeBuildInputs = [ pkgconfig intltool ];
-
- # ToDo: ldap reported as not found but afterwards reported as supported
-
- outputs = [ "out" "dev" ];
-
- meta = with stdenv.lib; {
- homepage = https://projects.gnome.org/gconf/;
- description = "A system for storing application preferences";
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 6605d15a697e..9d62bead40d4 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -45,10 +45,8 @@ lib.makeScope pkgs.newScope (self: with self; {
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
- inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
- orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; };
gtk = gtk3;
gtkmm = gtkmm3;
@@ -80,8 +78,6 @@ lib.makeScope pkgs.newScope (self: with self; {
evolution-data-server = callPackage ./core/evolution-data-server { };
- gconf = callPackage ./core/gconf { };
-
geocode-glib = callPackage ./core/geocode-glib { };
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index 4cd5cce272da..e626d293f83a 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
- boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview,
+ boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas,
gtksourceviewmm, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -11,23 +11,34 @@ stdenv.mkDerivation rec {
sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "nemiver"; attrPath = "gnome3.nemiver"; };
- };
+ nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ];
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop
- glibmm gtkmm vte gtksourceview gtksourceviewmm ];
+ buildInputs = [
+ gtk3 gdb boost sqlite libgtop
+ glibmm gtkmm vte gtksourceview gtksourceviewmm
+ gsettings-desktop-schemas
+ ];
patches = [
- ./bool_slot.patch ./safe_ptr.patch
+ ./bool_slot.patch
+ ./safe_ptr.patch
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
})
];
+ configureFlags = [
+ "--enable-gsettings"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "nemiver";
+ attrPath = "gnome3.nemiver";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Nemiver;
description = "Easy to use standalone C/C++ debugger";
@@ -36,4 +47,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.juliendehos ];
};
}
-
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 77220124fcc1..a54c336326ab 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
-, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils
+, wrapGAppsHook, librsvg, libxml2, desktop-file-utils
, guile_2_0, libcanberra-gtk3 }:
stdenv.mkDerivation rec {
@@ -11,16 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
};
+ configureFlags = [
+ "--with-card-theme-formats=svg"
+ "--with-platform=gtk-only" # until they remove GConf
+ ];
+
+ nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ];
+ buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ];
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "aisleriot"; attrPath = "gnome3.aisleriot"; };
+ updateScript = gnome3.updateScript {
+ packageName = "aisleriot";
+ attrPath = "gnome3.aisleriot";
+ };
};
- configureFlags = [ "--with-card-theme-formats=svg" ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf
- librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Aisleriot;
description = "A collection of patience games written in guile scheme";
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index 451d4b71296a..95674822aa36 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -1,5 +1,5 @@
{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
-, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }:
+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }:
# TODO: use dynamic attributes once Nix 1.7 is out
assert ((config.planetary_annihilation or null).url or null) != null;
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index c0b86336163d..8aeabebbefea 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -9,7 +9,7 @@
, enableOpenGL ? false, libGLU_combined ? null
# GUI toolkits
-, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null
+, enableGTK ? true, gtk2 ? null, gnome2 ? null
, enableSDL ? false
, enableQt ? false, qt4 ? null
@@ -27,7 +27,7 @@
with stdenv.lib;
-let
+let
available = x: x != null;
sound =
@@ -52,7 +52,7 @@ assert enableCairo -> available cairo;
assert enableOpenGL -> available libGLU_combined;
# GUI toolkits
-assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ];
+assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ];
assert enableSDL -> available SDL;
assert enableQt -> available qt4;
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
++ optional enableJemalloc jemalloc
++ optional enableHwAccel libGLU_combined
++ optionals enablePlugins [ xulrunner npapi_sdk ]
- ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ]
+ ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]
++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
configureFlags = with stdenv.lib; [
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 73aaea06c917..f7bb82e90dd9 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ];
nativeBuildInputs = [ automake autoconf intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 27fd4c4adc30..ad15723dd331 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ openconnect networkmanager libsecret ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ];
+ ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bee738475257..0a8475e9b2d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1767,7 +1767,8 @@ with pkgs;
};
ibus = callPackage ../tools/inputmethods/ibus {
- inherit (gnome3) dconf gconf glib;
+ gconf = gnome2.GConf;
+ inherit (gnome3) dconf glib;
};
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
@@ -12888,7 +12889,7 @@ with pkgs;
};
pulseaudioFull = pulseaudio.override {
- gconf = gnome3.gconf;
+ gconf = gnome2.GConf;
x11Support = true;
jackaudioSupport = true;
airtunesSupport = true;
@@ -15290,7 +15291,7 @@ with pkgs;
bonzomatic = callPackage ../applications/editors/bonzomatic { };
- brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };
+ brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };
notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
@@ -20142,7 +20143,8 @@ with pkgs;
mkPlasma5 = import ../desktops/plasma-5;
attrs = {
inherit libsForQt5 lib fetchurl;
- inherit (gnome3) gconf gsettings-desktop-schemas;
+ inherit (gnome3) gsettings-desktop-schemas;
+ gconf = gnome2.GConf;
};
in
recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
@@ -20947,7 +20949,7 @@ with pkgs;
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
crashplan = callPackage ../applications/backup/crashplan { };
- crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; };
+ crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; };
colort = callPackage ../applications/misc/colort { };
From 4488d3deb3226a2883ee85fb748ceeb7fc852006 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 11 Jul 2018 04:22:54 -0700
Subject: [PATCH 42/74] harfbuzz-icu: 1.8.1 -> 1.8.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz-icu/versions.
---
pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 88caf7476d02..a0160a8440da 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
}:
let
- version = "1.8.1";
+ version = "1.8.2";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
- sha256 = "0ifzhqbg4p6ka7ps5c7lapix09i9yy4z7achc1gf91dhvn967vgv";
+ sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8";
};
outputs = [ "out" "dev" ];
From d2f0fc1f414290b399301f284329b791c010ee85 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 9 Jul 2018 00:01:03 +0200
Subject: [PATCH 43/74] openblas: backport fix
https://github.com/xianyi/OpenBLAS/issues/1666
Causing test failures in cvxopt and (according to an openblas issue) numpy.
---
.../science/math/openblas/default.nix | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index fc8f11f2f11e..4630dc1b8ddb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils
+{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils
# Most packages depending on openblas expect integer width to match
# pointer width, but some expect to use 32-bit integers always
# (for compatibility with reference BLAS).
@@ -80,10 +80,11 @@ in
stdenv.mkDerivation rec {
name = "openblas-${version}";
version = "0.3.1";
- src = fetchurl {
- url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
- sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz";
- name = "openblas-${version}.tar.gz";
+ src = fetchFromGitHub {
+ owner = "xianyi";
+ repo = "OpenBLAS";
+ rev = "v${version}";
+ sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
};
inherit blas64;
@@ -117,7 +118,14 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
++ mapAttrsToList (var: val: var + "=" + val) config;
- patches = []; # TODO: Remove on next mass-rebuild
+ patches = [
+ # Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
+ # is causing problems and was already accepted upstream.
+ (fetchpatch {
+ url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
+ sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
+ })
+ ];
doCheck = true;
checkTarget = "tests";
From 1b3d8eefe39f2b2944ebff6c3f88e88383ba0f6e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 12 Jul 2018 11:48:29 -0500
Subject: [PATCH 44/74] openblas: backport another patch, fix crash w/Go and
Octave
Also fixes numpy crashing during tests w/musl.
---
.../development/libraries/science/math/openblas/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 4630dc1b8ddb..e00a5ca9f8d9 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -125,6 +125,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
})
+ # Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
+ # https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
+ (fetchpatch {
+ url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
+ sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
+ })
];
doCheck = true;
From 60a9ea4015d2a8354f3a0b72e8925d411a80e3f5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 12 Jul 2018 21:44:35 +0200
Subject: [PATCH 45/74] accountsservice: 0.6.49 -> 0.6.50
---
pkgs/development/libraries/accountsservice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index ddff61dbed09..36d7912d0f8a 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "accountsservice-${version}";
- version = "0.6.49";
+ version = "0.6.50";
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
- sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
+ sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
From 070b6e6fa4b212bd5b100d596f1d842e6f55ed69 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 14 Jul 2018 12:19:54 +0000
Subject: [PATCH 46/74] orage: fix tzdata pathes
---
pkgs/desktops/xfce/applications/orage.nix | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
index 9b347715c45e..2c99bad8156b 100644
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ b/pkgs/desktops/xfce/applications/orage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib
+{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
, libnotify, popt, xfce
}:
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
})
];
+ postPatch = ''
+ substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ '';
+
+ postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
+
nativeBuildInputs = [ pkgconfig intltool bison flex ];
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
From 134dc70dd76bb50b9b568a6b581fd8970fbf08fa Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 14 Jul 2018 12:21:06 +0000
Subject: [PATCH 47/74] xfce4-13.orage: fix tzdata pathes
---
pkgs/desktops/xfce4-13/orage/default.nix | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix
index 3857846ea82d..3c8395a49088 100644
--- a/pkgs/desktops/xfce4-13/orage/default.nix
+++ b/pkgs/desktops/xfce4-13/orage/default.nix
@@ -1,5 +1,5 @@
-{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null
-, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
+{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
+, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
@@ -13,9 +13,17 @@ mkXfceDerivation rec {
version = "4.12.1";
sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
- buildInputs = [ dbus_glib gtk2 libical libnotify popt ]
+ buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
+ postPatch = ''
+ substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ '';
+
+ postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
+
patches = [
# Fix build with libical 3.0
(fetchpatch {
From af315bb6c82200dcc0a7cf4111126c1c3fd67b7e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 14 Jul 2018 08:38:39 -0400
Subject: [PATCH 48/74] ncurses: Fix static build.
---
pkgs/development/libraries/ncurses/default.nix | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index cf478837b86d..cbe977a01926 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
"--enable-pc-files"
"--enable-symlinks"
] ++ lib.optional unicode "--enable-widec"
- ++ lib.optional enableStatic "--enable-static"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
@@ -109,6 +108,11 @@ stdenv.mkDerivation rec {
for statictype in a dll.a la; do
if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype
+ if [ "ncurses" = "$library" ]
+ then
+ # make libtinfo symlinks
+ ln -svf lib''${library}$suffix.$statictype $out/lib/libtinfo$newsuffix.$statictype
+ fi
fi
done
ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
@@ -127,7 +131,7 @@ stdenv.mkDerivation rec {
moveToOutput "bin/infotocap" "$out"
'';
- preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
+ preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) ''
rm "$out"/lib/*.a
'';
From d30b429cf8eb4b940ac598119dc716bf95158cfe Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 14 Jul 2018 12:37:27 +0000
Subject: [PATCH 49/74] xfce4-panel: fix tzdata path
---
pkgs/desktops/xfce/core/xfce4-panel.nix | 5 ++++-
pkgs/desktops/xfce4-13/xfce4-panel/default.nix | 8 +++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 17fd08faf69c..d2d992d54a88 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4-mixer, hicolor-icon-theme
+, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
, withGtk3 ? false, gtk3, gettext, glib-networking
}:
let
@@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
for f in $(find . -name \*.sh); do
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
done
+ substituteInPlace plugins/clock/clock.c \
+ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
+ --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
'';
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index 88ba2de49be0..db05517eb0bf 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
mkXfceDerivation rec {
category = "xfce";
@@ -9,6 +9,12 @@ mkXfceDerivation rec {
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
+ postPatch = ''
+ substituteInPlace plugins/clock/clock.c \
+ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
+ --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
+ '';
+
meta = {
description = "Xfce's panel";
};
From b04631ffd7db9212248bfccc24e1ae2f487a0c5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Jul 2018 12:19:58 -0700
Subject: [PATCH 50/74] e2fsprogs: 1.44.2 -> 1.44.3 (#43352)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/e2fsprogs/versions.
---
pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 8497dcc0a399..ef18d24778ff 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
stdenv.mkDerivation rec {
- name = "e2fsprogs-1.44.2";
+ name = "e2fsprogs-1.44.3";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
- sha256 = "0s3znfy26as63gdbskm6pxh3i1106bpxf2jh9dppd8d9lidmmh75";
+ sha256 = "1gl34i2dy1n7aky9g0jgdybl3ar2zh8i8xnghrcbb5pvws66vbn2";
};
outputs = [ "bin" "dev" "out" "man" "info" ];
From fcc747ffa0afc8699ecfe51b16ba39a98a2e542d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 15 Jul 2018 01:14:36 +0200
Subject: [PATCH 51/74] python.pkgs.backports_ssl_match_hostname: move
expression
---
.../backports_ssl_match_hostname/default.nix | 17 +++++++++++++++++
pkgs/top-level/python-packages.nix | 16 ++--------------
2 files changed, 19 insertions(+), 14 deletions(-)
create mode 100644 pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
new file mode 100644
index 000000000000..1dbca3943a9a
--- /dev/null
+++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "backports.ssl_match_hostname";
+ version = "3.5.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
+ };
+
+ meta = with lib; {
+ description = "The Secure Sockets layer is only actually *secure*";
+ homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
+ license = licenses.psfl;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b292bef4f163..0f97de7347f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -955,20 +955,8 @@ in {
};
};
- backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec {
- name = "backports.ssl_match_hostname-${version}";
- version = "3.5.0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/b/backports.ssl_match_hostname/${name}.tar.gz";
- sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
- };
-
- meta = {
- description = "The Secure Sockets layer is only actually *secure*";
- homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
- };
- };
+ backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else
+ callPackage ../development/python-modules/backports_ssl_match_hostname { };
backports_lzma = callPackage ../development/python-modules/backports_lzma { };
From 18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 15 Jul 2018 01:19:03 +0200
Subject: [PATCH 52/74] python.pkgs.backports_ssl_match_hostname_3_4_0_2:
remove
---
pkgs/applications/misc/octoprint/default.nix | 8 +++++++-
pkgs/top-level/python-packages.nix | 14 --------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 6b057186eaf3..b3a32d30c39c 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -4,7 +4,13 @@ let
pythonPackages = python2.pkgs.override {
overrides = self: super: with self; {
- backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;
+ backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec {
+ version = "3.4.0.2";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
+ };
+ });
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
version = "0.12.4";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f97de7347f9..0338ca81d65d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -941,20 +941,6 @@ in {
backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };
- backports_ssl_match_hostname_3_4_0_2 = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec {
- name = "backports.ssl_match_hostname-3.4.0.2";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz";
- sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
- };
-
- meta = {
- description = "The Secure Sockets layer is only actually *secure*";
- homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
- };
- };
-
backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else
callPackage ../development/python-modules/backports_ssl_match_hostname { };
From 220618ef9ce670ddcc98822e9bd4e80d95baf6a3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 10 Jul 2018 20:43:22 -0700
Subject: [PATCH 53/74] perlPackages: remove search.cpan.org; add metacpan.org
default homepage
https://www.perl.com/article/saying-goodbye-to-search-cpan-org/
maybe one operation less
..with unifying recursiveUpdate and first //
although not tested
fix whitespace
---
.../perl-modules/DBD-Pg/default.nix | 1 -
.../perl-modules/generic/default.nix | 6 +-
pkgs/servers/openxpki/default.nix | 2 +-
.../tools/filesystems/file-rename/default.nix | 1 -
pkgs/tools/graphics/graph-easy/default.nix | 3 +-
pkgs/tools/misc/rename/default.nix | 1 -
pkgs/top-level/perl-packages.nix | 136 +-----------------
7 files changed, 8 insertions(+), 142 deletions(-)
diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index f69ce015ed1c..f6b31aafaf65 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -17,7 +17,6 @@ buildPerlPackage rec {
doCheck = false;
meta = {
- homepage = http://search.cpan.org/dist/DBD-Pg/;
description = "DBI PostgreSQL interface";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index b33861d83eed..561bbcdb73ec 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -3,6 +3,8 @@ perl:
{ nativeBuildInputs ? [], name, ... } @ attrs:
perl.stdenv.mkDerivation (
+ (
+ perl.stdenv.lib.recursiveUpdate
{
outputs = [ "out" "devdoc" ];
@@ -20,9 +22,11 @@ perl.stdenv.mkDerivation (
# authors to skip certain tests (or include certain tests) when
# the results are not being monitored by a human being."
AUTOMATED_TESTING = true;
+
+ meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
}
- //
attrs
+ )
//
{
name = "perl-" + name;
diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index 111c2f02b996..e8f36fa033e2 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -34,7 +34,7 @@ buildPerlPackage {
ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny
CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ]
++ stdenv.lib.optionals extraDependencies3
- [ # dependencies taken from http://search.cpan.org/~alech/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
+ [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen
ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber
diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix
index 1818a517fd25..6c226bb97845 100644
--- a/pkgs/tools/filesystems/file-rename/default.nix
+++ b/pkgs/tools/filesystems/file-rename/default.nix
@@ -17,7 +17,6 @@ perlPackages.buildPerlPackage rec {
meta = with stdenv.lib; {
description = "Perl extension for renaming multiple files";
- homepage = http://search.cpan.org/~rmbarker;
license = licenses.artistic1;
maintainers = with maintainers; [ peterhoeg ];
};
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix
index e505f0bb6db5..9b4c46779626 100644
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -7,9 +7,8 @@ buildPerlPackage rec {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
};
-
+
meta = with stdenv.lib; {
- homepage = http://search.cpan.org/~tels/Graph-Easy/bin/graph-easy;
description = "Render/convert graphs in/from various formats";
license = licenses.gpl1;
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index 450424d0f54c..3f2a66bf4c82 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -12,7 +12,6 @@ buildPerlPackage rec {
};
meta = with stdenv.lib; {
description = "Rename files according to a Perl rewrite expression";
- homepage = http://search.cpan.org/~pederst/rename-1.9/bin/rename.PL;
maintainers = with maintainers; [ mkg ];
license = with licenses; [ gpl1Plus ];
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c910c2852f0b..82243660149d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -404,7 +404,6 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ ParamsValidate ];
doCheck = false;
meta = {
- homepage = https://metacpan.org/release/Attribute-Params-Validate;
description = "Define validation through subroutine attributes";
license = stdenv.lib.licenses.artistic2;
};
@@ -681,7 +680,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d";
};
meta = {
- homepage = http://search.cpan.org/dist/autovivification/;
description = "Lexically disable autovivification";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -734,7 +732,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ];
meta = {
- homepage = https://metacpan.org/release/B-Hooks-EndOfScope;
description = "Execute code after a scope finished compilation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -844,7 +841,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Helper functions for op tree manipulation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "http://search.cpan.org/dist/B-Utils";
};
};
@@ -1048,7 +1044,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc";
};
meta = {
- homepage = https://metacpan.org/release/Capture-Tiny;
description = "Capture STDOUT and STDERR from Perl, XS or external programs";
license = stdenv.lib.licenses.asl20;
};
@@ -1097,7 +1092,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ CarpAssert ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
license = stdenv.lib.licenses.artistic2;
};
buildInputs = [ TestException ];
@@ -1222,7 +1216,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ];
propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ];
meta = {
- homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/;
description = "Serves PODs right from your Catalyst application";
license = stdenv.lib.licenses.bsd3;
maintainers = [ maintainers.rycee ];
@@ -1333,7 +1326,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ CatalystRuntime DateTime ];
meta = {
- homepage = https://metacpan.org/release/Catalyst-Plugin-AccessLog;
description = "Request logging from within Catalyst";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -1712,7 +1704,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x";
};
meta = {
- homepage = https://metacpan.org/module/CDDB_get;
description = "Get the CDDB info for an audio cd";
license = stdenv.lib.licenses.artistic1;
platforms = stdenv.lib.platforms.linux;
@@ -1729,7 +1720,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep TestNoWarnings TestWarn ];
propagatedBuildInputs = [ HTMLParser ];
meta = {
- homepage = https://metacpan.org/module/CGI;
description = "Handle Common Gateway Interface requests and responses";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
@@ -1797,7 +1787,6 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ CGI FCGI ];
doCheck = false;
meta = {
- homepage = https://metacpan.org/module/CGI::Fast;
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -1980,7 +1969,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestException ];
propagatedBuildInputs = [ MROCompat ];
meta = {
- homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT;
description = "Make NEXT suck less";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -2261,7 +2249,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ];
meta = {
- homepage = https://metacpan.org/release/Class-Virtual;
description = "Base class for virtual base classes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -2320,7 +2307,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Choose appropriate clone utility";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/release/Clone-Choose";
};
};
@@ -2346,7 +2332,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Engine for tidyall, your all-in-one code tidier and validator";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = https://metacpan.org/release/Code-TidyAll;
};
};
@@ -2373,7 +2358,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Implements some sane defaults for Perl programs";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -2404,7 +2388,6 @@ let self = _self // overrides; _self = with self; {
BZIP2_INCLUDE = "${pkgs.bzip2.dev}/include";
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Low-Level Interface to bzip2 compression library";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -3002,7 +2985,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ];
propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ];
meta = {
- homepage = http://search.cpan.org/dist/Crypt-Random-Source;
description = "Get weak or strong random data from pluggable sources";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ];
@@ -3068,7 +3050,6 @@ let self = _self // overrides; _self = with self; {
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
meta = with stdenv.lib; {
- homepage = https://metacpan.org/release/Crypt-OpenSSL-AES;
description = "Perl wrapper around OpenSSL's AES library";
license = with licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
@@ -3464,7 +3445,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestRequires ];
propagatedBuildInputs = [ Moose PathClass namespaceclean ];
meta = {
- homepage = https://metacpan.org/release/Data-Stream-Bulk;
description = "N at a time iteration API";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -3528,7 +3508,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ListAllUtils ];
propagatedBuildInputs = [ MathRandomMTAuto ];
meta = {
- homepage = https://metacpan.org/release/Data-UUID-MT;
description = "Fast random UUID generator using the Mersenne Twister algorithm";
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ ];
@@ -3545,7 +3524,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ Test2Suite TestSimple13 ];
propagatedBuildInputs = [ NetDomainTLD ];
meta = {
- homepage = https://metacpan.org/release/Data-Validate-Domain;
description = "Domain and host name validation";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
@@ -3561,7 +3539,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestRequires ];
propagatedBuildInputs = [ NetAddrIP ];
meta = {
- homepage = https://metacpan.org/release/Data-Validate-IP;
description = "IPv4 and IPv6 validation methods";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
@@ -3840,7 +3817,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TestWarnings ];
propagatedBuildInputs = [ DateTime PackageDeprecationManager ];
meta = {
- homepage = https://metacpan.org/release/DateTime-Format-Strptime;
description = "Parse and format strp and strf time patterns";
license = stdenv.lib.licenses.artistic2;
};
@@ -3867,7 +3843,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ DateTime ];
meta = {
- homepage = http://search.cpan.org/dist/DateTime-Format-W3CDTF/;
description = "Parse and format W3CDTF datetime strings";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -3882,7 +3857,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ];
propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ];
meta = {
- homepage = https://metacpan.org/release/DateTime-Locale;
description = "Localization support for DateTime.pm";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -3910,7 +3884,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TestRequires ];
propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ];
meta = {
- homepage = https://metacpan.org/release/DateTime-TimeZone;
description = "Time zone object base class and factory";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4250,7 +4223,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestMockModule ];
propagatedBuildInputs = [ DBI ];
meta = {
- homepage = http://search.cpan.org/dist/DBIx-Connector/;
description = "Fast, safe DBI connection and transaction management";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ];
@@ -4367,7 +4339,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ SubExporterProgressive ];
meta = {
- homepage = http://search.cpan.org/dist/Devel-GlobalDestruction;
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
@@ -4442,7 +4413,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848";
};
meta = {
- homepage = https://metacpan.org/release/Devel-StackTrace;
description = "An object representing a stack trace";
license = stdenv.lib.licenses.artistic2;
};
@@ -4583,7 +4553,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ ModuleRuntime ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Declare version conflicts for your dist";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4614,7 +4583,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ MooseAutobox TestCPANMeta TestPerlCritic TestVersion ];
propagatedBuildInputs = [ DistZillaPluginMojibakeTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestNoTabs DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion PodCoverageTrustPod ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/;
description = "Test your dist with every testing plugin conceivable";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4705,7 +4673,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ CPANChanges TestDeep ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
description = "Release tests for your changelog";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4750,7 +4717,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep TestDistManifest TestOutput ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/;
description = "Release tests for the manifest";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4765,7 +4731,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestDeep TestEOL TestWarnings ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/;
description = "Author tests making sure correct line endings are used";
license = stdenv.lib.licenses.artistic2;
};
@@ -4780,7 +4745,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestKwalitee ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee;
description = "Release tests for kwalitee";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4795,7 +4759,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep TestMinimumVersion TestOutput ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/;
description = "Release tests for minimum required versions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4825,7 +4788,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestDeep TestPerlCritic ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/;
description = "Tests to check your code against best practices";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4855,7 +4817,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/;
description = "Release tests for portability";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4870,7 +4831,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep TestOutput TestSynopsis ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/;
description = "Release tests for synopses";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4885,7 +4845,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep TestOutput TestVars ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/;
description = "Release tests for unused variables";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4900,7 +4859,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ Filechdir TestDeep TestEOL TestNoTabs TestScript TestVersion ];
propagatedBuildInputs = [ DistZilla ];
meta = {
- homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/;
description = "Release Test::Version tests";
license = stdenv.lib.licenses.artistic2;
};
@@ -4943,7 +4901,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "RFC 2822 Address Parsing";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -4997,7 +4954,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ];
meta = {
- homepage = "http://search.cpan.org/~rjbs/${name}";
description = "Reply to an email message";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5042,7 +4998,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789";
};
meta = {
- homepage = "http://search.cpan.org/dist/${name}";
description = "Strip the attachments from an email";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5277,7 +5232,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0";
};
meta = {
- homepage = http://search.cpan.org/dist/Env;
description = "Perl module that imports environment variables as scalars or arrays";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5324,7 +5278,6 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ TestFatal TestRequires ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Safely and cleanly create closures via string eval";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5416,7 +5369,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078";
};
meta = {
- homepage = https://metacpan.org/release/Exporter-Tiny;
description = "An exporter with the features of Sub::Exporter but only core dependencies";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5523,7 +5475,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea";
};
meta = {
- homepage = https://metacpan.org/release/ExtUtils-Install;
description = "Install files from here to there";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5562,7 +5513,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480";
};
meta = {
- homepage = https://metacpan.org/release/ExtUtils-MakeMaker;
description = "Create a module Makefile";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5621,7 +5571,7 @@ let self = _self // overrides; _self = with self; {
# and ships with the standard library of perl starting with perl version
# 5.16.
#
- # [1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm:
+ # [1] https://metacpan.org/pod/release/SMUELLER/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm:
ExtUtilsTypemap = buildPerlPackage rec {
name = "ExtUtils-Typemap-1.00";
src = fetchurl {
@@ -5776,7 +5726,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a";
};
meta = {
- homepage = http://search.cpan.org/dist/File-CheckTree;
description = "Run many filetest checks on a tree";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -5965,7 +5914,6 @@ let self = _self // overrides; _self = with self; {
--replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc"
'';
meta = {
- homepage = https://metacpan.org/release/File::LibMagic;
description = "Determine MIME types of data or files using libmagic";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
@@ -6069,7 +6017,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc";
};
meta = {
- homepage = https://metacpan.org/release/File-pushd;
description = "Change directory temporarily for a limited scope";
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ ];
@@ -6754,7 +6701,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 Pango ];
meta = {
- homepage = https://metacpan.org/pod/Gtk2::GladeXML;
description = "Create user interfaces directly from Glade XML files";
license = stdenv.lib.licenses.lgpl2Plus;
};
@@ -6999,7 +6945,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ FileSlurper TestWarnings ];
propagatedBuildInputs = [ FontAFM HTMLTree ];
meta = {
- homepage = https://metacpan.org/release/HTML-Formatter;
description = "Base class for HTML formatters";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -7086,7 +7031,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ];
meta = {
- homepage = https://metacpan.org/release/HTML-Mason;
description = "High-performance, dynamic web site authoring system";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -7101,7 +7045,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ Plack ];
propagatedBuildInputs = [ CGIPSGI HTMLMason ];
meta = {
- homepage = http://search.cpan.org/dist/HTML-Mason-PSGIHandler/;
description = "PSGI handler for HTML::Mason";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -7252,7 +7195,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ HTMLParser ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Work with HTML in a DOM-like tree structure";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -7688,7 +7630,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "IO Interface to compressed data files/buffers";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux;
@@ -7921,7 +7862,6 @@ let self = _self // overrides; _self = with self; {
};
doCheck = false; /* attempts a network connection to localhost */
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
@@ -8196,7 +8136,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ TypesSerialiser ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
buildInputs = [ CanaryStability ];
@@ -8352,7 +8291,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestNoWarnings ];
propagatedBuildInputs = [ LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ];
meta = {
- homepage = https://metacpan.org/release/Lingua-EN-Inflect-Phrase;
description = "Inflect short English Phrases";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -8367,7 +8305,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TryTiny ];
propagatedBuildInputs = [ LinguaENFindNumber ];
meta = {
- homepage = https://metacpan.org/release/Lingua-EN-Number-IsOrdinal;
description = "Detect if English number is ordinal or cardinal";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -8557,7 +8494,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ];
meta = {
- homepage = https://metacpan.org/release/List-MoreUtils;
description = "Provide the stuff missing in List::Util";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -8577,7 +8513,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Provide the stuff missing in List::Util in XS";
license = with stdenv.lib.licenses; [ asl20 ];
- homepage = "https://metacpan.org/release/List-MoreUtils-XS";
};
};
@@ -8590,7 +8525,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestLeakTrace ];
propagatedBuildInputs = [ ModuleImplementation ];
meta = {
- homepage = https://metacpan.org/release/List-SomeUtils;
description = "Provide the stuff missing in List::Util";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -8671,7 +8605,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c";
};
meta = {
- homepage = http://search.cpan.org/dist/Locale-Maketext-Lexicon;
description = "Use other catalog formats in Maketext";
license = "mit";
};
@@ -9390,7 +9323,6 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ TestNoWarnings ];
meta = {
- homepage = http://search.cpan.org/dist/Math-Random-ISAAC;
description = "Perl interface to the ISAAC PRNG algorithm";
license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ];
maintainers = with maintainers; [ ];
@@ -9807,7 +9739,6 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ ModuleRuntime TryTiny ];
meta = {
inherit version;
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Loads one of several alternate underlying implementations for a module";
license = stdenv.lib.licenses.artistic2;
};
@@ -9964,7 +9895,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Runtime module handling";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -10111,7 +10041,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74";
};
meta = {
- homepage = http://search.cpan.org/dist/IO-Pipely/;
description = "Portably create pipe() or pipe-like handles";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -10176,7 +10105,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "provide API used in translator modules without translating";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/release/MooX-Locale-Passthrough";
};
};
@@ -10190,7 +10118,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "provide API used in translator modules without translating";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/release/MooX-Locale-TextDomain-OO";
};
};
@@ -10205,7 +10132,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Explicit Options eXtension for Object Class";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/celogeek/MooX-Options";
};
};
@@ -10220,7 +10146,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "turn your Moo class into singleton";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "http://search.cpan.org/dist/MooX-Singleton";
};
};
@@ -10235,7 +10160,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Make your Moo-based object constructors blow up on unknown attributes.";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/release/MooX-StrictConstructor";
};
};
@@ -10286,7 +10210,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ Moose ];
meta = {
- homepage = https://metacpan.org/release/MooseX-ABC;
description = "Abstract base classes for Moose";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ];
@@ -10346,7 +10269,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Giving an easy Moo style way to make command organized CLI apps";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/release/MooX-Cmd";
};
};
@@ -10359,7 +10281,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TestRequires ];
propagatedBuildInputs = [ Moo TypeTiny ];
meta = {
- homepage = https://metacpan.org/release/MooX-late;
description = "Easily translate Moose code to Moo";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -10606,7 +10527,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ Moose namespaceautoclean ];
meta = {
- homepage = https://metacpan.org/release/MooseX-MarkAsMethods/;
description = "Mark overload code symbols as methods";
license = stdenv.lib.licenses.lgpl21;
};
@@ -10701,7 +10621,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ Moose aliased namespaceautoclean ];
meta = {
- homepage = https://metacpan.org/release/MooseX-Role-WithOverloading;
description = "Roles which support overloading";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -10943,7 +10862,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ DateTime ModuleBuildTiny MooseXTypesDateTime TestFatal TestNeeds ];
propagatedBuildInputs = [ DevelPartialDump MooseXTypes ];
meta = {
- homepage = https://metacpan.org/release/MooseX-Types-Structured;
description = "MooseX::Types::Structured - Structured Type Constraints for Moose";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ];
@@ -11080,7 +10998,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ BHooksEndOfScope PackageStash ];
meta = {
- homepage = http://search.cpan.org/dist/namespace-clean;
description = "Keep imports and functions out of your namespace";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -11175,7 +11092,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestException ];
propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ];
meta = {
- homepage = http://search.cpan.org/dist/Net-Amazon-S3/;
description = "Use the Amazon S3 - Simple Storage Service";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -11755,7 +11671,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TestWarnings ];
propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ];
meta = {
- homepage = https://metacpan.org/release/Package-DeprecationManager;
description = "Manage deprecation warnings for your distribution";
license = stdenv.lib.licenses.artistic2;
};
@@ -11768,7 +11683,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c";
};
meta = {
- homepage = "http://search.cpan.org/~tmannerm/${name}";
description = "Utilities to read and manipulate patches and CVS";
license = with stdenv.lib.licenses; [ artistic1 ];
};
@@ -11783,7 +11697,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestFatal TestRequires ];
propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ];
meta = {
- homepage = https://metacpan.org/release/Package-Stash;
description = "Routines for manipulating stashes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -11797,7 +11710,6 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ TestFatal TestRequires ];
meta = {
- homepage = https://metacpan.org/release/Package-Stash-XS;
description = "Faster and more correct implementation of the Package::Stash API";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -11862,7 +11774,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Simple, compact and correct param-checking functions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -11878,7 +11789,6 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ ModuleImplementation ];
perlPreHook = "export LD=$CC";
meta = {
- homepage = https://metacpan.org/release/Params-Validate;
description = "Validate method/function parameters";
license = stdenv.lib.licenses.artistic2;
};
@@ -11895,7 +11805,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Build an optimized subroutine parameter validator once, use it forever";
license = with stdenv.lib.licenses; [ artistic2 ];
- homepage = https://metacpan.org/release/Params-ValidationCompiler;
};
};
@@ -11962,7 +11871,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ IOStringy LWP ];
meta = with stdenv.lib; {
- homepage = http://search.cpan.org/~jaybonci/Parse-DebControl;
license = with licenses; [ artistic1 gpl1Plus ];
};
};
@@ -12047,7 +11955,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef";
};
meta = {
- homepage = https://metacpan.org/release/Path-Tiny;
description = "File path utility";
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ ];
@@ -12137,7 +12044,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b";
};
meta = {
- homepage = https://metacpan.org/release/Perl-osnames;
description = "List possible $^O ($OSNAME) values, with description";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -12288,7 +12194,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "5cb6e934d29dd93e04c2fa779f4b7e51361edaf56957b47a232017a4bb7e922c";
};
meta = {
- homepage = https://metacpan.org/pod/PkgConfig;
description = "Pure-Perl Core-Only replacement for pkg-config";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.limeytexan ];
@@ -12650,7 +12555,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ Perlosnames ];
propagatedBuildInputs = [ ProcProcessTable ];
meta = {
- homepage = https://metacpan.org/release/Proc-Find;
description = "Find processes by name, PID, or some other attributes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -13201,7 +13105,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "d7718d9bb0d4259eabf326838e3f841b440c4e959faf9615d9ad9c345f4a3d6f";
};
meta = {
- homepage = http://search.cpan.org/~dconway/Regexp-Grammars-1.045/lib/Regexp/Grammars.pm;
description = "Add grammatical parsing features to Perl 5.10 regexes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -13353,7 +13256,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Call isa, can, does and DOES safely on things that may not be objects";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -13407,7 +13309,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "7f151582423850d814034404b1e23b5efb281b9dd656b9afe81c761ebb88bbb4";
};
meta = {
- homepage = http://search.cpan.org/dist/Scope-Upper/;
description = "Act on upper scopes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -13560,7 +13461,6 @@ let self = _self // overrides; _self = with self; {
rm t/getnameinfo.t t/getaddrinfo.t
'';
meta = {
- homepage = https://metacpan.org/pod/Socket;
description = "Networking constants and support functions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -13643,7 +13543,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Type constraints and coercions for Perl";
license = with stdenv.lib.licenses; [ artistic2 ];
- homepage = https://metacpan.org/release/Specio;
};
};
@@ -13658,7 +13557,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Path::Tiny types and coercions for Specio";
license = with stdenv.lib.licenses; [ asl20 ];
- homepage = https://metacpan.org/release/Specio-Library-Path-Tiny;
};
};
@@ -13997,7 +13895,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ SubExporter ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Rewrite strings based on a set of known prefixes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -14164,7 +14061,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Only use Sub::Exporter if you need it";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -14206,7 +14102,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Install subroutines into packages easily";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -14429,7 +14324,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k";
};
meta = {
- homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;
description = "Stream TAP from pgTAP test scripts";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux;
@@ -14460,7 +14354,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ];
propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ];
meta = {
- homepage = https://metacpan.org/release/Task-FreecellSolver-Testing;
description = "Install the CPAN dependencies of the Freecell Solver test suite";
license = stdenv.lib.licenses.mit;
};
@@ -14859,7 +14752,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Fail if tests warn";
license = with stdenv.lib.licenses; [ artistic2 ];
- homepage = https://metacpan.org/release/Test2-Plugin-NoWarnings;
};
};
@@ -15081,7 +14973,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
};
};
@@ -15119,7 +15010,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ ModuleManifest ];
meta = {
- homepage = http://search.cpan.org/dist/Test-DistManifest;
description = "Author test that validates a package MANIFEST";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -15132,7 +15022,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf";
};
meta = {
- homepage = https://metacpan.org/release/Test-EOL;
description = "Check the correct line endings in your project";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ];
@@ -15157,7 +15046,6 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ CaptureTiny ];
meta = {
- homepage = https://metacpan.org/release/Test-FailWarnings;
description = "Add test failures if warnings are caught";
license = stdenv.lib.licenses.asl20;
maintainers = with maintainers; [ ];
@@ -15201,7 +15089,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ TextDiff ];
meta = {
- homepage = http://search.cpan.org/dist/Test-File-Contents/;
description = "Test routines for examining the contents of files";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -15529,7 +15416,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Make sure you didn't emit any warnings while testing";
license = stdenv.lib.licenses.lgpl21;
};
@@ -15594,7 +15480,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30";
};
meta = {
- homepage = http://search.cpan.org/dist/Test-Pod/;
description = "Check for POD errors in files";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -15618,7 +15503,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ ModuleBuildTiny TestPod ];
propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ];
meta = {
- homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/;
description = "Tests POD for invalid links";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -15632,7 +15516,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ LWP URIFind ];
meta = {
- homepage = http://search.cpan.org/dist/Test-Pod-No404s/;
description = "Checks POD for any http 404 links";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -15672,7 +15555,6 @@ let self = _self // overrides; _self = with self; {
meta = {
description = "Easily test network connectivity";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- homepage = "https://metacpan.org/dist/Test-RequiresInternet";
};
};
@@ -16005,7 +15887,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ SubUplevel ];
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Perl extension to test methods for warnings";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -16246,7 +16127,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "2b4f111e9486b230b02bfabbbf50c453f959d18ec17351a930e41f0959b358b7";
};
meta = {
- homepage = https://metacpan.org/pod/Text::CSV_XS;
description = "Comma-Separated Values manipulation routines";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -16576,7 +16456,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ TestException ];
propagatedBuildInputs = [ FileFindRulePerl ];
meta = {
- homepage = https://metacpan.org/dist/Test-Version;
description = "Check to see that version's in modules are sane";
license = stdenv.lib.licenses.artistic2;
};
@@ -16940,7 +16819,6 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ];
doCheck = false; # Expects working X11.
meta = {
- homepage = https://metacpan.org/pod/distribution/Tk/Tk.pod;
license = stdenv.lib.licenses.tcltk;
};
};
@@ -16952,7 +16830,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw";
};
meta = {
- homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "An N-ary tree";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -16990,7 +16867,6 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ CPANMetaCheck CaptureTiny ];
meta = {
- homepage = https://metacpan.org/release/Try-Tiny;
description = "Minimal try/catch with proper preservation of $@";
license = stdenv.lib.licenses.mit;
};
@@ -17019,7 +16895,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ ExporterTiny ];
meta = {
- homepage = https://metacpan.org/release/Type-Tiny;
description = "Tiny, yet Moo(se)-compatible type constraint";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17094,7 +16969,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d";
};
meta = {
- homepage = https://metacpan.org/release/Unicode-CaseFold;
description = "Unicode case-folding for case-insensitive lookups";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17202,7 +17076,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ URINested ];
meta = {
- homepage = https://search.cpan.org/dist/URI-db/;
description = "Database URIs";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17216,7 +17089,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ URI ];
meta = {
- homepage = http://search.cpan.org/dist/URI-Find;
description = "Find URIs in arbitrary text";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17276,7 +17148,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ URI ];
meta = {
- homepage = https://metacpan.org/release/URI-Nested/;
description = "Nested URIs";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17315,7 +17186,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c";
};
meta = {
- homepage = http://search.cpan.org/dist/Variable-Magic/;
description = "Associate user-defined magic to variables from Perl";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17346,7 +17216,6 @@ let self = _self // overrides; _self = with self; {
outputs = [ "out" ];
meta = {
maintainers = [ maintainers.chreekat ];
- homepage = "http://search.cpan.org/~woldrich/App-vidir/bin/vidir";
description = "Edit a directory in $EDITOR";
license = with stdenv.lib.licenses; [ gpl1 ];
};
@@ -17373,7 +17242,6 @@ let self = _self // overrides; _self = with self; {
};
propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ];
meta = {
- homepage = http://search.cpan.org/dist/VM-EC2-Security-CredentialCache/;
description = "Cache credentials respecting expiration time for IAM roles";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17911,7 +17779,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8";
};
meta = {
- homepage = https://metacpan.org/module/Math::BigInt;
description = "Dynamically load C libraries into Perl code";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -17953,7 +17820,6 @@ let self = _self // overrides; _self = with self; {
sha256 = "1iwd4pbwg7m1vwc74s3f3hk9yyqmhn1ssrbh9466lmbnc4hl9cv2";
};
meta = {
- homepage = http://search.cpan.org/dist/YAML-Syck;
description = "Fast, lightweight YAML loader and dumper";
license = stdenv.lib.licenses.mit;
};
From 338f71a3382836f4ea80d57cd383673574989fe5 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 15 Jul 2018 14:26:33 +0200
Subject: [PATCH 54/74] pythonPackages.cvxopt: re-enable tests (#43566)
This reverts commit 64a64e7483581b2ea64b48a74671681176d14631. The issue
was fixed in d2f0fc1f414290b399301f284329b791c010ee85.
---
pkgs/development/python-modules/cvxopt/default.nix | 5 -----
1 file changed, 5 deletions(-)
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 906e2c0bbe4a..e17bd38da02b 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -46,11 +46,6 @@ buildPythonPackage rec {
export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include
'';
- # https://github.com/cvxopt/cvxopt/issues/122
- # This is fixed on staging (by #43234, status 2018-07-15), but until that
- # lands we should disable the tests. Otherwise the 99% of use cases that
- # should be unaffected by that failure are affected.
- doCheck = false;
checkPhase = ''
${python.interpreter} -m unittest discover -s tests
'';
From 4f2482ca3f46f8c6b8918e1d471d1278e4e9f71e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 15 Jul 2018 18:57:14 +0200
Subject: [PATCH 55/74] gdk-pixbuf.src: switch to fetchFromGitLab
---
pkgs/development/libraries/gdk-pixbuf/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3e11aaf7bc6b..94536f8f5b69 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
# url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
# };
- src = fetchgit {
- url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = "gdk-pixbuf";
rev = version;
sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
};
From e515b04e08f1872f9046ca7875878e141ab9e710 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Jul 2018 01:50:30 -0700
Subject: [PATCH 56/74] harfbuzz: 1.8.1 -> 1.8.2 (#43342)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz/versions.
From 2efc2ada846eb9db87a6fe6856b39899bd8f5f50 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 16 Jul 2018 09:55:24 +0000
Subject: [PATCH 57/74] [staging] pango: 1.40.14 -> 1.42.1 (#43171)
---
pkgs/development/libraries/pango/default.nix | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 9a27901c862d..c23e7c9617eb 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi
, libintl, gobjectIntrospection, darwin
}:
with stdenv.lib;
let
- ver_maj = "1.40";
- ver_min = "14";
+ ver_maj = "1.42";
+ ver_min = "1";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
- sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3";
+ sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
};
outputs = [ "bin" "dev" "out" "devdoc" ];
@@ -25,17 +25,10 @@ stdenv.mkDerivation rec {
CoreGraphics
CoreText
]);
- propagatedBuildInputs = [ cairo harfbuzz libXft libintl ];
+ propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
enableParallelBuilding = true;
- doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
- # jww (2014-05-05): The tests currently fail on Darwin:
- #
- # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
- # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
- # FAIL: testiter
-
configureFlags = optional stdenv.isDarwin "--without-x";
meta = with stdenv.lib; {
From 2badf9a6f88e5620f428b55f3bdedfe041ebf76c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 30 Mar 2018 00:01:00 +0000
Subject: [PATCH 58/74] libffi: simplify using `checkInputs`
---
pkgs/development/libraries/libffi/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 1c7c0715e75b..c35448066eea 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false
+{ stdenv, fetchurl, fetchpatch
, buildPlatform, hostPlatform, autoreconfHook
+, doCheck ? true, dejagnu
}:
stdenv.mkDerivation rec {
@@ -40,8 +41,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "info" ];
- buildInputs = stdenv.lib.optional doCheck dejagnu;
-
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
configureFlags = [
@@ -54,6 +53,8 @@ stdenv.mkDerivation rec {
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
'';
+ checkInputs = [ dejagnu ];
+
inherit doCheck;
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.
From acbee90e2becd4aa90412094df55c7a629da1435 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 30 Mar 2018 00:01:53 +0000
Subject: [PATCH 59/74] pythonPackges.hypothesis, pythonPackages.pytest:
simpify dependency cycle fix
---
pkgs/development/python-modules/hypothesis/default.nix | 2 +-
pkgs/top-level/python-packages.nix | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index d5ee59ac2d92..83e369ec0fcd 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
};
- checkInputs = [ pytest pytest_xdist flaky mock ];
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
+ checkInputs = [ pytest pytest_xdist flaky mock ];
inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de4966ec9539..fd62c3adb949 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1923,11 +1923,8 @@ in {
pytest = self.pytest_36;
pytest_36 = callPackage ../development/python-modules/pytest {
- hypothesis = self.hypothesis.override {
- # hypothesis requires pytest that causes dependency cycle
- doCheck = false;
- pytest = null;
- };
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override { doCheck = false; };
};
# Needed for celery
From 429d9988a3397e69505dbc432c758728cf0483a1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Jul 2018 20:23:32 -0500
Subject: [PATCH 60/74] utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
---
pkgs/os-specific/linux/util-linux/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 9ec6c22d32a5..5290c398b2f0 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -5,14 +5,14 @@ let
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.32";
- patchVersion = "";
+ patchVersion = "1";
in stdenv.mkDerivation rec {
name = "util-linux-${version}";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
- sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc";
+ sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6";
};
patches = [
From 583bd3aeb657101379afb88f42a0ebaafc67ff9a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Jul 2018 20:34:12 -0500
Subject: [PATCH 61/74] busybox: 1.29.0 -> 1.29.1
---
pkgs/os-specific/linux/busybox/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 06a2d4301596..e9f5f127dd39 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -33,14 +33,14 @@ let
in
stdenv.mkDerivation rec {
- name = "busybox-1.29.0";
+ name = "busybox-1.29.1";
# Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update.
src = fetchurl {
url = "https://busybox.net/downloads/${name}.tar.bz2";
- sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8";
+ sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
};
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
From d6a9a93a6243ee42cf63b7c8dfcfb6fb1f0a9c9c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Jul 2018 21:00:30 -0500
Subject: [PATCH 62/74] bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
---
pkgs/servers/dns/bind/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index ff99f7a7cbf6..f72ec76cc649 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,14 +8,14 @@
assert enableSeccomp -> libseccomp != null;
assert enablePython -> python3 != null;
-let version = "9.12.1-P2"; in
+let version = "9.12.2"; in
stdenv.mkDerivation rec {
name = "bind-${version}";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
- sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
+ sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
From 6075fa8d0c71549821d2a110b84b834048a880a8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Jul 2018 12:14:03 -0500
Subject: [PATCH 63/74] curl: 7.60.0 -> 7.61.0
---
pkgs/tools/networking/curl/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 2ebae0b0c17f..06798bdcc281 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
assert gssSupport -> kerberos != null;
stdenv.mkDerivation rec {
- name = "curl-7.60.0";
+ name = "curl-7.61.0";
src = fetchurl {
urls = [
- "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
"https://curl.haxx.se/download/${name}.tar.bz2"
+ "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
];
- sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9";
+ sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
From a96380527f5fdf4ae9db48d19f8db188f5569fe4 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 25 May 2018 23:51:04 +0000
Subject: [PATCH 64/74] mdds: fix tests
---
pkgs/development/libraries/mdds/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 90d86ea9165c..43fee9ccead8 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
version = "1.3.1";
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
'';
+ checkInputs = [ boost ];
+
meta = {
inherit version;
homepage = https://gitlab.com/mdds/mdds;
From a3aedd137260f7ec67831c725e12fa80a940e1da Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 29 May 2018 02:32:26 +0000
Subject: [PATCH 65/74] git: disable checks as tests are run in installcheck
---
.../version-management/git-and-tools/git/default.nix | 1 +
1 file changed, 1 insertion(+)
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 522a6fcd6a12..cb8d6a09503f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -238,6 +238,7 @@ EOF
## InstallCheck
+ doCheck = false;
doInstallCheck = true;
installCheckTarget = "test";
From 4d93021846cd04619c280d6fc9753ffc2c480514 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 16 Jul 2018 16:26:31 +0000
Subject: [PATCH 66/74] libcommuni: disable checks as tests are run in
installcheck
---
pkgs/development/libraries/libcommuni/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 0788236b6017..f247c48821f7 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
# The tests fail on darwin because of install_name if they run
# before the frameworks are installed.
+ doCheck = false;
doInstallCheck = true;
installCheckTarget = "check";
From 33a6533c120c113bca304816a09d8832b829fa44 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:05:51 +0000
Subject: [PATCH 67/74] gvfs: make tests run, but disable
---
pkgs/development/libraries/gvfs/default.nix | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 4f3bc64b5d40..7ac5b8756335 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -4,7 +4,7 @@
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
-, libsecret, libgdata
+, libsecret, libgdata, python3
# Remove when switching back to meson
, autoreconfHook, lzma, bzip2
}:
@@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
};
+ postPatch = ''
+ patchShebangs test test-driver
+ '';
+
# Uncomment when switching back to meson
# postPatch = ''
# chmod +x meson_post_install.py # patchShebangs requires executable file
@@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ checkInputs = [ python3 ];
+ doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
+ doInstallCheck = doCheck;
+
preFixup = ''
for f in $out/libexec/*; do
wrapProgram $f \
From d9c1aa465a8431685767ce57724de492376d2b52 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 16 Jul 2018 16:34:04 +0000
Subject: [PATCH 68/74] librdf: make tests run, but disable
---
pkgs/development/libraries/librdf/rasqal.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 07f560fe2724..124fd0178182 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }:
+{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }:
stdenv.mkDerivation rec {
name = "rasqal-0.9.33";
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
postInstall = "rm -rvf $out/share/gtk-doc";
+ checkInputs = [ perl ];
+ doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..."
+ doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)"
+
meta = {
description = "Library that handles Resource Description Framework (RDF)";
homepage = http://librdf.org/rasqal;
From 02acff883991e6a1275a04c9838e72bcc5b17120 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 16 Jul 2018 16:34:34 +0000
Subject: [PATCH 69/74] neon, neon_0_29: make tests run, but disable
---
pkgs/development/libraries/neon/0.29.nix | 5 ++++-
pkgs/development/libraries/neon/default.nix | 5 ++++-
pkgs/top-level/all-packages.nix | 10 ++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index e393d50bf9d2..dbde83c2d94b 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
, static ? false
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
passthru = {inherit compressionSupport sslSupport;};
+ checkInputs = [ perl ];
+ doCheck = false; # fails, needs the net
+
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 2351e3b0800b..9c2a3265491a 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
, static ? false
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
passthru = {inherit compressionSupport sslSupport;};
+ checkInputs = [ perl ];
+ doCheck = false; # fails, needs the net
+
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e815305b539e..0c86f1ed12b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11068,15 +11068,9 @@ with pkgs;
neardal = callPackage ../development/libraries/neardal { };
- neon = callPackage ../development/libraries/neon {
- compressionSupport = true;
- sslSupport = true;
- };
+ neon = callPackage ../development/libraries/neon { };
- neon_0_29 = callPackage ../development/libraries/neon/0.29.nix {
- compressionSupport = true;
- sslSupport = true;
- };
+ neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { };
nettle = callPackage ../development/libraries/nettle { };
From f7a6ea6fa6265304d6a94b9607d611da4d25bbb2 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:06:49 +0000
Subject: [PATCH 70/74] ilmbase: disable tests on i686. Spooky!
---
pkgs/development/libraries/ilmbase/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 956a8667be5f..156b4f72749a 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
patches = [ ./bootstrap.patch ];
+ # fails 1 out of 1 tests with
+ # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
+ # at least on i686. spooky!
+ doCheck = stdenv.isx86_64;
+
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
license = licenses.bsd3;
From 589d05cd09bda981e22283315bbdf0649917b704 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 29 May 2018 02:32:55 +0000
Subject: [PATCH 71/74] ruby: disable tests
---
pkgs/development/interpreters/ruby/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 89d394c87569..bd27041ba2d2 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -135,6 +135,11 @@ let
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
+ # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
+ # mostly TZ- and patch-related tests
+ # TZ- failures are caused by nix sandboxing, I didn't investigate others
+ doCheck = false;
+
preInstall = ''
# Ruby installs gems here itself now.
mkdir -pv "$out/${passthru.gemPath}"
From 06de6dc71b6d676884d0d0baaa7d9f1475c41bce Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Jul 2018 09:41:21 -0500
Subject: [PATCH 72/74] mesa: more include fixes
mostly from void-linux (thanks!)
---
pkgs/development/libraries/mesa/default.nix | 2 +-
.../libraries/mesa/missing-include.patch | 11 ----
.../libraries/mesa/missing-includes.patch | 55 +++++++++++++++++++
3 files changed, 56 insertions(+), 12 deletions(-)
delete mode 100644 pkgs/development/libraries/mesa/missing-include.patch
create mode 100644 pkgs/development/libraries/mesa/missing-includes.patch
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9c0bf29d4908..62a31161d64f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -92,7 +92,7 @@ let self = stdenv.mkDerivation {
patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch
- ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl
+ ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
];
outputs = [ "out" "dev" "drivers" "osmesa" ];
diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch
deleted file mode 100644
index dd3e6bb64af8..000000000000
--- a/pkgs/development/libraries/mesa/missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
-+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
-
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
-
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
new file mode 100644
index 000000000000..feb6ffe428c0
--- /dev/null
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -0,0 +1,55 @@
+--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
++++ ./src/gallium/winsys/svga/drm/vmw_screen.h
+@@ -34,7 +34,7 @@
+ #ifndef VMW_SCREEN_H_
+ #define VMW_SCREEN_H_
+
+-
++#include <sys/stat.h>
+ #include "pipe/p_compiler.h"
+ #include "pipe/p_state.h"
+
+--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200
++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200
+@@ -24,6 +24,8 @@
+ #ifndef _THREADPOOL_H_
+ #define _THREADPOOL_H_
+
++#include <pthread.h>
++
+ #define MAXTHREADS 1
+
+ struct threadpool {
+--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200
++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200
+@@ -23,7 +23,9 @@
+ */
+
+ #if defined(__linux__)
++#include <sys/types.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #else
+--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
+@@ -37,6 +37,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <time.h>
+ #include "util/u_atomic.h"
+ #include "util/list.h"
+
+--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+@@ -28,6 +28,8 @@
+ #ifndef RADV_AMDGPU_WINSYS_H
+ #define RADV_AMDGPU_WINSYS_H
+
++#include <sys/types.h>
++
+ #include "radv_radeon_winsys.h"
+ #include "ac_gpu_info.h"
+ #include "addrlib/addrinterface.h"<Paste>
From 488d42b0d255bba147885b13d18385254abd3797 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 17 Jul 2018 22:51:26 -0500
Subject: [PATCH 73/74] npth: 1.5 -> 1.6
minor bump
---
pkgs/development/libraries/npth/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index 203be8b6907b..c02998184fc5 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "npth-1.5";
+ name = "npth-1.6";
src = fetchurl {
url = "mirror://gnupg/npth/${name}.tar.bz2";
- sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
+ sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk";
};
doCheck = true;
From ce408e8e75707f6e09ee0bd839127b8de3a1db45 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 10 Jul 2018 21:14:42 -0500
Subject: [PATCH 74/74] boost167: Add lockfree next_prior patch
---
pkgs/development/libraries/boost/1.67.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 8b9e7ccca7f1..150272df6ca3 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -1,8 +1,14 @@
-{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
+{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.67_0";
+ patches = [ (fetchpatch {
+ url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
+ sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
+ stripLen = 1;
+ })];
+
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html