From 7bf70fe520bc203e1590c75a23ec2baeeceb719b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Dec 2018 11:59:58 -0600 Subject: [PATCH 001/200] pcap: Add missing include, fix w/musl --- pkgs/development/libraries/libpcap/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 62b8126dbc7..a12fae7082a 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" + '' + '' + sed -i '1i#include ' pcap-usb-linux.c ''; preInstall = ''mkdir -p $out/bin''; From 81b785ceae5e18332f9265634db28d562b4f4cbc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Dec 2018 11:21:15 -0600 Subject: [PATCH 002/200] gnused: 4.5 -> 4.6 https://savannah.gnu.org/forum/forum.php?forum_id=9331 Mirrors didn't seem to have it, hash obtained via $ nix-prefetch-url https://ftp.gnu.org/gnu/sed/sed-4.6.tar.xz --- pkgs/tools/text/gnused/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 4fa1a44f4ae..c87ed762640 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnused-${version}"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs"; + sha256 = "17mv15mmjbqmfp6x600ypp9jyvkh9sk47l8l4xrcqf3q3k7nmzxy"; }; outputs = [ "out" "info" ]; From e41ea1dfef5d8bdb4cabd50987f91d39eaddef98 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Dec 2018 11:25:06 -0600 Subject: [PATCH 003/200] gnugrep: 3.1 -> 3.2 https://savannah.gnu.org/forum/forum.php?forum_id=9332 Similar to gnused update, hash not obtained from mirrors (since they currently 404 for this) but nix-prefetch-url on master gnu site. --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0b6f36bea72..2b9946305ab 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "3.1"; in +let version = "3.2"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"; + sha256 = "172r64n2rzd8k4s1jg4ylszyf8n30smx0y2jc190zhvnpw2iyvlf"; }; # Perl is needed for testing From 96524cd90348d6a54f843b2eda0a2c147a613fda Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Dec 2018 00:47:18 -0600 Subject: [PATCH 004/200] gnused: 4.6 -> 4.7 https://lists.gnu.org/archive/html/sed-devel/2018-12/msg00028.html --- pkgs/tools/text/gnused/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index c87ed762640..8a44e434d4c 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnused-${version}"; - version = "4.6"; + version = "4.7"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "17mv15mmjbqmfp6x600ypp9jyvkh9sk47l8l4xrcqf3q3k7nmzxy"; + sha256 = "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198"; }; outputs = [ "out" "info" ]; From 0bba4051cb446310bcf913744be2995c90237490 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Dec 2018 00:49:31 -0600 Subject: [PATCH 005/200] gnugrep: 3.2 -> 3.3 Fixes bug in some uses of '\b' in certain locales; same bug was introduced and fixed in gnused 4.6 -> 4.7. --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 2b9946305ab..702d1b4d89f 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "3.2"; in +let version = "3.3"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "172r64n2rzd8k4s1jg4ylszyf8n30smx0y2jc190zhvnpw2iyvlf"; + sha256 = "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"; }; # Perl is needed for testing From 617ac0403c0b519148cbf4265ac358fafe2a2b04 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 23 Dec 2018 10:54:13 -0600 Subject: [PATCH 006/200] gdb: 8.2 -> 8.2.1 https://lists.gnu.org/archive/html/info-gnu/2018-12/msg00013.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 29942bb2fc4..21d0b3d215f 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -13,7 +13,7 @@ let basename = "gdb-${version}"; - version = "8.2"; + version = "8.2.1"; in assert pythonSupport -> python3 != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963"; + sha256 = "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"; }; patches = [ From 2adf6833c7a7fbce84458da6a44a70a877033d0b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:13:38 +0000 Subject: [PATCH 007/200] [cpan2nix] perlPackages.JSON: 2.97001 -> 4.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3c80eac6a3b..bc594df2632 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8006,10 +8006,10 @@ let }; JSON = buildPerlPackage { - name = "JSON-2.97001"; + name = "JSON-4.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz; - sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz; + sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' From f28d33d539d3efa8c743adcb7753ec08efe68701 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:13:44 +0000 Subject: [PATCH 008/200] [cpan2nix] perlPackages.CPANPerlReleases: 3.76 -> 3.86 --- 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 bc594df2632..46cfa35bd45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2795,10 +2795,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.76"; + name = "CPAN-Perl-Releases-3.86"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0p9anb92sfi6cfr3ia8yvd3scn0bzwh2r6z8f6jrawjr8lilgahj"; + sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From ab2baca938cae911f1e9ef6bad37d653626fcec7 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:13:47 +0000 Subject: [PATCH 009/200] [cpan2nix] perlPackages.CarpClan: 6.06 -> 6.07 --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46cfa35bd45..4aad1aa649a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1143,16 +1143,15 @@ let }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.06"; + name = "Carp-Clan-6.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz; - sha256 = "1m6902n6s627nsvyn2vyrk29q7lh6808hsdk7ka5cirm27vchjpa"; + url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.07.tar.gz; + sha256 = "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"; }; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestException ]; }; CatalystActionRenderView = buildPerlPackage rec { From 067744002d00162ca6880f7b1721aaaf5bf105b4 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:13:55 +0000 Subject: [PATCH 010/200] [cpan2nix] perlPackages.Clone: 0.39 -> 0.41 --- 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 4aad1aa649a..8412fd03af5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2285,10 +2285,10 @@ let Clone = buildPerlPackage rec { - name = "Clone-0.39"; + name = "Clone-0.41"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; - sha256 = "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c"; + sha256 = "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78"; }; meta = { description = "Recursively copy Perl datatypes"; From 3d73969087dc13454143b89c6a2d53f9569acad1 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:13:58 +0000 Subject: [PATCH 011/200] [cpan2nix] perlPackages.CpanelJSONXS: 4.06 -> 4.08 --- 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 8412fd03af5..e0080d3d9ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2745,10 +2745,10 @@ let }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.06"; + name = "Cpanel-JSON-XS-4.08"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "63481d9d2d6251cf520bb6a62147faf6e8f35b9fe6b3ddd81c5bfd71e31ec9ba"; + sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From ae335a909dab3dca4ebdd7d2de971d5d0135dca5 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:04 +0000 Subject: [PATCH 012/200] [cpan2nix] perlPackages.CryptX: 0.061 -> 0.063 --- 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 e0080d3d9ca..767b1886c45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3159,10 +3159,10 @@ let }; CryptX = buildPerlPackage rec { - name = "CryptX-0.061"; + name = "CryptX-0.063"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "26729d8d4f711fd83f9b728ad8227e8986343e23fa37cbe58564645ce5d3f8c2"; + sha256 = "6cfc672e0e56d56cf849caf0b929ed94f87cb4e6be5c20757ca3d3dbe5569595"; }; meta = { description = "Crypto toolkit"; From 553dc0742933c816691037c1414144b66ce73b15 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:05 +0000 Subject: [PATCH 013/200] [cpan2nix] perlPackages.DBI: 1.641 -> 1.642 --- 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 767b1886c45..8fff03793a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4025,10 +4025,10 @@ let DBI = buildPerlPackage rec { name = "DBI-${version}"; - version = "1.641"; + version = "1.642"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1"; + sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI From 01154bd706d1a8605503a844e93a7bf558166e86 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:06 +0000 Subject: [PATCH 014/200] [cpan2nix] perlPackages.DataDumper: 2.172 -> 2.173 --- 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 8fff03793a1..4fb7a72f4a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3220,10 +3220,10 @@ let }; DataDumper = buildPerlPackage rec { - name = "Data-Dumper-2.172"; + name = "Data-Dumper-2.173"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.172.tar.gz; - sha256 = "a95a3037163817221021ac145500968be44dc155c261f4097136392c0a9fecd9"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz; + sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; }; outputs = [ "out" ]; meta = { From a9f6cbddea21295a593f71e6bc135ba0290a4d2f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:14 +0000 Subject: [PATCH 015/200] [cpan2nix] perlPackages.EmailAddress: 1.909 -> 1.911 --- 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 4fb7a72f4a7..47178fc2028 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4843,10 +4843,10 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.909"; + name = "Email-Address-1.911"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.909.tar.gz; - sha256 = "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz; + sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl"; }; meta = { description = "RFC 2822 Address Parsing"; From 4145d871e6aa794ac2aae1ea98770b3392ab84de Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:20 +0000 Subject: [PATCH 016/200] [cpan2nix] perlPackages.Error: 0.17026 -> 0.17027 --- 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 47178fc2028..4a14762d7f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5186,10 +5186,10 @@ let }; Error = buildPerlModule rec { - name = "Error-0.17026"; + name = "Error-0.17027"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "1nam651w5ffsh64nnqjpzirm5g3ck92idzz1f0sf0fnp5jb0ln9p"; + sha256 = "1gnkxf12dq2w1jmjpllp5f30ya4nll01jv2sfi24386zfn1arch7"; }; }; From 4d4ef87477bec26abe259ab8f1a106595cc6632e Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:30 +0000 Subject: [PATCH 017/200] [cpan2nix] perlPackages.FileNFSLock: 1.27 -> 1.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a14762d7f0..a76165e4714 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5902,10 +5902,10 @@ let }; FileNFSLock = buildPerlPackage { - name = "File-NFSLock-1.27"; + name = "File-NFSLock-1.29"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz; - sha256 = "0hhh3cmbby98b1xh64dvj31wqcr9hsk1zqrq3ci8fjd4xb7xch8g"; + url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; + sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; meta = { maintainers = with maintainers; [ ]; From 955c2716712294ebe1dc91b646e2e3c2168b0c6c Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:32 +0000 Subject: [PATCH 018/200] [cpan2nix] perlPackages.FileSlurp: 9999.22 -> 9999.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a76165e4714..04b3738b2fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6044,12 +6044,12 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.22"; + name = "File-Slurp-9999.25"; # WARNING: check on next update if deprecation warning is gone patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.22.tar.gz; - sha256 = "0sgi53jin36sqvvj8fsqxddb8vprrv99inbs2bmgjdpqhs0a0vmf"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz; + sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; From a08afa71284bd723e756c7c6135bef0d0ada2b70 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:51 +0000 Subject: [PATCH 019/200] [cpan2nix] perlPackages.Imager: 1.006 -> 1.007 --- 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 04b3738b2fe..9120cbbb884 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7440,12 +7440,12 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.006"; + name = "Imager-1.007"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "c1e434a4de6250e3b229aa74aa653e56c38f981864f71a975366c50559c9d52b"; + sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63"; }; - buildInputs = [ ExtUtilsPkgConfig pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; + buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; meta = { homepage = http://imager.perl.org/; From e436e8c2cd4bad38c11a27cb67b478a3b9712c79 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:52 +0000 Subject: [PATCH 020/200] [cpan2nix] perlPackages.JSONPP: 2.97001 -> 4.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9120cbbb884..7ff4e63c259 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8047,10 +8047,10 @@ let }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.97001"; + name = "JSON-PP-4.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-2.97001.tar.gz; - sha256 = "1d1731yqv2py039qxcr0j9r4jb8m9kq387pj1q6gxawbfwvlmxb7"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz; + sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y"; }; meta = { description = "JSON::XS compatible pure-Perl module"; From 8db487e14f535071f90f1ce48153da13b7441738 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:14:59 +0000 Subject: [PATCH 021/200] [cpan2nix] perlPackages.LocaleCodes: 3.58 -> 3.59 --- 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 7ff4e63c259..71614d1a1d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8508,10 +8508,10 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.58"; + name = "Locale-Codes-3.59"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.58.tar.gz; - sha256 = "345c0b0170288d74a147fbe218b7c78147aa2baf4e839fe8680a2b0a2d8e505b"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz; + sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03"; }; meta = { description = "A distribution of modules to handle locale codes"; From 3b220072a52178e74646d9ab450f0a93c0dfc8c7 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:15:06 +0000 Subject: [PATCH 022/200] [cpan2nix] perlPackages.MathBigInt: 1.999814 -> 1.999816 --- 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 71614d1a1d5..4273837dc6d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9184,10 +9184,10 @@ let }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999814"; + name = "Math-BigInt-1.999816"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "19fbabee89e4d3a5c4775cc07006b7488ebb4f70ea79d915f1a5f0130e0d3e22"; + sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; }; meta = { description = "Arbitrary size integer/float math package"; From 5234da97fd2661f398784f8c3c4ad9dbf50e9e27 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:15:10 +0000 Subject: [PATCH 023/200] [cpan2nix] perlPackages.ModernPerl: 1.20180928 -> 1.20181021 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4273837dc6d..b8dd94f55f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9531,12 +9531,12 @@ let }; }; - ModernPerl = buildPerlModule { - name = "Modern-Perl-1.20180928"; + ModernPerl = buildPerlPackage { + name = "Modern-Perl-1.20181021"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180928.tar.gz; - sha256 = "377b4f16b27ca3b38fdb148468111e3463eff148beb7a00826353268f240f577"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20181021.tar.gz; + sha256 = "1d482b528f7c6c60f868d7d0bf0fcc9c3668250dc44fcb39a95b7c63e092c9c5"; }; meta = { homepage = https://github.com/chromatic/Modern-Perl; From acfad6d038f1fb8563694945ebc826401d2c9fbd Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:15:11 +0000 Subject: [PATCH 024/200] [cpan2nix] perlPackages.ModuleCoreList: 5.20180920 -> 5.20181218 --- 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 b8dd94f55f6..083de76dcea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9667,10 +9667,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180920"; + name = "Module-CoreList-5.20181218"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180920.tar.gz; - sha256 = "00gkfkajvamb207xslqakwpzyjdhbyf14l0bs9ywcw8q44n7ghaf"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz; + sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi"; }; meta = { homepage = http://dev.perl.org/; From 299244e5abcbeabd41a0ac364b5bfe8f91bd7799 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:15:14 +0000 Subject: [PATCH 025/200] [cpan2nix] perlPackages.Mojolicious: 8.03 -> 8.10 --- 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 083de76dcea..f9e52abf35a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9950,10 +9950,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.03"; + name = "Mojolicious-8.10"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "0jx1zra1c8qlljbihqv9snlr0jz77w7my1hg9qk13kns8by21cpy"; + sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v"; }; meta = { homepage = https://mojolicious.org; From 3c911eb99aafeb361572190d4b5677b04b97dc2b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:15:56 +0000 Subject: [PATCH 026/200] [cpan2nix] perlPackages.TAPParserSourceHandlerpgTAP: 3.33 -> 3.34 --- 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 f9e52abf35a..d6993cab74a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14380,10 +14380,10 @@ let }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.33"; + name = "TAP-Parser-SourceHandler-pgTAP-3.34"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; + sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v"; }; meta = { description = "Stream TAP from pgTAP test scripts"; From de66c2262d65f22d83a013589197107c01d734c0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:10 +0000 Subject: [PATCH 027/200] [cpan2nix] perlPackages.TestSimple13: 1.302140 -> 1.302141 --- 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 d6993cab74a..7c64691b702 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15774,10 +15774,10 @@ let }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302140"; + name = "Test-Simple-1.302141"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302140.tar.gz; - sha256 = "73f5440c7ae55e13706e9ebeaa7247df973226470f028344ea3cd21e1642bd1d"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz; + sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7"; }; meta = { description = "Basic utilities for writing tests"; From b5e3fa5383c48be119be1b9a4e3ccdf5ff00df65 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:34 +0000 Subject: [PATCH 028/200] [cpan2nix] perlPackages.YAMLLibYAML: 0.74 -> 0.75 --- 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 7c64691b702..a04cc7bf73b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17774,10 +17774,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.74"; + name = "YAML-LibYAML-0.75"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.74.tar.gz; - sha256 = "021l0gf6z93xd6vd604vpvb9d4b714zph17g6hg47fpawdq0xpd0"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz; + sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32"; }; }; From d9c26ce7aeab7859db1c958eaea4ac9bba5f775e Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:34 +0000 Subject: [PATCH 029/200] [cpan2nix] perlPackages.YAMLSyck: 1.30 -> 1.31 --- 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 a04cc7bf73b..d55b1ee1cb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17754,10 +17754,10 @@ let }; YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.30"; + name = "YAML-Syck-1.31"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; - sha256 = "1iwd4pbwg7m1vwc74s3f3hk9yyqmhn1ssrbh9466lmbnc4hl9cv2"; + sha256 = "14420hp7vxhrs0hgsmrfc9s9dassw1bns4jbmdq55b735xrwbbfp"; }; meta = { description = "Fast, lightweight YAML loader and dumper"; From 53a643b6b581d64c43ffe4a13aac32fcd303465a Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:37 +0000 Subject: [PATCH 030/200] [cpan2nix] perlPackages.libintl_perl: 1.29 -> 1.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 d55b1ee1cb6..29be1841f3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8150,10 +8150,10 @@ let }; libintl_perl = buildPerlPackage rec { - name = "libintl-perl-1.29"; + name = "libintl-perl-1.31"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.29.tar.gz; - sha256 = "1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq"; + url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; + sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; }; meta = { maintainers = with maintainers; [ ]; From 4e546392058e6718277acf75c70199b5481a1962 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:39 +0000 Subject: [PATCH 031/200] [cpan2nix] perlPackages.prefork: 1.04 -> 1.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 29be1841f3e..c6cc78b53d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12876,10 +12876,10 @@ let }; prefork = buildPerlPackage { - name = "prefork-1.04"; + name = "prefork-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz; - sha256 = "1xzxx9wgrrfl1ys05yglp2q3bwscvdzlnsiybqk8drbvwlzj5kz3"; + url = mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz; + sha256 = "01ckn45ij3nbrsc0yc4wl4z0wndn36jh6247zbycwa1vlvgvr1vd"; }; meta = { description = "Optimized module loading for forking or non-forking processes"; From 5fdf30e5f8c7bb932be12f734307b5c638f1c371 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:40 +0000 Subject: [PATCH 032/200] [cpan2nix] perlPackages.threadsshared: 1.58 -> 1.59 --- 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 c6cc78b53d8..c312add277d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16577,10 +16577,10 @@ let }; threadsshared = buildPerlPackage rec { - name = "threads-shared-1.58"; + name = "threads-shared-1.59"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "04qbypzgp49sq1wq5kip0m95lffv0pc8xj2wplrdpyqz87y105xd"; + sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; }; meta = { description = "Perl extension for sharing data structures between threads"; From fcdec22dbabf5b8734680003c32bf3d43b6b0a28 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:16:58 +0000 Subject: [PATCH 033/200] [cpan2nix] perlPackages.DateManip: 6.73 -> 6.75 --- 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 c312add277d..ef184d17ddd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3585,10 +3585,10 @@ let }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.73"; + name = "Date-Manip-6.75"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0md25ik7pwbwgidiprcq20db8jdniknxs0qj1m3l76ziqg3rb4nk"; + sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' From 327b67beecee4b6af7d6aebcc7a6e47e7d33ea7d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:09 +0000 Subject: [PATCH 034/200] [cpan2nix] perlPackages.LinuxInotify2: 1.22 -> 2.1 --- 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 ef184d17ddd..d5f0416b4f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8407,10 +8407,10 @@ let }; LinuxInotify2 = buildPerlPackage rec { - name = "Linux-Inotify2-1.22"; + name = "Linux-Inotify2-2.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz; - sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.1.tar.gz; + sha256 = "0w7jyq5pjy28s0ck34gy1vfbr069lhcn579bz0fh29h071sbcrbj"; }; propagatedBuildInputs = [ commonsense ]; }; From 2aa5644951c7d9377c3ed3626d2a2f72e81b2c30 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:12 +0000 Subject: [PATCH 035/200] [cpan2nix] perlPackages.MailIMAPClient: 3.39 -> 3.40 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d5f0416b4f3..a2854ac179a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9054,10 +9054,10 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.39"; + name = "Mail-IMAPClient-3.40"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz; - sha256 = "18sf8fd093qxvflscysm6pv6mj9cmm19zrnfic297jjvgnsgshdm"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz; + sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz"; }; propagatedBuildInputs = [ ParseRecDescent ]; }; From 754f1f7db93c732fe0ba296d34507da578aa9211 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:16 +0000 Subject: [PATCH 036/200] [cpan2nix] perlPackages.ModuleScanDeps: 1.25 -> 1.26 --- 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 a2854ac179a..59860965c96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9870,11 +9870,11 @@ let }; }; - ModuleScanDeps = let version = "1.25"; in buildPerlPackage { + ModuleScanDeps = let version = "1.26"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "13280nq0d6zc58mcz3kvs2m85a741czq0fabk69ks1nr4j1w2nl4"; + sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223"; }; buildInputs = [ TestRequires ]; meta = { From ec51bf9941e2db6f3105011c9ff64539e1e4a7d0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:17 +0000 Subject: [PATCH 037/200] [cpan2nix] perlPackages.NetDNS: 1.18 -> 1.19 --- 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 59860965c96..de1c97b00ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11149,10 +11149,10 @@ let }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.18"; + name = "Net-DNS-1.19"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3"; + sha256 = "206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From 7970d1354ebca09ae3566a52eca4477764842c4d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:21 +0000 Subject: [PATCH 038/200] [cpan2nix] perlPackages.TermTable: 0.012 -> 0.013 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de1c97b00ba..e371c24a502 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14714,12 +14714,11 @@ let }; TermTable = buildPerlPackage rec { - name = "Term-Table-0.012"; + name = "Term-Table-0.013"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "4db6118fbf862bd32a8402e1ee28ce2044d0e0887ef29b726e917ab4258a063a"; + sha256 = "ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40"; }; - buildInputs = [ TestSimple13 ]; propagatedBuildInputs = [ Importer ]; meta = { description = "Format a header and rows into a table"; From 637d01dfda0c837b00cf7eecb8961cd3562503ee Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:39 +0000 Subject: [PATCH 039/200] [cpan2nix] perlPackages.EV: 4.22 -> 4.25 --- 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 e371c24a502..d087d30fed2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5194,10 +5194,10 @@ let }; EV = buildPerlPackage rec { - name = "EV-4.22"; + name = "EV-4.25"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991"; + sha256 = "2e65c8e8f2358599f9a48f766cc1b3ad0eaf2e6cef416adc8ad9cddc3f329c6a"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; From 3b21afcc1c0e08c4055dc4678bf15a96f6287cca Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:42 +0000 Subject: [PATCH 040/200] [cpan2nix] perlPackages.FilesysDiskUsage: 0.11 -> 0.12 --- 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 d087d30fed2..74deb8cfbc3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6031,10 +6031,10 @@ let }; FilesysDiskUsage = buildPerlPackage rec { - name = "Filesys-DiskUsage-0.11"; + name = "Filesys-DiskUsage-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; - sha256 = "e69237c035e18a6ed69e36e058d7b3491d54a803a308f756e62a8e7f48b2a281"; + sha256 = "e8afee07014df5868f9a2784e041c82c3c8c38550f4cd48bec56d0d6c4997273"; }; buildInputs = [ TestWarn ]; meta = { From 684c204ca21ed6d09012f20ea0d06e8e19530b1f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:49 +0000 Subject: [PATCH 041/200] [cpan2nix] perlPackages.NetSCP: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74deb8cfbc3..115aeebf1e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11315,6 +11315,7 @@ let description = "Simple wrappers around ssh and scp commands."; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ NetSSH StringShellQuote ]; }; NetServer = buildPerlPackage { From e82af8d1d11a0fce460d00fe5dc7393297ad74b9 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:17:50 +0000 Subject: [PATCH 042/200] [cpan2nix] perlPackages.Pegex: 0.67 -> 0.70 --- 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 115aeebf1e8..38983ef8531 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12045,10 +12045,10 @@ let }; Pegex = buildPerlPackage rec { - name = "Pegex-0.67"; + name = "Pegex-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "3cb9df73aece2a5fa769a89bd74daaac302cc077e2489b3b552f3aa172092091"; + sha256 = "fd3521321026048f493a88d43ce4b8e054f5d7acfec6a1db32fcaabe4dfda0fd"; }; buildInputs = [ FileShareDirInstall YAMLLibYAML ]; meta = { From 6992f1acb0075e751e3fd2a96fc921aaac5adf33 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:01 +0000 Subject: [PATCH 043/200] [cpan2nix] perlPackages.AuthenRadius: 0.27 -> 0.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38983ef8531..a59b0091183 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -644,10 +644,10 @@ let }; AuthenRadius = buildPerlPackage rec { - name = "Authen-Radius-0.27"; + name = "Authen-Radius-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz; - sha256 = "e5a3052fe46dc38424c1947da92e623e8996216f97bd7be72221eb6c5f7c09f8"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.29.tar.gz; + sha256 = "7fb3425546b2f518e4a07edb3bcb55672454fe8e13bece58de2dc43885afb079"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; From 4678ebf297a5d344da70e1c5db3014e7747ce747 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:06 +0000 Subject: [PATCH 044/200] [cpan2nix] perlPackages.GDSecurityImage: 1.73 -> 1.75 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a59b0091183..d338b0f8577 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6303,11 +6303,11 @@ let }; }; - GDSecurityImage = buildPerlModule { - name = "GD-SecurityImage-1.73"; + GDSecurityImage = buildPerlPackage { + name = "GD-SecurityImage-1.75"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.73.tar.gz; - sha256 = "1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx"; + url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz; + sha256 = "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"; }; propagatedBuildInputs = [ GD ]; meta = { From 2d32e6eb415eff1cf9bc709c144f0563d2dd915b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:07 +0000 Subject: [PATCH 045/200] [cpan2nix] perlPackages.InlineJava: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d338b0f8577..07f2fd0f854 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7968,7 +7968,6 @@ let maintainers = [ ]; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; IPCSignal = buildPerlPackage rec { From e4ab09528885394c3f1152511fd9e610102befae Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:08 +0000 Subject: [PATCH 046/200] [cpan2nix] perlPackages.JSONXS: 3.04 -> 4.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07f2fd0f854..07115fd61c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8085,10 +8085,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-3.04"; + name = "JSON-XS-4.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz; - sha256 = "0b3w14zqjxnm93jjfzjqz8pkxp3a2l9242y7zxxhnvzav1mq7n35"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz; + sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; }; propagatedBuildInputs = [ TypesSerialiser ]; meta = { From 6df39da02dcfe453624aad29d1bcc48a092c1123 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:09 +0000 Subject: [PATCH 047/200] [cpan2nix] perlPackages.MetaBuilder: 0.003 -> 0.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07115fd61c2..61c7a2d7021 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9367,10 +9367,10 @@ let }; MetaBuilder = buildPerlModule { - name = "Meta-Builder-0.003"; + name = "Meta-Builder-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.003.tar.gz; - sha256 = "e7ac289b88d1662e87708d716877ac66a1a8414660996fe58c1db96d834a5375"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz; + sha256 = "acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe"; }; buildInputs = [ FennecLite TestException ]; meta = { From f21d96a1b43a599a3138609802b9e18b32987a06 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:10 +0000 Subject: [PATCH 048/200] [cpan2nix] perlPackages.ObjectInsideOut: 4.04 -> 4.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61c7a2d7021..feccaf26665 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11557,10 +11557,10 @@ let }; ObjectInsideOut = buildPerlModule { - name = "Object-InsideOut-4.04"; + name = "Object-InsideOut-4.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.04.tar.gz; - sha256 = "01pncagr3k7yj0rn22xap08s17nw2p2ffcg6j00gs9fg4jv9pfmj"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz; + sha256 = "1i6aif37ji91nsyncp5d0d3q29clf009sxdn1rz38917hai6rzcx"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { From 5573f822cb2f852b574be0d8cf8e2182334ef3eb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:18 +0000 Subject: [PATCH 049/200] [cpan2nix] perlPackages.Coro: 6.52 -> 6.54 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index feccaf26665..c260a0bcacf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2705,10 +2705,10 @@ let }; Coro = buildPerlPackage rec { - name = "Coro-6.52"; + name = "Coro-6.54"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.52.tar.gz; - sha256 = "1q744smw6m676v8n0ww8jvmh1zg1iw7f7clzblwbfgmhy03h5ja9"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.54.tar.gz; + sha256 = "0a00b351m7fxm39vfk726wpva2xx8qxlx5nv4yjgkbqap502ld2m"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; From a7d6f8dbc0a21960f99e15b0fb02d467ff70e351 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:21 +0000 Subject: [PATCH 050/200] [cpan2nix] perlPackages.HTMLSelectorXPath: 0.23 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c260a0bcacf..08e181cc95c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7054,10 +7054,10 @@ let }; HTMLSelectorXPath = buildPerlPackage { - name = "HTML-Selector-XPath-0.23"; + name = "HTML-Selector-XPath-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.23.tar.gz; - sha256 = "0vvvdrccypwv3qpf9hq5h2b6k0p5qrmz60p2swjh009dvr601h7j"; + url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz; + sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; }; buildInputs = [ TestBase ]; meta = { From bd265141024d5c421d8b5b607aa106726b108607 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:22 +0000 Subject: [PATCH 051/200] [cpan2nix] perlPackages.MathRandomMTAuto: 6.22 -> 6.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 08e181cc95c..9436e9373ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9299,10 +9299,10 @@ let }; MathRandomMTAuto = buildPerlPackage { - name = "Math-Random-MT-Auto-6.22"; + name = "Math-Random-MT-Auto-6.23"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.22.tar.gz; - sha256 = "07zha5zjxyvqwnycb1vzk4hk2m46n9yc5lrbvhkc22595dsyjahz"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz; + sha256 = "04v3fxbqg6bs7dpljw64v62jqb10l2xdrln4l3slz5k266nvbg2q"; }; propagatedBuildInputs = [ ObjectInsideOut ]; meta = { From be853d8365ea2c77e9d65ed708ddc0f6b22a6a23 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:25 +0000 Subject: [PATCH 052/200] [cpan2nix] perlPackages.StatisticsDescriptive: 3.0701 -> 3.0702 --- 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 9436e9373ec..b213e3d73a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13793,10 +13793,10 @@ let }; StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0701"; + name = "Statistics-Descriptive-3.0702"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0701.tar.gz; - sha256 = "35b09ed91b8660a6095c272a36ed2c61b3c660aa535fc23a20beadf7769e1919"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz; + sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement From cb10d1a327f1e352519af275259d6124daa4bceb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:35 +0000 Subject: [PATCH 053/200] [cpan2nix] perlPackages.TestAbortable: 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 b213e3d73a1..f04a91b2c75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14806,7 +14806,7 @@ let url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; }; - propagatedBuildInputs = [ SubExporter TestSimple13 ]; + propagatedBuildInputs = [ SubExporter ]; buildInputs = [ TestNeeds ]; meta = { description = "subtests that you can die your way out of ... but survive"; From e561fb6a1b12e28800491d008fffa0002c21ecd3 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:45 +0000 Subject: [PATCH 054/200] [cpan2nix] perlPackages.HashDiff: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f04a91b2c75..f5781e4c7eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6728,6 +6728,7 @@ let license = with stdenv.lib.licenses; [ artistic1 ]; description = "Return difference between two hashes as a hash"; }; + buildInputs = [ TestSimple13 ]; }; HashFlatten = buildPerlPackage rec { From 9864434a83df5b21f88032ac7e4660060379948d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:18:50 +0000 Subject: [PATCH 055/200] [cpan2nix] perlPackages.YAML: 1.26 -> 1.27 --- 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 f5781e4c7eb..b84d1ebaf33 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17738,10 +17738,10 @@ let }; YAML = buildPerlPackage rec { - name = "YAML-1.26"; + name = "YAML-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.26.tar.gz; - sha256 = "1g3zjm145zsackgnzkkb1chd15xns84jccm6knpwbysa9karjbzs"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.27.tar.gz; + sha256 = "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9"; }; buildInputs = [ TestBase TestDeep TestYAML ]; From acf4096663f5df37a5981ddc6f25ccba7be40b0e Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:00 +0000 Subject: [PATCH 056/200] [cpan2nix] perlPackages.Test2Suite: 0.000115 -> 0.000117 --- 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 b84d1ebaf33..f752cda4cb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14789,10 +14789,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000115"; + name = "Test2-Suite-0.000117"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "02be3428a0965aeb21245d44bbadda69b94dc76cd68d5695352c996ac7fc3638"; + sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From b3e531977c96d353ef74ee2722adb3ccdbcb7322 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:03 +0000 Subject: [PATCH 057/200] [cpan2nix] perlPackages.CryptPKCS10: 1.9 -> 2.001 --- 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 f752cda4cb6..38873696ca7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2929,10 +2929,10 @@ let }; CryptPKCS10 = buildPerlModule { - name = "Crypt-PKCS10-1.9"; + name = "Crypt-PKCS10-2.001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-1.9.tar.gz; - sha256 = "ee0ce58cc17e9a8d7a6f33f3f26aca5be7edfc054204f7946370b3a8d291f0fd"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz; + sha256 = "f7945b76a2d8f4d8ecf627b2eb8ea4f41d001e6a915efe82e71d6b97fea3ffa9"; }; buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; From a63a76103c1a4ebd997c617558dbbfaf15dc6de7 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:04 +0000 Subject: [PATCH 058/200] [cpan2nix] perlPackages.FFICheckLib: 0.20 -> 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 38873696ca7..03a85e1b5f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5571,10 +5571,10 @@ let }; FFICheckLib = buildPerlPackage { - name = "FFI-CheckLib-0.20"; + name = "FFI-CheckLib-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.20.tar.gz; - sha256 = "1pggqj5cs77myp4g62jzkld95a286vwkygi7i0hbqjgwf3w3f5gl"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.23.tar.gz; + sha256 = "0rjivas0rsp7d5599cjcxss80zfj7a5b8did771dlw7h2p5apisf"; }; buildInputs = [ Test2Suite ]; meta = { From 36393c09940bcc38b7e6437db08c83c5d01a5cd0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:28 +0000 Subject: [PATCH 059/200] [cpan2nix] perlPackages.ListAllUtils: 0.14 -> 0.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03a85e1b5f9..13929281a8f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8416,10 +8416,10 @@ let }; ListAllUtils = buildPerlPackage { - name = "List-AllUtils-0.14"; + name = "List-AllUtils-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; - sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz; + sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { From fa69e0449eeafa3f23f260664bf05f4d47a83bef Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:43 +0000 Subject: [PATCH 060/200] [cpan2nix] perlPackages.Specio: 0.42 -> 0.43 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13929281a8f..de6cd3a7f34 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13593,10 +13593,10 @@ let }; Specio = buildPerlPackage rec { - name = "Specio-0.42"; + name = "Specio-0.43"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz; - sha256 = "1xjfa9g4vc6x3f0bzzbac8dwgpc4in4za1l1sp0y6ykdla9qna93"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.43.tar.gz; + sha256 = "07gsm4fssn9v27bnlgcxa7igb7ggrxwgpdqbbryi4134gfzxxl1w"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; From 1363c6cb2f00852a6f15c8aee10fa53d679d020e Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:48 +0000 Subject: [PATCH 061/200] [cpan2nix] perlPackages.SoftwareLicense: 0.103013 -> 0.103014 --- 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 de6cd3a7f34..7da221f7a66 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13543,10 +13543,10 @@ let }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103013"; + name = "Software-License-0.103014"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "2641d937390f43b08fa31c419713cd96a2f0bf160be04cab322631daf6810ff3"; + sha256 = "eb45ea602d75006683789fbba57a01c0a1f7037371de95ea54b91577535d1789"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; From 341b7026587056e909419497c35862283291ff0f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:50 +0000 Subject: [PATCH 062/200] [cpan2nix] perlPackages.AlienBuild: 1.48 -> 1.49 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7da221f7a66..0563e5b6e2f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -114,13 +114,13 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.48"; + name = "Alien-Build-1.49"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.48.tar.gz; - sha256 = "1sv4544g2qhwigpj1x2qycafab04p2b0vdr2x07wzriq5fqgsspp"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz; + sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p"; }; - propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny Test2Suite ]; - buildInputs = [ DevelHide PkgConfig ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; + buildInputs = [ DevelHide PkgConfig Test2Suite ]; meta = { description = "Build external dependencies for use in CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f13dac715aec016084d83497e79f5d99687deff2 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:53 +0000 Subject: [PATCH 063/200] [cpan2nix] perlPackages.PPIxRegexp: 0.062 -> 0.063 --- 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 0563e5b6e2f..54adda4a323 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12536,10 +12536,10 @@ let }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.062"; + name = "PPIx-Regexp-0.063"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "1218fe4c94b3cb9d894c6cd8a69bb4172eac54ce083b70f7a8bf13868a5a0733"; + sha256 = "23950e68df05bce869766e81dd6b01471e27fb70980737ea1c2286a7ecf948bc"; }; propagatedBuildInputs = [ PPI ]; meta = { From 14e046977817251a0dcd41d188c6f284f533cbd0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:19:55 +0000 Subject: [PATCH 064/200] [cpan2nix] perlPackages.ArrayCompare: v3.0.1 -> v3.0.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54adda4a323..f3f4ea95c53 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -471,10 +471,10 @@ let }; ArrayCompare = buildPerlModule rec { - name = "Array-Compare-3.0.1"; + name = "Array-Compare-3.0.2"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz; - sha256 = "0fyj6jdfshga4kj4567529a1aiqy49awxg62lslx54166j4mhkzb"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.2.tar.gz; + sha256 = "0ci8pb6nh73rmmwd8fvg6n2064v8nbraqyg1axsncfi28nfz522s"; }; buildInputs = [ TestNoWarnings ]; From 29ced0261701fec599b43a20d7e00da0fbd3b1bf Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:01 +0000 Subject: [PATCH 065/200] [cpan2nix] perlPackages.AlienGMP: 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 f3f4ea95c53..9a7266cefc1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -134,7 +134,7 @@ let sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.gmp DevelChecklib ]; + buildInputs = [ pkgs.gmp DevelChecklib Test2Suite ]; meta = { description = "Alien package for the GNU Multiple Precision library."; license = with stdenv.lib.licenses; [ lgpl3Plus ]; From d151eba7dfa86bc3abb4baafcfe637f6728fe13d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:21 +0000 Subject: [PATCH 066/200] [cpan2nix] perlPackages.HTTPDAV: 0.48 -> 0.49 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a7266cefc1..c0cb4cd7bea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7247,10 +7247,10 @@ let }; HTTPDAV = buildPerlPackage rec { - name = "HTTP-DAV-0.48"; + name = "HTTP-DAV-0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz; - sha256 = "1fnw3wd9zrkxq54jqgi4iw48ndysgy73glva4129s8243pn05a86"; + url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz; + sha256 = "0z4mgb8mc6l5nfsm3ihndjqgpk43q39x1kq9hryy6v8hxkwrscrk"; }; meta = { description = "WebDAV client library."; From 8ce42743e44dfea9beda3920003c90a74bba7140 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:41 +0000 Subject: [PATCH 067/200] [cpan2nix] perlPackages.DateTimeTimeZone: 2.20 -> 2.21 --- 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 c0cb4cd7bea..924a8839c65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3866,10 +3866,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.20"; + name = "DateTime-TimeZone-2.21"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "6b69cb9406f7fd2f9ef452996de62686f0b8563469a7e7438fd2bf37735a2829"; + sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; From 8f75d40f4902f2a9ede60380c0e86ff4ce210e20 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:42 +0000 Subject: [PATCH 068/200] [cpan2nix] perlPackages.Appperlbrew: 0.84 -> 0.85 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 924a8839c65..55b43c84483 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -386,12 +386,12 @@ let }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.84"; + name = "App-perlbrew-0.85"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la"; + sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y"; }; - buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; + buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; preConfigure = '' From 4f7ff8ec32d03187cdf0badfb85473799cf269a1 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:47 +0000 Subject: [PATCH 069/200] [cpan2nix] perlPackages.LocaleMOFile: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55b43c84483..d154730f591 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8530,10 +8530,10 @@ let }; LocaleMOFile = buildPerlPackage rec { - name = "Locale-MO-File-0.08"; + name = "Locale-MO-File-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.08.tar.gz; - sha256 = "1flpk7jdn5cp7pld3f0vi3v5527p76jp1fqp4pzrhhqjlhyp3im4"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz; + sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; }; propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; From 464b63c6b6bc16aa6bc9f393cb5417325aca929d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:47 +0000 Subject: [PATCH 070/200] [cpan2nix] perlPackages.TestCleanNamespaces: 0.23 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d154730f591..57607a12248 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14905,10 +14905,10 @@ let }; TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.23"; + name = "Test-CleanNamespaces-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.23.tar.gz; - sha256 = "c7bf97f3c786b75f84341135904b492a1a36646aa65db3e0fd15a3cbe0864872"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz; + sha256 = "338d5569e8e89a654935f843ec0bc84aaa486fe8dd1898fb9cab3eccecd5327a"; }; buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; propagatedBuildInputs = [ PackageStash SubIdentify ]; From 01320bbba762852c240af5e088628323ca4ca08c Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:49 +0000 Subject: [PATCH 071/200] [cpan2nix] perlPackages.DateTimeCalendarJulian: 0.04 -> 0.100 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57607a12248..30237d4911a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3627,16 +3627,16 @@ let }; DateTimeCalendarJulian = buildPerlPackage rec { - name = "DateTime-Calendar-Julian-0.04"; + name = "DateTime-Calendar-Julian-0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PI/PIJLL/${name}.tar.gz"; - sha256 = "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv"; + url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.100.tar.gz; + sha256 = "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx"; }; meta = { description = "Dates in the Julian calendar"; license = stdenv.lib.licenses.artistic2; }; - buildInputs = [ DateTime ]; + propagatedBuildInputs = [ DateTime ]; }; DateTimeEventICal = buildPerlPackage rec { From a00600404fa28ac004416917c2472ff1b57073d4 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:52 +0000 Subject: [PATCH 072/200] [cpan2nix] perlPackages.CodeTidyAll: 0.71 -> 0.72 --- 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 30237d4911a..49b1726baab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2321,10 +2321,10 @@ let }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.71"; + name = "Code-TidyAll-0.72"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.71.tar.gz; - sha256 = "043s0fkg8y9g38m9p87jh9p1kkznz7yq96x2rnjj221hpl3zysdr"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz; + sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; From 83176e0882757e23fc92dae5a68aa8487e222200 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:55 +0000 Subject: [PATCH 073/200] [cpan2nix] perlPackages.CPAN: 2.16 -> 2.22 dependencies: perlPackages.CPANChecksums: init at 2.12 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49b1726baab..344a017f4b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2731,17 +2731,16 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.16"; + name = "CPAN-2.22"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "7dbd61c172b99b05c16a2fce790140489494c744190f6c4f80c162d5ae3ccc2c"; + sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990"; }; - propagatedBuildInputs = [ Expect FileWhich LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ ArchiveZip ]; }; CpanelJSONXS = buildPerlPackage rec { @@ -2768,6 +2767,18 @@ let }; }; + CPANChecksums = buildPerlPackage { + name = "CPAN-Checksums-2.12"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz; + sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; + }; + propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPANDistnameInfo = buildPerlPackage rec { name = "CPAN-DistnameInfo-0.12"; src = fetchurl { From 3642566dfcd1eb31f93189b76ebe45f48d92a1e7 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:56 +0000 Subject: [PATCH 074/200] [cpan2nix] perlPackages.DateTimeFormatNatural: 1.05 -> 1.06 --- 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 344a017f4b5..fbf94afcf4a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3767,10 +3767,10 @@ let }; DateTimeFormatNatural = buildPerlModule { - name = "DateTime-Format-Natural-1.05"; + name = "DateTime-Format-Natural-1.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.05.tar.gz; - sha256 = "10ldrhz5rnpsd8qmqn1a4s0w5hhfbjrr13a93yx7kpp89g85pxqv"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.06.tar.gz; + sha256 = "1n68b5hnw4n55q554v7y4ffwiypz6rk40mh0r550fxwv69bvyky0"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; From 2e0a0abc1e3f2890a8dc8af7078652ce0d290cdf Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:20:57 +0000 Subject: [PATCH 075/200] [cpan2nix] perlPackages.LocaleTextDomainOO: 1.033 -> 1.035 --- 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 fbf94afcf4a..15a670ef453 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8606,10 +8606,10 @@ let }; LocaleTextDomainOO = buildPerlPackage rec { - name = "Locale-TextDomain-OO-1.033"; + name = "Locale-TextDomain-OO-1.035"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.033.tar.gz; - sha256 = "1nkjncwa5kg7avrly0ldfxijgkrjgwj3rggb2r6mi72h427xwjic"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.035.tar.gz; + sha256 = "1nvg0lggrd15j394fkxwsgi6w228pld5zpgb3zfd7im4r4mm50qy"; }; propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; buildInputs = [ TestDifferences TestException TestNoWarnings ]; From 1139a335ec705453d129bcd79bf28217fbec4281 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:21:15 +0000 Subject: [PATCH 076/200] [cpan2nix] perlPackages.ArrayFIFO: 0.10 -> 0.12 --- 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 15a670ef453..1b95a7b5916 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -495,10 +495,10 @@ let }; ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.10"; + name = "Array-FIFO-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; - sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1"; + sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; From a5aa538926ed613da428de3118da3c9d5c0bf316 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:21:19 +0000 Subject: [PATCH 077/200] [cpan2nix] perlPackages.WWWMechanize: 1.89 -> 1.90 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1b95a7b5916..c6c7790207f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17229,10 +17229,10 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.89"; + name = "WWW-Mechanize-1.90"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.89.tar.gz; - sha256 = "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz; + sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -17241,7 +17241,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { From 29721cf12d68a28adfe96d492c35602d08d0c9bb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:21:23 +0000 Subject: [PATCH 078/200] [cpan2nix] perlPackages.TestWWWMechanize: 1.50 -> 1.52 --- 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 c6c7790207f..cce0dc4673f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15965,10 +15965,10 @@ let }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.50"; + name = "Test-WWW-Mechanize-1.52"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.50.tar.gz; - sha256 = "097pl87vdbxbb56vawzvs6ikrlb8nz3dx223kjjbdn3jlli3jjhg"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz; + sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; From ed8629820b14c266c3a8cddc73444c78aed7abc0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:21:24 +0000 Subject: [PATCH 079/200] [cpan2nix] perlPackages.RTClientREST: 0.52 -> 0.56 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cce0dc4673f..5e1aeaa5b8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13289,11 +13289,11 @@ let doCheck = false; /* creates files in HOME */ }; - RTClientREST = buildPerlPackage { - name = "RT-Client-REST-0.52"; + RTClientREST = buildPerlModule { + name = "RT-Client-REST-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.52.tar.gz; - sha256 = "d058b8aa0db21aa1734ac50ae557297f603c2be60fa95a1d85278dbd11e19500"; + url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz; + sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { From 394d60ab6335ebede2be65d7a959b5b41e457ccc Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:21:53 +0000 Subject: [PATCH 080/200] [cpan2nix] perlPackages.CatalystRuntime: 5.90120 -> 5.90123 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5e1aeaa5b8a..1e6474e9434 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1322,13 +1322,13 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90120"; + name = "Catalyst-Runtime-5.90123"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Runtime-5.90120.tar.gz; - sha256 = "e3f791b75dfec668cb52fbe1c1596c051cc44de6c16eb333c79982d5e4822584"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz; + sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b"; }; buildInputs = [ TestFatal TypeTiny ]; - propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; From a2acf9f4324f7a6ef6960f601d4ba3dbdba9aad9 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:22:15 +0000 Subject: [PATCH 081/200] [cpan2nix] perlPackages.CatalystPluginSession: 0.40 -> 0.41 --- 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 1e6474e9434..9a23fc3f837 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1482,10 +1482,10 @@ let }; CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.40"; + name = "Catalyst-Plugin-Session-0.41"; src = fetchurl { url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"; + sha256 = "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; From 4b1576a73f7f223ae97c9d68dc937e14a733a6ba Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 28 Dec 2018 14:22:24 +0000 Subject: [PATCH 082/200] [cpan2nix] perlPackages.HTMLFormFu: 2.06 -> 2.07 --- 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 9a23fc3f837..4885b243900 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6941,10 +6941,10 @@ let }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.06"; + name = "HTML-FormFu-2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.06.tar.gz; - sha256 = "1g9zi7cg53527hlqb9h73i75vfzm52dwjrm8784vykn4kw4kklsv"; + url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz; + sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; }; buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; From cc97d49404d818a045e9199c8954ee046372ebfd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 12:54:57 -0600 Subject: [PATCH 083/200] llvm7: 7.0.0 -> 7.0.1 --- pkgs/development/compilers/llvm/7/clang/default.nix | 2 +- pkgs/development/compilers/llvm/7/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/7/default.nix | 4 ++-- pkgs/development/compilers/llvm/7/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/7/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/7/lld.nix | 2 +- pkgs/development/compilers/llvm/7/lldb.nix | 2 +- pkgs/development/compilers/llvm/7/llvm.nix | 2 +- pkgs/development/compilers/llvm/7/openmp.nix | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index e1f4eb30360..a307978f59a 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0mdsbgj3p7mayhzm8hclzl3i46r2lwa8fr1cz399f9km3iqi40jm"} + unpackFile ${fetch "cfe" "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index ec739d22dd7..25c38db470d 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; - src = fetch "compiler-rt" "1mkhqvs8cxbfmprkzwyq7lmnzr1sv45znzf0arbgb19crzipzv5x"; + src = fetch "compiler-rt" "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 5446f1b362a..47c6e9e383f 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -5,7 +5,7 @@ }: let - release_version = "7.0.0"; + release_version = "7.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -13,7 +13,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1glxl7bnr4k3j16s8xy8r9cl0llyg524f50591g1ig23ij65lz4k"; + clang-tools-extra_src = fetch "clang-tools-extra" "1v9vc7id1761qm7mywlknsp810232iwyz8rd4y5km4h7pg9cg4sc"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f3b2f4df6cc..8a13f3eb590 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1w1l472p03csgz76p70pn9yk7h0nw5hj1av44ysnakigp8jjcd4v"; + src = fetch "libcxx" "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 04062b83f50..b65b75b3688 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "0pr4xfx61r5mwmvhg4j9pb6df6vvha1gyf6rwkm14x9rzxcwficv"; + src = fetch "libcxxabi" "1n6yx0949l9bprh75dffchahn8wplkm79ffk4f2ap9vw2lx90s41"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index f6ce768d648..33085eb3c80 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "173z50vx5mlsaiqmbz7asxy2297z4xivrfxrdfncvx23wp2lgkzv"; + src = fetch "lld" "0ca0qygrk87lhjk6cpv1wbmdfnficqqjsda3k7b013idvnralsc8"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 809e992ac58..14cc0514fe6 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0cmah36ybyfws0z2ikq9fqn5k4kvjci7vgk97ddx4xwrwkzdixkz"; + src = fetch "lldb" "10k9lyk3i72j9hca523r9pz79qp7d8q7jqnjy0i3saj1bgknpd3n"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index a852822cddc..bff89812cae 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -22,7 +22,7 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb"; + src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 31059b7c4c0..fb856eaa51f 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1zrqlaxr954sp8lcr7g8m0z0pr8xyq4i6p11x6gcamjm5xijnrih"; + src = fetch "openmp" "030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; From a78a733942948e305c65f1f4c4c19e07f4d54ee4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Dec 2018 11:18:27 -0800 Subject: [PATCH 084/200] commonsLang: 3.3.2 -> 3.6 (#52915) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-lang/versions --- pkgs/development/libraries/java/commons/lang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index a336ab50364..e46f22fadfb 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.6"; name = "commons-lang-${version}"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "1fmcx52h4cd2b7bplm7wy3725vh8bix64j3ykkxcn357y4j8ddzr"; + sha256 = "0r1wdjw48k2mk2wzyq5c3cx2zmark4q9psw52ma6v2i0sh6a9il0"; }; installPhase = '' From c859f30143db0e164fb67ef0aa60a52a19e64764 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Dec 2018 11:24:10 -0800 Subject: [PATCH 085/200] bison: 3.2.2 -> 3.2.3 (#52920) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bison/versions --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 42c443a46a8..8f9cb741d63 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.2.2"; + name = "bison-3.2.3"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0v3q6ym34krb4iskg0pspvpm35wmp3gx9njb9c35cv0w0h0j5z9z"; + sha256 = "14jz8jaz5ynszrbxsv4jy6gln27pjdndgfns7k11hk89kcsgi5ja"; }; patches = []; # remove on another rebuild From 867f1326dd7fcbe0c29550406c094c7a7f141c60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Dec 2018 11:35:31 -0800 Subject: [PATCH 086/200] clipmenu: 5.5.0 -> 5.6.0 (#52913) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clipmenu/versions --- pkgs/applications/misc/clipmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 6dd68123b13..7a47a0e3bc0 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { name = "clipmenu-${version}"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg"; + sha256 = "13hyarzazh6j33d808h3s5yk320wqzivc0ni9xm8kalvn4k3a0bq"; }; buildInputs = [ makeWrapper ]; From 614e10a6867bc272aa09d90473300c238d1a9f32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 Dec 2018 11:40:36 -0800 Subject: [PATCH 087/200] e2fsprogs: 1.44.4 -> 1.44.5 (#52899) 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 168bf7d076c..e9772ad76b6 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.4"; + name = "e2fsprogs-1.44.5"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1cnwfmv9r7s73xhgghqspjq593pc4qghh80wjd0kjdgwy247cw6x"; + sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From cbd17f5821dcc144eb06415e8c514a822b49ef71 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 13:44:47 -0600 Subject: [PATCH 088/200] bison: 3.2.2 -> 3.2.4 3.2.3: https://lists.gnu.org/archive/html/bison-patches/2018-12/msg00049.html 3.2.4: https://lists.gnu.org/archive/html/bison-patches/2018-12/msg00068.html --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 8f9cb741d63..3d5f09b7bc3 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.2.3"; + name = "bison-3.2.4"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "14jz8jaz5ynszrbxsv4jy6gln27pjdndgfns7k11hk89kcsgi5ja"; + sha256 = "16n7xs3sa1rlhs8y8zg4gi2s2kbkz8d69w3xp935wjykk0i3wryb"; }; patches = []; # remove on another rebuild From cbce67fd0a01b84e8d1014c4065ee665b639130f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 23 Dec 2018 11:56:47 -0600 Subject: [PATCH 089/200] harfbuzz: 2.2.0 -> 2.3.0 https://github.com/harfbuzz/harfbuzz/releases/tag/2.3.0 --- 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 2bd757786fd..198e26b39dd 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.2.0"; + version = "2.3.0"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "047q63jr513azf3g1y7f5xn60b4jdjs9zsmrx04sfw5rasyzrk5p"; + sha256 = "0r37z5cn04ig0q47y8c26gvadz15z9jj8c8q3r41j7d4anv4sc9v"; }; postPatch = '' From 0d208d923d03f2b27a20d261a0f2a8b5c51e0676 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 23 Dec 2018 16:52:07 -0600 Subject: [PATCH 090/200] boehmgc: 8.0.0 -> 8.0.2 https://github.com/ivmai/bdwgc/releases/tag/v8.0.2 --- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index ad7aff6b540..5c57f21a228 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "8.0.0"; + version = "8.0.2"; src = fetchurl { urls = [ - "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" + "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; - sha256 = "014gjv3f1qycsv5yh3fyhvrvsig60yc288pipzr0ml4312igj8wg"; + sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f"; }; buildInputs = [ libatomic_ops ]; From ee25d916eef4b393fc8db6584d6af66f5f793b18 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 6 Dec 2018 13:37:48 -0600 Subject: [PATCH 091/200] gcc: 7.3 -> 7.4 https://gcc.gnu.org/gcc-7/changes.html --- pkgs/development/compilers/gcc/7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d790246717d..41af804e551 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "7.3.0"; +let version = "7.4.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -138,7 +138,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; + sha256 = "0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd"; }; inherit patches; From 8318c5d8cd236562c924021a99e3b6643e461765 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 30 Dec 2018 14:22:42 +0100 Subject: [PATCH 092/200] =?UTF-8?q?librsvg:=202.44.10=20=E2=86=92=202.44.1?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 602b6708df0..4f9619bdf56 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.10"; + version = "2.44.11"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bnasw669dzyxmnx51ymnhbjgb5d4gb1pb3f26qyh017ajqrdz7l"; + sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4"; }; outputs = [ "out" "dev" "installedTests" ]; From 06dc418292f692c0ebbad390021a55a8bc86e506 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 30 Dec 2018 11:28:08 -0600 Subject: [PATCH 093/200] gzip: 1.9 -> 1.10 https://savannah.gnu.org/forum/forum.php?forum_id=9339 --- pkgs/tools/compression/gzip/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 09065ede682..bd4d85e90e3 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gzip-${version}"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "mirror://gnu/gzip/${name}.tar.xz"; - sha256 = "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f"; + sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4"; }; outputs = [ "out" "man" "info" ]; @@ -15,10 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xz.bin ]; - # In stdenv-linux, prevent a dependency on bootstrap-tools. - makeFlags = "SHELL=/bin/sh GREP=grep"; - - doCheck = false; # fails + makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; meta = { homepage = https://www.gnu.org/software/gzip/; From 4934e2b77968f1fe764c142372e5785e8674c284 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 30 Dec 2018 17:15:33 -0600 Subject: [PATCH 094/200] libpcap: prefer patch over sed, fetch it and mention upstream PR --- pkgs/development/libraries/libpcap/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index a12fae7082a..f7cbfeab470 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison }: +{ stdenv, fetchurl, fetchpatch, flex, bison }: stdenv.mkDerivation rec { name = "libpcap-1.9.0"; @@ -25,11 +25,16 @@ stdenv.mkDerivation rec { prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" - '' + '' - sed -i '1i#include ' pcap-usb-linux.c ''; - preInstall = ''mkdir -p $out/bin''; + patches = [ + # https://github.com/the-tcpdump-group/libpcap/pull/735 + (fetchpatch { + name = "add-missing-limits-h-include-pr735.patch"; + url = https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa.patch; + sha256 = "05zb4hx9g24gx07bi02rprk2rn7fdc1ss3249dv5x36qkasnfhvf"; + }) + ]; meta = with stdenv.lib; { homepage = https://www.tcpdump.org; From 21e32e803d88d7cc82471d5dd313d3e1db1a2d1b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 30 Dec 2018 11:37:53 -0600 Subject: [PATCH 095/200] gobject-introspection: 1.58.2 -> 1.58.3 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index e1acf0e5d2c..c00b5eca300 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -9,7 +9,7 @@ let pname = "gobject-introspection"; - version = "1.58.2"; + version = "1.58.3"; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1a7dw9d4kqi0skyygc2bhdvzipc0kjfy3x5q856cmxws8mlhypia"; + sha256 = "1j63rll0s608s0v4kqxkjapkpf46l069mlahzh8wykclplmn6nq2"; }; outputs = [ "out" "dev" "man" ]; From f5ea2fbe2b3c86490e24b188659f92a22fdd8ea6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Jan 2019 12:24:40 -0600 Subject: [PATCH 096/200] nghttp2: 1.35.0 -> 1.35.1 (#53061) https://nghttp2.org/blog/2018/12/10/nghttp2-v1-35-1/ --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 39fdb6d4eb2..ae9c329775c 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.35.0"; + version = "1.35.1"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "0nfdagjb0apgvms28kr9m8k93di5fv6ww9i1jwpd83y0p4vf5zvh"; + sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam"; }; outputs = [ "bin" "out" "dev" "lib" ]; From 47587f5d3143a27ae82c73fc7baf1d9e7b1bda39 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 1 Jan 2019 23:00:56 +0100 Subject: [PATCH 097/200] python37: fix cross build --- pkgs/development/interpreters/python/cpython/3.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 1d8b1c0eadf..61ffa8ec5a4 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -35,7 +35,7 @@ let sitePackages = "lib/${libPrefix}/site-packages"; buildInputs = filter (p: p != null) [ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl nukeReferences ] + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { inherit buildInputs; - nativeBuildInputs = + nativeBuildInputs = [ nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc buildPackages.python37 ]; From 219ca3c558f294f1e782f5aa866c3d5ff06cb488 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Jan 2019 21:47:10 -0600 Subject: [PATCH 098/200] diffutils: 3.6 -> 3.7 https://savannah.gnu.org/forum/forum.php?forum_id=9341 --- pkgs/tools/text/diffutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 68b2e512101..67f397dbe48 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, coreutils ? null }: stdenv.mkDerivation rec { - name = "diffutils-3.6"; + name = "diffutils-3.7"; src = fetchurl { url = "mirror://gnu/diffutils/${name}.tar.xz"; - sha256 = "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn"; + sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; }; outputs = [ "out" "info" ]; From be14e9fa299f0909847fa4d2c5d7f10f42d478fb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Nov 2018 13:49:07 -0600 Subject: [PATCH 099/200] networkmanager: 1.12.2 -> 1.14.4 --- pkgs/tools/networking/network-manager/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 7b06b521aaa..01b6de53325 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.12.2"; + version = "1.14.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09hsh34m8hg4m402pw5n11f29vsfjw6lm3p5m56yxwq57bwnzq3b"; + sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"; }; outputs = [ "out" "dev" ]; @@ -71,10 +71,6 @@ in stdenv.mkDerivation rec { url = https://bugzilla.gnome.org/attachment.cgi?id=372953; sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc"; }) - (fetchpatch { - url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch; - sha256 = "0r7338q3za7mf419a244vi65b1q497rg84avijybmv6w4x6p1ksd"; - }) (substituteAll { src = ./fix-paths.patch; inherit inetutils kmod openconnect; From f748cc85bd2539619aeb1d205120d5bee8e2520a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 22 Dec 2018 00:58:48 +0100 Subject: [PATCH 100/200] network-manager: fix paths --- .../networking/network-manager/default.nix | 18 ++----- .../network-manager/fix-paths.patch | 51 ++++++++++++++++--- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 01b6de53325..07b5629bba7 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, substituteAll, intltool, pkgconfig, dbus-glib +{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus, dbus-glib , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup @@ -25,14 +25,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace data/84-nm-drivers.rules \ - --replace /bin/sh ${stdenv.shell} - substituteInPlace data/85-nm-unmanaged.rules \ - --replace /bin/sh ${stdenv.shell} \ - --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ - --replace /bin/sed ${gnused}/bin/sed - substituteInPlace data/NetworkManager.service.in \ - --replace /bin/kill ${coreutils}/bin/kill # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" @@ -66,14 +58,10 @@ in stdenv.mkDerivation rec { ]; patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=796751 - (fetchpatch { - url = https://bugzilla.gnome.org/attachment.cgi?id=372953; - sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc"; - }) (substituteAll { src = ./fix-paths.patch; - inherit inetutils kmod openconnect; + inherit inetutils kmod openconnect ethtool coreutils dbus; + inherit (stdenv) shell; }) ]; diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index 5deaa2026d0..8a0e9df9ed8 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -1,17 +1,52 @@ --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c -@@ -205,7 +205,7 @@ - char *argv[4]; - const char *path; +@@ -214,10 +214,7 @@ + NULL, + }; -- path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error); +- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); +- if (!path) +- return FALSE; + path = "@openconnect@/bin/openconnect"; - if (!path) - return FALSE; + argv[0] = (char *) path; + argv[1] = "--authenticate"; +--- a/data/84-nm-drivers.rules ++++ b/data/84-nm-drivers.rules +@@ -7,6 +7,6 @@ + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" + DRIVERS=="?*", GOTO="nm_drivers_end" +-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" + + LABEL="nm_drivers_end" +--- a/data/90-nm-thunderbolt.rules ++++ b/data/90-nm-thunderbolt.rules +@@ -5,7 +5,7 @@ + + # Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain + # is added. +-SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="kmod load thunderbolt-net" ++SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="@kmod@/bin/kmod load thunderbolt-net" + + # For all thunderbolt network devices, we want to enable link-local configuration + SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="thunderbolt-net", ENV{NM_AUTO_DEFAULT_LINK_LOCAL_ONLY}="1" +--- a/data/NetworkManager.service.in ++++ b/data/NetworkManager.service.in +@@ -8,7 +8,7 @@ + [Service] + Type=dbus + BusName=org.freedesktop.NetworkManager +-ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 ++ExecReload=@dbus@/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 + #ExecReload=/bin/kill -HUP $MAINPID + ExecStart=@sbindir@/NetworkManager --no-daemon + Restart=on-failure --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -11828,14 +11828,14 @@ +@@ -12350,14 +12350,14 @@ gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); if (gw) { nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); @@ -30,7 +65,7 @@ } --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -428,7 +428,7 @@ +@@ -421,7 +421,7 @@ /* construct the argument list */ argv = g_ptr_array_sized_new (4); From 36c5f30d2490295567c209041d877a421f62deb4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 22 Dec 2018 15:22:20 -0500 Subject: [PATCH 101/200] networkmanager: cleanup using more placeholder --- pkgs/tools/networking/network-manager/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 07b5629bba7..48848c0ead7 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -25,8 +25,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - # to enable link-local connections - configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" # Fixes: error: po/Makefile.in.in was not created by intltoolize. intltoolize --automake --copy --force @@ -42,10 +40,11 @@ in stdenv.mkDerivation rec { "--with-dhcpcd=no" "--with-pppd=${ppp}/bin/pppd" "--with-iptables=${iptables}/bin/iptables" - #"--with-udev-dir=$(out)/lib/udev" + # to enable link-local connections + "--with-udev-dir=${placeholder "out"}/lib/udev" "--with-resolvconf=${openresolv}/sbin/resolvconf" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" + "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-kernel-firmware-dir=/run/current-system/firmware" @@ -77,9 +76,11 @@ in stdenv.mkDerivation rec { doCheck = false; # requires /sys, the net - preInstall = '' - installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) - ''; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=${placeholder "out"}/var" + "runstatedir=${placeholder "out"}/var/run" + ]; postInstall = '' mkdir -p $out/lib/NetworkManager From f603c1c52c585cd8835f6ec28d9b909064c3cd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Jan 2019 09:50:54 +0100 Subject: [PATCH 102/200] libjpeg(-turbo): patch CVE-2018-19664 Fixes #52972. --- pkgs/development/libraries/libjpeg-turbo/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 4e654168d4b..14b01cd9a84 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, nasm }: +{ stdenv, fetchurl, fetchpatch, cmake, nasm }: stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch; + ./mingw-boolean.patch + ++ [ + (fetchpatch { + name = "cve-2018-19664.diff"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; + sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; + }) + ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; From 1ec9f8b62f19d706e75e0292ab714e83413fed77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Jan 2019 17:19:40 +0100 Subject: [PATCH 103/200] doxygen: 1.8.14 -> 1.8.15 I thought of filing a PR, but it would seem a useless step, even though the release seems to bring lots of changes: http://www.doxygen.nl/manual/changelog.html#log_1_8_15 My relatively simple use case still works (atop 18.09). --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index f590c3e5988..d7dcb425963 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.14"; + name = "doxygen-1.8.15"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d"; + sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"; }; nativeBuildInputs = [ cmake ]; From 35af6e36057cafbb30df684326803e9e54bb377e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Dec 2018 13:41:51 -0600 Subject: [PATCH 104/200] treewide: use buildPackages for config builders --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 +- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +- .../system/boot/loader/generations-dir/generations-dir.nix | 4 ++-- .../boot/loader/generic-extlinux-compatible/default.nix | 2 +- .../modules/system/boot/loader/init-script/init-script.nix | 4 ++-- .../system/boot/loader/raspberrypi/uboot-builder.nix | 7 +++---- .../system/boot/loader/systemd-boot/systemd-boot.nix | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 2db71eb20c5..08788434869 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 695c79ca170..8f3600d3685 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index e395b265d15..8a27ac4504e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 2d27611946e..ff90a9b4617 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -7,8 +7,8 @@ let generationsDirBuilder = pkgs.substituteAll { src = ./generations-dir-builder.sh; isExecutable = true; - inherit (pkgs) bash; - path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs.buildPackages) bash; + path = with pkgs.buildPackages; [coreutils gnused gnugrep]; inherit (config.boot.loader.generationsDir) copyKernels; }; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index af39c7bb684..5f5dbe1092d 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -8,7 +8,7 @@ let timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; - builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; + builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; }; in { options = { diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 374d9524ff1..385a2603678 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -7,8 +7,8 @@ let initScriptBuilder = pkgs.substituteAll { src = ./init-script-builder.sh; isExecutable = true; - inherit (pkgs) bash; - path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs.buildPackages) bash; + path = with pkgs.buildPackages; [coreutils gnused gnugrep]; }; in diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index e929c33c6ee..b8c5a9f1d78 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -18,18 +18,17 @@ let extlinuxConfBuilder = import ../generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in pkgs.substituteAll { src = ./uboot-builder.sh; isExecutable = true; - inherit (pkgs) bash; - path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs.buildPackages) bash; + path = with pkgs.buildPackages; [coreutils gnused gnugrep]; firmware = pkgs.raspberrypifw; inherit uboot; inherit configTxt; inherit extlinuxConfBuilder; inherit version; } - diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index feed863efd6..9ad2a2779e1 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -12,7 +12,7 @@ let isExecutable = true; - inherit (pkgs) python3; + inherit (pkgs.buildPackages) python3; systemd = config.systemd.package; From 921a47bc922e4fdaf9e412d07adcd0ab3f311096 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Dec 2018 13:55:55 -0600 Subject: [PATCH 105/200] treewide: remove cross assertions sd-image-raspberrypi, sd-image-aarch64, and sd-image-armv7l-multiplatform can all be cross compiled now. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 7 ------- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 7 ------- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 7 ------- .../modules/system/boot/loader/raspberrypi/raspberrypi.nix | 4 ++-- .../system/boot/loader/raspberrypi/uboot-builder.nix | 2 +- 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 08788434869..5f7194e92a3 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -15,13 +15,6 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "aarch64-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-aarch64.nix can be only built natively on Aarch64 / ARM64; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 8f3600d3685..71448f74c36 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -15,13 +15,6 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "armv7l-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-armv7l-multiplatform.nix can be only built natively on ARMv7; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 8a27ac4504e..96e06670694 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -15,13 +15,6 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "armv6l-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-raspberrypi.nix can be only built natively on ARMv6; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 7e089507ff2..047651dc642 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -19,7 +19,7 @@ let blCfg = config.boot.loader; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; - isAarch64 = pkgs.stdenv.isAarch64; + isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; optional = pkgs.stdenv.lib.optionalString; configTxt = @@ -97,7 +97,7 @@ in config = mkIf cfg.enable { assertions = singleton { - assertion = !pkgs.stdenv.isAarch64 || cfg.version == 3; + assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version == 3; message = "Only Raspberry Pi 3 supports aarch64."; }; diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index b8c5a9f1d78..94599a0081c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -1,7 +1,7 @@ { pkgs, version, configTxt }: let - isAarch64 = pkgs.stdenv.isAarch64; + isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; uboot = if version == 0 then From fd38234dfc7ef38acf079a5be1227ca47f93c7f0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Dec 2018 14:02:49 -0600 Subject: [PATCH 106/200] swig: find pcre-config correctly --- pkgs/development/tools/misc/swig/3.x.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 9dc2b535c09..136ea9c9062 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; }; - # for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config - nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ]; - disallowedReferences = [ buildPackages.pcre.dev ]; - + PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; + nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ pcre ]; configureFlags = [ "--without-tcl" ]; From 9306ccd52e6786a073cade47ea1e3c6649166417 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 29 Dec 2018 17:29:59 +0000 Subject: [PATCH 107/200] nasm: 2.14.01 -> 2.14.02 --- pkgs/development/compilers/nasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 51156549552..8709c718649 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.14.01"; + version = "2.14.02"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1v9fazd3in0rphnw5ck58wqnl8dis4dyqpsqgjsm4h9jjj0vylvz"; + sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; }; nativeBuildInputs = [ perl ]; From d22e3f8e58a5740abf84e76610a495bb068b7628 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jan 2019 04:06:41 -0800 Subject: [PATCH 108/200] gnome3.libsecret: 0.18.6 -> 0.18.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsecret/versions Removing intltool in favour of gettext. --- pkgs/development/libraries/libsecret/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 5b3a00b12d4..a369778111f 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, python3, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchurl, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }: stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.18.6"; - name = "${pname}-${version}"; + version = "0.18.7"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0vynag97a9bnnb8ipah45av8xg8jzmhd572rw3zj78s1pa8ciysy"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "11ylmcfx6ff7xd1gpi58i2nbma83lz2xg0g2dq23w6snqhgzwrhd"; }; postPatch = '' @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc ]; + nativeBuildInputs = [ pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc ]; buildInputs = [ libgcrypt ]; # optional: build docs with gtk-doc? (probably needs a flag as well) From 5b9ad12e7be6083ed48ff87bfcac4a7f80d6975f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jan 2019 10:03:51 -0800 Subject: [PATCH 109/200] http-parser: 2.8.1 -> 2.9.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/http-parser/versions --- pkgs/development/libraries/http-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 02d76700068..4bae9793c38 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "2.8.1"; + version = "2.9.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"; + sha256 = "0gv1dhzwlv1anbzrba20l39gzzmz818yv8jbclbls268aj62c9pg"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; From 887e01c6d7509d58d74a597fd61c15e5509caabd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jan 2019 04:13:06 -0800 Subject: [PATCH 110/200] libmicrohttpd: 0.9.61 -> 0.9.62 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libmicrohttpd/versions --- pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 0b3b2418af4..3f678e0eb96 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmicrohttpd-${version}"; - version = "0.9.61"; + version = "0.9.62"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0dfl96l5wxqmswdqsdxqisflvm0padk9rikxyrhrx9rhm6s6ki6v"; + sha256 = "0jfvi1fb4im3a3m8qishbmzx3zch993c0mhvl2k92l1zf1yhjgmx"; }; outputs = [ "out" "dev" "devdoc" "info" ]; From bffa9e679d62b3802a76381d1757c15350bf8722 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 3 Jan 2019 14:15:51 -0600 Subject: [PATCH 111/200] libxslt: 1.1.32 -> 1.1.33, cleanup * Drop SunOS patch -- likely didn't apply anyway, and appears has been fixed upstream 2 years ago: https://gitlab.gnome.org/GNOME/libxslt/commit/7471cc6e8ff5448e00b0ae1096f0d9fbe13163d1 * changelog mentions cygwin build/linking fixes, so dropping those touchups optimistically --- .../development/libraries/libxslt/default.nix | 12 +--- .../libraries/libxslt/patch-ah.patch | 69 ------------------- 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 pkgs/development/libraries/libxslt/patch-ah.patch diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 6dc40bd45a0..60e33fa1177 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -10,22 +10,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.32"; + version = "1.1.33"; name = pname + "-" + version; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj"; + sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; - - # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified - postPatch = optionalString stdenv.hostPlatform.isCygwin '' - substituteInPlace tests/plugins/Makefile.in \ - --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)' - ''; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; diff --git a/pkgs/development/libraries/libxslt/patch-ah.patch b/pkgs/development/libraries/libxslt/patch-ah.patch deleted file mode 100644 index ea75b01178e..00000000000 --- a/pkgs/development/libraries/libxslt/patch-ah.patch +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $ - -Fix syms file for stricter solaris ld - ---- libxslt-1.1.28/libxslt/libxslt.syms.orig 2012-11-27 12:04:43.000000000 +0000 -+++ libxslt-1.1.28/libxslt/libxslt.syms -@@ -107,7 +107,7 @@ LIBXML2_1.0.11 { - xsltFreeCompMatchList; - xsltFreeTemplateHashes; - xsltGetTemplate; -- xsltMatchPattern; -+# xsltMatchPattern; - xsltTestCompMatchList; - - # preproc -@@ -407,7 +407,7 @@ LIBXML2_1.1.18 { - global: - - # xsltInternals -- xsltConstNamespaceNameXSLT; # variable -+# xsltConstNamespaceNameXSLT; # variable - xsltExtensionInstructionResultFinalize; - xsltExtensionInstructionResultRegister; - xsltInitCtxtKey; -@@ -416,24 +416,24 @@ LIBXML2_1.1.18 { - xsltInit; - - # xsltInternals -- xsltParseAnyXSLTElem; -- xsltParseSequenceConstructor; -- xsltPointerListAddSize; -- xsltPointerListClear; -- xsltPointerListCreate; -- xsltPointerListFree; -+# xsltParseAnyXSLTElem; -+# xsltParseSequenceConstructor; -+# xsltPointerListAddSize; -+# xsltPointerListClear; -+# xsltPointerListCreate; -+# xsltPointerListFree; - xsltRegisterLocalRVT; - xsltReleaseRVT; -- xsltRestoreDocumentNamespaces; -+# xsltRestoreDocumentNamespaces; - - # extensions -- xsltStyleStylesheetLevelGetExtData; -+# xsltStyleStylesheetLevelGetExtData; - - # xsltInternals - # xsltTransStorageAdd; removed in 1.1.28 - # xsltTransStorageRemove; removed in 1.1.28 - xsltUninit; -- xsltXSLTAttrMarker; # variable -+# xsltXSLTAttrMarker; # variable - } LIBXML2_1.1.9; - - LIBXML2_1.1.20 { -@@ -476,6 +476,10 @@ LIBXML2_1.1.26 { - - # transform - xsltProcessOneNode; -+ -+# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") -+ local: -+ *; - } LIBXML2_1.1.25; - - LIBXML2_1.1.27 { From 96890e239056622929aa5dd07e78e14be97e7450 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 3 Jan 2019 14:34:10 -0600 Subject: [PATCH 112/200] libxml2: 2.9.8 -> 2.9.9 --- pkgs/development/libraries/libxml2/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 54ed569f666..de131052314 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -11,26 +11,13 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.8"; + version = "2.9.9"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; + sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-14567_CVE-2018-9251.patch"; - url = https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch; - sha256 = "1xpqsfkzhrqasza51c821mnds5l317djrz8086fmzpyf68vld03h"; - }) - (fetchpatch { - name = "CVE-2018-14404.patch"; - url = https://gitlab.gnome.org/GNOME/libxml2/commit/a436374994c47b12d5de1b8b1d191a098fa23594.patch; - sha256 = "19vp7p32vrninnfa7vk9ipw7n4cl1gg16xxbhjy2d0kwp1crvzqh"; - }) - ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; From 9c5cde46a61da701eab25cb6e77a784da2133da6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 30 Dec 2018 20:34:57 -0600 Subject: [PATCH 113/200] nixos/all-firmware: include raspberrypiWirelessFirmware when building --- nixos/modules/hardware/all-firmware.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index e978ec6b40a..69cc22aaa34 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -38,7 +38,7 @@ in { firmwareLinuxNonfree intel2200BGFirmware rtl8192su-firmware - ] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware + ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; From 39bec3990e6864026b65b13cc2deb907bd5398e2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jan 2019 03:01:00 -0500 Subject: [PATCH 114/200] nodejs-6_x: 6.15.1 -> 6.16.0 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c15e4b39a0d..dba6c2648ce 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "6.15.1"; - sha256 = "1hi9h54ni7m1lmhfqvwxdny969j31mixxlxsiyl00l2bj25fbgf3"; + version = "6.16.0"; + sha256 = "0ikmpn1kvp5q8andmiyhpr99zniqs86sdlfk31sj3k0wvalq420d"; } From bf847226ca07f07aa6ae923090fbdf3d0777c675 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jan 2019 03:02:00 -0500 Subject: [PATCH 115/200] nodejs-8_x: 8.14.1 -> 8.15.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 64ee5d504be..19b4716892e 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.14.1"; - sha256 = "16vb5baw6nk71n7jfbyd9x8qi0kbkzv2bw1rczy7dyyz7n08gpxi"; + version = "8.15.0"; + sha256 = "0cy6lzk9sn545kkc0jviv0k0hn30kindrpkkkmv3zk2774rj71cn"; } From 4c917c69614bf5fa740e744f74725e6b5697dfe5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jan 2019 03:03:00 -0500 Subject: [PATCH 116/200] nodejs-10_x: 10.12.0 -> 10.15.0 --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 47180898008..79da49ec64c 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.12.0"; - sha256 = "1r0aqcxafha13ks8586x77n77zi88db259cpaix0y1ivdh6qkkfr"; + version = "10.15.0"; + sha256 = "0gnygq4n7aar4jrynnnslxhlrlrml9f1n9passvj2fxqfi6b6ykr"; } From 68d8c2e26bc50e2630068f5540c508bb79cc7fd6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jan 2019 03:04:00 -0500 Subject: [PATCH 117/200] nodejs-11_x: 11.5.0 -> 11.6.0 --- pkgs/development/web/nodejs/v11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix index b5ff17a67a1..7378729581f 100644 --- a/pkgs/development/web/nodejs/v11.nix +++ b/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.5.0"; - sha256 = "07fdpl8wzkcdd8iyaiwf2ah1rgishk2hrl0g73i8aggwplrl69fx"; + version = "11.6.0"; + sha256 = "1czrpxmk6calqn0p92rm0bv2vlgbnx6q4z7n2j8r7aw0khwbxwll"; } From efbe87f3ef769aac5e95512609b4759a43109307 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 Dec 2018 13:59:20 +0100 Subject: [PATCH 118/200] CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru --- .../python/cpython/2.7/default.nix | 69 +++--- .../python/cpython/3.5/default.nix | 212 ---------------- .../python/cpython/3.6/default.nix | 228 ------------------ .../python/cpython/{3.7 => }/default.nix | 127 +++++----- .../interpreters/python/default.nix | 106 ++++++++ pkgs/top-level/all-packages.nix | 18 +- pkgs/top-level/python-packages.nix | 14 +- 7 files changed, 213 insertions(+), 561 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.5/default.nix delete mode 100644 pkgs/development/interpreters/python/cpython/3.6/default.nix rename pkgs/development/interpreters/python/cpython/{3.7 => }/default.nix (66%) create mode 100644 pkgs/development/interpreters/python/default.nix diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index ff1497a24e4..23b88b168b5 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,7 +1,9 @@ -{ stdenv, buildPackages, fetchurl +{ stdenv, fetchurl, fetchpatch , bzip2 +, expat +, libffi , gdbm -, fetchpatch +, db , ncurses , openssl , readline @@ -10,15 +12,16 @@ , zlib , callPackage , self -, db -, expat -, libffi , CF, configd, coreutils , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 # For the Python package set , packageOverrides ? (self: super: {}) +, buildPackages +, sourceVersion +, sha256 +, passthruFun }: assert x11Support -> tcl != null @@ -29,16 +32,23 @@ assert x11Support -> tcl != null with stdenv.lib; let - majorVersion = "2.7"; - minorVersion = "15"; - minorVersionSuffix = ""; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; + passthru = passthruFun rec { + inherit self sourceVersion packageOverrides; + implementation = "cpython"; + libPrefix = "python${pythonVersion}"; + executable = libPrefix; + pythonVersion = with sourceVersion; "${major}.${minor}"; + sitePackages = "lib/${libPrefix}/site-packages"; + inherit pythonForBuild; + } // { + inherit ucsEncoding; + }; + + version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; + inherit sha256; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -191,12 +201,11 @@ let # Build the basic Python interpreter without modules that have # external dependencies. -in stdenv.mkDerivation ({ - name = "python-${version}"; - pythonVersion = majorVersion; +in with passthru; stdenv.mkDerivation ({ + pname = "python"; + inherit version; - inherit majorVersion version src patches buildInputs nativeBuildInputs - preConfigure configureFlags; + inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; @@ -215,7 +224,7 @@ in stdenv.mkDerivation ({ '' # needed for some packages, especially packages that backport # functionality to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do + for item in $out/lib/${libPrefix}/test/*; do if [[ "$item" != */test_support.py* && "$item" != */test/support && "$item" != */test/regrtest.py* ]]; then @@ -224,9 +233,9 @@ in stdenv.mkDerivation ({ echo $item fi done - touch $out/lib/python${majorVersion}/test/__init__.py - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + touch $out/lib/${libPrefix}/test/__init__.py + ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb + ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 @@ -249,21 +258,7 @@ in stdenv.mkDerivation ({ cp libpython2.7.dll.a $out/lib ''; - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix { - python = self; - overrides = packageOverrides; - }; - in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; - executable = libPrefix; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy2 = true; - isPy27 = true; - interpreter = "${self}/bin/${executable}"; - }; + inherit passthru; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix deleted file mode 100644 index 19e9f3169c7..00000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ /dev/null @@ -1,212 +0,0 @@ -{ stdenv, fetchurl, fetchpatch -, bzip2 -, expat -, libffi -, gdbm -, lzma -, ncurses -, openssl -, readline -, sqlite -, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false -, zlib -, callPackage -, self -, CF, configd -, python-setup-hook -# For the Python package set -, packageOverrides ? (self: super: {}) -}: - -assert x11Support -> tcl != null - && tk != null - && xproto != null - && libX11 != null; - -with stdenv.lib; - -let - majorVersion = "3.5"; - minorVersion = "6"; - minorVersionSuffix = ""; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] - ++ optionals x11Support [ tcl tk libX11 xproto ] - ++ optionals stdenv.isDarwin [ CF configd ]; - - hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - inherit buildInputs; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; - }; - - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python doesn't try to update them when we freeze timestamps in nix store. - DETERMINISTIC_BUILD=1; - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; - - prePatch = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' - ''; - - patches = [ - ./no-ldconfig.patch - ./ld_library_path.patch - ] ++ optionals stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) - ] ++ optionals (x11Support && stdenv.isDarwin) [ - ./use-correct-tcl-tk-on-darwin.patch - ] ++ optionals hasDistutilsCxxPatch [ - # Fix for http://bugs.python.org/issue1222585 - # Upstream distutils is calling C compiler to compile C++ code, which - # only works for GCC and Apple Clang. This makes distutils to call C++ - # compiler when needed. - (fetchpatch { - url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; - sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; - extraPrefix = ""; - }) - ]; - - postPatch = '' - # Determinism - substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" - # Determinism. This is done unconditionally - substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1" - '' + optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - - configureFlags = [ - "--enable-shared" - "--with-threads" - "--without-ensurepip" - "--with-system-expat" - "--with-system-ffi" - ] - # Never even try to use lchmod on linux, - # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 - '' - + optionalString stdenv.hostPlatform.isMusl '' - export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" - ''} - ''; - - setupHook = python-setup-hook sitePackages; - - postInstall = '' - # needed for some packages, especially packages that backport functionality - # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* - && "$item" != */test/support - && "$item" != */test/libregrtest - && "$item" != */test/regrtest.py* ]]; then - rm -rf "$item" - else - echo $item - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - # Determinism: Windows installers were not deterministic. - # We're also not interested in building Windows installers. - find "$out" -name 'wininst*.exe' | xargs -r rm -f - - # Use Python3 as default python - ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pydoc3" "$out/bin/pydoc" - ln -s "$out/bin/python3" "$out/bin/python" - ln -s "$out/bin/python3-config" "$out/bin/python-config" - ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" - - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level - find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix { - python = self; - overrides = packageOverrides; - }; - in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; - executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy3 = true; - isPy35 = true; - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - doCheck = false; # expensive, and fails - - meta = { - homepage = http://python.org; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = licenses.psfl; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ fridh ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix deleted file mode 100644 index a36965a7801..00000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ /dev/null @@ -1,228 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, buildPackages -, bzip2 -, expat -, libffi -, gdbm -, lzma -, ncurses -, openssl -, readline -, sqlite -, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false -, zlib -, callPackage -, self -, CF, configd -, python-setup-hook -# For the Python package set -, packageOverrides ? (self: super: {}) -}: - -assert x11Support -> tcl != null - && tk != null - && xproto != null - && libX11 != null; -with stdenv.lib; - -let - majorVersion = "3.6"; - minorVersion = "8"; - minorVersionSuffix = ""; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] - ++ optionals x11Support [ tcl tk libX11 xproto ] - ++ optionals stdenv.isDarwin [ CF configd ]; - - nativeBuildInputs = - optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3; - - hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - inherit buildInputs nativeBuildInputs; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; - }; - - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python doesn't try to update them when we freeze timestamps in nix store. - DETERMINISTIC_BUILD=1; - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; - - prePatch = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' - ''; - - patches = [ - ./no-ldconfig.patch - ] ++ optionals (x11Support && stdenv.isDarwin) [ - ./use-correct-tcl-tk-on-darwin.patch - ] ++ optionals hasDistutilsCxxPatch [ - # Fix for http://bugs.python.org/issue1222585 - # Upstream distutils is calling C compiler to compile C++ code, which - # only works for GCC and Apple Clang. This makes distutils to call C++ - # compiler when needed. - (fetchpatch { - url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; - sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; - }) - ]; - - postPatch = '' - # Determinism - substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" - # Determinism. This is done unconditionally - substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1" - '' + optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - - configureFlags = [ - "--enable-shared" - "--with-threads" - "--without-ensurepip" - "--with-system-expat" - "--with-system-ffi" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_buggy_getaddrinfo=no" - # Assume little-endian IEEE 754 floating point when cross compiling - "ac_cv_little_endian_double=yes" - "ac_cv_big_endian_double=no" - "ac_cv_mixed_endian_double=no" - "ac_cv_x87_double_rounding=yes" - "ac_cv_tanh_preserves_zero_sign=yes" - # Generally assume that things are present and work - "ac_cv_posix_semaphores_enabled=yes" - "ac_cv_broken_sem_getvalue=no" - "ac_cv_wchar_t_signed=yes" - "ac_cv_rshift_extends_sign=yes" - "ac_cv_broken_nice=no" - "ac_cv_broken_poll=no" - "ac_cv_working_tzset=yes" - "ac_cv_have_long_long_format=yes" - "ac_cv_have_size_t_format=yes" - "ac_cv_computed_gotos=yes" - "ac_cv_file__dev_ptmx=yes" - "ac_cv_file__dev_ptc=yes" - ] - # Never even try to use lchmod on linux, - # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 - '' - + optionalString stdenv.hostPlatform.isMusl '' - export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" - ''} - ''; - - setupHook = python-setup-hook sitePackages; - - postInstall = '' - # needed for some packages, especially packages that backport functionality - # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* - && "$item" != */test/support - && "$item" != */test/libregrtest - && "$item" != */test/regrtest.py* ]]; then - rm -rf "$item" - else - echo $item - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - # Determinism: Windows installers were not deterministic. - # We're also not interested in building Windows installers. - find "$out" -name 'wininst*.exe' | xargs -r rm -f - - # Use Python3 as default python - ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pydoc3" "$out/bin/pydoc" - ln -s "$out/bin/python3" "$out/bin/python" - ln -s "$out/bin/python3-config" "$out/bin/python-config" - ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" - - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level - find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix { - python = self; - overrides = packageOverrides; - }; - in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; - executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy3 = true; - isPy36 = true; - is_py3k = true; # deprecated - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - doCheck = false; # expensive, and fails - - meta = { - homepage = http://python.org; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = licenses.psfl; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ fridh kragniz ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/default.nix similarity index 66% rename from pkgs/development/interpreters/python/cpython/3.7/default.nix rename to pkgs/development/interpreters/python/cpython/default.nix index 61ffa8ec5a4..0d1794f04fa 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -18,6 +18,9 @@ # For the Python package set , packageOverrides ? (self: super: {}) , buildPackages +, sourceVersion +, sha256 +, passthruFun }: assert x11Support -> tcl != null @@ -27,12 +30,24 @@ assert x11Support -> tcl != null with stdenv.lib; let - majorVersion = "3.7"; - minorVersion = "2"; - minorVersionSuffix = ""; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; + + passthru = passthruFun rec { + inherit self sourceVersion packageOverrides; + implementation = "cpython"; + libPrefix = "python${pythonVersion}"; + executable = libPrefix; + pythonVersion = with sourceVersion; "${major}.${minor}"; + sitePackages = "lib/${libPrefix}/site-packages"; + inherit pythonForBuild; + }; + + version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; + + nativeBuildInputs = [ + nukeReferences + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.stdenv.cc crossPython + ]; buildInputs = filter (p: p != null) [ zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] @@ -40,44 +55,46 @@ let ++ optionals stdenv.isDarwin [ CF configd ]; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + + crossPython = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + pythonForBuild = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else - buildPackages.python37.interpreter; -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; + else crossPython.interpreter; - inherit buildInputs; +in with passthru; stdenv.mkDerivation { + pname = "python3"; + inherit version; - nativeBuildInputs = [ nukeReferences ] ++ - optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ buildPackages.stdenv.cc buildPackages.python37 ]; + inherit buildInputs nativeBuildInputs; src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; + inherit sha256; }; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; - prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; patches = [ - ./no-ldconfig.patch + # Disable the use of ldconfig in ctypes.util.find_library (since + # ldconfig doesn't work on NixOS), and don't use + # ctypes.util.find_library during the loading of the uuid module + # (since it will do a futile invocation of gcc (!) to find + # libuuid, slowing down program startup a lot). + (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals isPy35 [ + # Backports support for LD_LIBRARY_PATH from 3.6 + ./3.5/ld_library_path.patch + ] ++ optionals isPy37 [ # Fix darwin build https://bugs.python.org/issue34027 (fetchpatch { url = https://bugs.python.org/file47666/darwin-libutil.patch; sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa"; }) - ] ++ optionals hasDistutilsCxxPatch [ + ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which # only works for GCC and Apple Clang. This makes distutils to call C++ @@ -93,9 +110,12 @@ in stdenv.mkDerivation { substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; + CPPFLAGS = "${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; + LDFLAGS = "${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; + LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; configureFlags = [ "--enable-shared" @@ -125,16 +145,25 @@ in stdenv.mkDerivation { "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" + ] ++ optionals stdenv.hostPlatform.isLinux [ + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + "ac_cv_func_lchmod=no" ]; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path done - ${optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 - ''} + '' + optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" + export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + optionalString (isPy3k && pythonOlder "3.7") '' + # Determinism: The interpreter is patched to write null timestamps when compiling python files. + # This way python does not try to update them when we freeze timestamps in nix store. + export DETERMINISTIC_BUILD=1; + '' + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''; setupHook = python-setup-hook sitePackages; @@ -142,7 +171,7 @@ in stdenv.mkDerivation { postInstall = '' # needed for some packages, especially packages that backport functionality # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do + for item in $out/lib/${libPrefix}/test/*; do if [[ "$item" != */test_support.py* && "$item" != */test/support && "$item" != */test/libregrtest @@ -152,9 +181,9 @@ in stdenv.mkDerivation { echo $item fi done - touch $out/lib/python${majorVersion}/test/__init__.py + touch $out/lib/${libPrefix}/test/__init__.py - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + ln -s "$out/include/${executable}m" "$out/include/${executable}" # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py @@ -173,14 +202,13 @@ in stdenv.mkDerivation { # Get rid of retained dependencies on -dev packages, and remove # some $TMPDIR references to improve binary reproducibility. # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do - sed -i $i -e "s|$TMPDIR|/no-such-path|g" - nuke-refs $i + for i in $out/lib/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do + sed -i $i -e "s|$TMPDIR|/no-such-path|g" done # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 - find $out/lib/python*/config-*-* -type f -print -exec nuke-refs '{}' + - find $out/lib -name '_sysconfigdata_m*.py*' -print -exec nuke-refs '{}' + + find $out/lib/python*/config-* -type f -print -exec nuke-refs '{}' + + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs '{}' + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails @@ -196,22 +224,7 @@ in stdenv.mkDerivation { # explicitly specify in our configure flags above. disallowedReferences = [ openssl.dev ]; - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix { - python = self; - overrides = packageOverrides; - }; - in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; - executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy3 = true; - isPy37 = true; - is_py3k = true; # deprecated - interpreter = "${self}/bin/${executable}"; - }; + inherit passthru; enableParallelBuilding = true; @@ -229,6 +242,6 @@ in stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ fridh kragniz ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix new file mode 100644 index 00000000000..75226ef9a73 --- /dev/null +++ b/pkgs/development/interpreters/python/default.nix @@ -0,0 +1,106 @@ +{ pkgs, lib }: + +with pkgs; + +(let + + # Common passthru for all Python interpreters. + passthruFun = + { implementation + , libPrefix + , executable + , sourceVersion + , pythonVersion + , packageOverrides + , sitePackages + , pythonForBuild + , self + }: let + pythonPackages = callPackage ../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; + in rec { + sitePackages = "lib/${libPrefix}/site-packages"; + isPy27 = pythonVersion == "2.7"; + isPy33 = pythonVersion == "3.3"; # TODO: remove + isPy34 = pythonVersion == "3.4"; # TODO: remove + isPy35 = pythonVersion == "3.5"; + isPy36 = pythonVersion == "3.6"; + isPy37 = pythonVersion == "3.7"; + isPy3k = lib.strings.substring 0 1 pythonVersion == "3"; + isPyPy = interpreter == "pypy"; + + buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + interpreter = "${self}/bin/${executable}"; + inherit executable implementation libPrefix pythonVersion; + inherit sourceVersion; + pythonAtLeast = lib.versionAtLeast pythonVersion; + pythonOlder = lib.versionOlder pythonVersion; + inherit pythonForBuild; + + majorVersion = pythonVersion; # Backwards compatibility. Should be dropped. + }; + +in { + + python27 = callPackage ./cpython/2.7 { + self = python27; + sourceVersion = { + major = "2"; + minor = "7"; + patch = "15"; + suffix = ""; + }; + sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python35 = callPackage ./cpython { + self = python35; + sourceVersion = { + major = "3"; + minor = "5"; + patch = "6"; + suffix = ""; + }; + sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python36 = callPackage ./cpython { + self = python36; + sourceVersion = { + major = "3"; + minor = "6"; + patch = "8"; + suffix = ""; + }; + sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python37 = callPackage ./cpython { + self = python37; + sourceVersion = { + major = "3"; + minor = "7"; + patch = "2"; + suffix = ""; + }; + sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + +# pypy27 = callPackage ./pypy { +# self = pypy27; +# implementation = "pypy"; +# }; + +}) \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7a991621c..34507b67b57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7953,22 +7953,8 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - python27 = callPackage ../development/interpreters/python/cpython/2.7 { - self = python27; - inherit (darwin) CF configd; - }; - python35 = callPackage ../development/interpreters/python/cpython/3.5 { - inherit (darwin) CF configd; - self = python35; - }; - python36 = callPackage ../development/interpreters/python/cpython/3.6 { - inherit (darwin) CF configd; - self = python36; - }; - python37 = callPackage ../development/interpreters/python/cpython/3.7 { - inherit (darwin) CF configd; - self = python37; - }; + pythonInterpreters = callPackage ./../development/interpreters/python {}; + inherit (pythonInterpreters) python27 python35 python36 python37; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8403b398ccd..e0e45ea9ecd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,16 +18,7 @@ let packages = ( self: let - pythonAtLeast = versionAtLeast python.pythonVersion; - pythonOlder = versionOlder python.pythonVersion; - isPy27 = python.pythonVersion == "2.7"; - isPy33 = python.pythonVersion == "3.3"; - isPy34 = python.pythonVersion == "3.4"; - isPy35 = python.pythonVersion == "3.5"; - isPy36 = python.pythonVersion == "3.6"; - isPy37 = python.pythonVersion == "3.7"; - isPyPy = strings.substring 0 4 python.executable == "pypy"; - isPy3k = strings.substring 0 1 python.pythonVersion == "3"; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -130,7 +121,8 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; From 613498af978d65a7497cdd0dfd4f15c834348c61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 1 Jan 2019 11:34:44 +0100 Subject: [PATCH 119/200] pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython. --- .../interpreters/python/default.nix | 31 +++- .../interpreters/python/pypy/2.7/default.nix | 136 ------------------ .../python/pypy/3/tk_tcl_paths.patch | 17 --- .../python/pypy/{3 => }/default.nix | 113 +++++++++------ .../python/pypy/{2.7 => }/tk_tcl_paths.patch | 0 pkgs/top-level/all-packages.nix | 13 +- 6 files changed, 94 insertions(+), 216 deletions(-) delete mode 100644 pkgs/development/interpreters/python/pypy/2.7/default.nix delete mode 100644 pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch rename pkgs/development/interpreters/python/pypy/{3 => }/default.nix (50%) rename pkgs/development/interpreters/python/pypy/{2.7 => }/tk_tcl_paths.patch (100%) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 75226ef9a73..877bf647d26 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -98,9 +98,32 @@ in { inherit passthruFun; }; -# pypy27 = callPackage ./pypy { -# self = pypy27; -# implementation = "pypy"; -# }; + pypy27 = callPackage ./pypy { + self = pypy27; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "1qjwpc8n68sxxlfg36s5vn1h2gdfvvd6lxvr4lzbvfwhzrgqahsw"; + pythonVersion = "2.7"; + db = db.override { dbmSupport = true; }; + python = python27; + inherit passthruFun; + }; + + pypy3 = callPackage ./pypy { + self = pypy3; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg"; + pythonVersion = "3.5"; + db = db.override { dbmSupport = true; }; + python = python27; + inherit passthruFun; + }; }) \ No newline at end of file diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix deleted file mode 100644 index 6f7fa962296..00000000000 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, makeWrapper, callPackage, self, gdbm, db -, python-setup-hook -# For the Python package set -, packageOverrides ? (self: super: {}) -}: - -assert zlibSupport -> zlib != null; - -let - version = "6.0.0"; - pythonVersion = "2.7"; - libPrefix = "pypy${pythonVersion}"; - sitePackages = "site-packages"; - - pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); - -in stdenv.mkDerivation rec { - name = "pypy-${version}"; - inherit version pythonVersion; - - src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1qjwpc8n68sxxlfg36s5vn1h2gdfvvd6lxvr4lzbvfwhzrgqahsw"; - }; - - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db - ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc - ++ stdenv.lib.optional zlibSupport zlib; - - hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; - - C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); - - patches = [ - (substituteAll { - src = ./tk_tcl_paths.patch; - inherit tk tcl; - tk_dev = tk.dev; - tcl_dev = tcl; - tk_libprefix = tk.libPrefix; - tcl_libprefix = tcl.libPrefix; - }) - ]; - - postPatch = '' - substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - - # hint pypy to find nix ncurses - substituteInPlace pypy/module/_minimal_curses/fficurses.py \ - --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ - --replace "libraries=['curses']" "libraries=['ncurses']" - - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py - ''; - - buildPhase = '' - ${pythonForPypy.interpreter} rpython/bin/rpython \ - --make-jobs="$NIX_BUILD_CORES" \ - -Ojit \ - --batch pypy/goal/targetpypystandalone.py - ''; - - setupHook = python-setup-hook sitePackages; - - doCheck = true; - checkPhase = '' - export TERMINFO="${ncurses.out}/share/terminfo/"; - export TERM="xterm"; - export HOME="$TMPDIR"; - # disable shutils because it assumes gid 0 exists - # disable socket because it has two actual network tests that fail - # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python - ''; - - installPhase = '' - mkdir -p $out/{bin,include,lib,pypy-c} - - cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c - cp libpypy-c.so $out/lib/ - ln -s $out/pypy-c/pypy-c $out/bin/pypy - chmod +x $out/bin/pypy - - # other packages expect to find stuff according to libPrefix - ln -s $out/pypy-c/include $out/include/${libPrefix} - ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} - - # We must wrap the original, not the symlink. - # PyPy uses argv[0] to find its standard library, and while it knows - # how to follow symlinks, it doesn't know about wrappers. So, it - # will think the wrapper is the original. As long as the wrapper has - # the same path as the original, this is OK. - wrapProgram "$out/pypy-c/pypy-c" \ - --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ - --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" - - # verify cffi modules - $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit zlibSupport libPrefix sitePackages; - executable = "pypy"; - isPypy = true; - isPy2 = true; - isPy27 = true; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - interpreter = "${self}/bin/${executable}"; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - }; - - enableParallelBuilding = true; # almost no parallelization without STM - - meta = with stdenv.lib; { - homepage = http://pypy.org/; - description = "Fast, compliant alternative implementation of the Python language (2.7.13)"; - license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch deleted file mode 100644 index 92bbfc557b3..00000000000 --- a/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 -+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 -@@ -24,11 +24,11 @@ - else: - # On some Linux distributions, the tcl and tk libraries are - # stored in /usr/include, so we must check this case also -- libdirs = [] -+ libdirs = ["@tcl@/lib", "@tk@/lib"] - found = False - for _ver in ['', '8.6', '8.5']: -- incdirs = ['/usr/include/tcl' + _ver] -- linklibs = ['tcl' + _ver, 'tk' + _ver] -+ incdirs = ['@tcl_dev@/include', '@tk_dev@/include'] -+ linklibs = ['@tcl_libprefix@', '@tk_libprefix@'] - if os.path.isdir(incdirs[0]): - found = True - break diff --git a/pkgs/development/interpreters/python/pypy/3/default.nix b/pkgs/development/interpreters/python/pypy/default.nix similarity index 50% rename from pkgs/development/interpreters/python/pypy/3/default.nix rename to pkgs/development/interpreters/python/pypy/default.nix index 23e239d925b..a7c3d6740c1 100644 --- a/pkgs/development/interpreters/python/pypy/3/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -5,38 +5,54 @@ , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) +, sourceVersion +, pythonVersion +, sha256 +, passthruFun }: assert zlibSupport -> zlib != null; -let - version = "6.0.0"; - pythonVersion = "3.5"; - libPrefix = "pypy${pythonVersion}"; - sitePackages = "site-packages"; +with stdenv.lib; +let + isPy3k = substring 0 1 pythonVersion == "3"; + passthru = passthruFun rec { + inherit self sourceVersion pythonVersion packageOverrides; + implementation = "pypy"; + libPrefix = "pypy${pythonVersion}"; + executable = "pypy${if isPy3k then "3" else ""}"; + pythonForBuild = self; # No cross-compiling for now. + sitePackages = "site-packages"; + }; + pname = passthru.executable; + version = with sourceVersion; "${major}.${minor}.${patch}"; pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); -in stdenv.mkDerivation rec { - name = "pypy3-${version}"; - inherit version pythonVersion; +in with passthru; stdenv.mkDerivation rec { + inherit pname version; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg"; + inherit sha256; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db lzma - ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc - ++ stdenv.lib.optional zlibSupport zlib; + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + ] ++ optionals isPy3k [ + lzma + ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ + stdenv.cc.libc + ] ++ optionals zlibSupport [ + zlib + ]; - hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + hardeningDisable = optional stdenv.isi686 "pic"; - C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = makeLibraryPath buildInputs; + LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ (substituteAll { @@ -50,7 +66,7 @@ in stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace "lib-python/3/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" # hint pypy to find nix ncurses substituteInPlace pypy/module/_minimal_curses/fficurses.py \ @@ -72,60 +88,63 @@ in stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; doCheck = true; - checkPhase = '' + checkPhase = let + disabledTests = [ + # disable shutils because it assumes gid 0 exists + "test_shutil" + # disable socket because it has two actual network tests that fail + "test_socket" + ] ++ optionals (!isPy3k) [ + # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) + "test_urllib2net" + "test_urllibnet" + "test_urllib2_localnet" + ] ++ optionals isPy3k [ + # disable asyncio due to https://github.com/NixOS/nix/issues/1238 + "test_asyncio" + # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 + "test_os" + # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594 + "test_pathlib" + # disable tarfile because it assumes gid 0 exists + "test_tarfile" + ]; + in '' export TERMINFO="${ncurses.out}/share/terminfo/"; export TERM="xterm"; export HOME="$TMPDIR"; - # disable asyncio due to https://github.com/NixOS/nix/issues/1238 - # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 - # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594 - # disable shutils because it assumes gid 0 exists - # disable socket because it has two actual network tests that fail - # disable tarfile because it assumes gid 0 exists - ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./pypy3-c -k 'not ( test_asyncio or test_os or test_pathlib or test_shutil or test_socket or test_tarfile )' lib-python + + ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python ''; installPhase = '' - mkdir -p $out/{bin,include,lib,pypy3-c} + mkdir -p $out/{bin,include,lib,${executable}-c} - cp -R {include,lib_pypy,lib-python,pypy3-c} $out/pypy3-c - cp libpypy3-c.so $out/lib/ - ln -s $out/pypy3-c/pypy3-c $out/bin/pypy3 + cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c + cp lib${executable}-c.so $out/lib/ + ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} # other packages expect to find stuff according to libPrefix - ln -s $out/pypy3-c/include $out/include/${libPrefix} - ln -s $out/pypy3-c/lib-python/3 $out/lib/${libPrefix} + ln -s $out/${executable}/include $out/include/${libPrefix} + ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} # We must wrap the original, not the symlink. # PyPy uses argv[0] to find its standard library, and while it knows # how to follow symlinks, it doesn't know about wrappers. So, it # will think the wrapper is the original. As long as the wrapper has # the same path as the original, this is OK. - wrapProgram "$out/pypy3-c/pypy3-c" \ + wrapProgram "$out/${executable}-c/${executable}-c" \ --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" # verify cffi modules - $out/bin/pypy3 -c "import tkinter;import sqlite3;import curses;import lzma" + $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit zlibSupport libPrefix sitePackages; - executable = "pypy3"; - isPypy = true; - isPy3 = true; - isPy35 = true; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - interpreter = "${self}/bin/${executable}"; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - }; - + inherit passthru; enableParallelBuilding = true; # almost no parallelization without STM meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch similarity index 100% rename from pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch rename to pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34507b67b57..9b49b4f45e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7954,18 +7954,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37; - - pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { - self = pypy27; - python = python27.override{x11Support=true;}; - db = db.override { dbmSupport = true; }; - }; - pypy3 = callPackage ../development/interpreters/python/pypy/3 { - self = pypy3; - python = python27; - db = db.override { dbmSupport = true; }; - }; + inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy3; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); From f665828fa374580f4b2fd725761d23e18f55e526 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 2 Jan 2019 20:09:44 +0100 Subject: [PATCH 120/200] Python: improve cross-compilation This changeset allows for cross-compilation of Python packages. Packages built with buildPythonPackage are not allowed to refer to the build machine. Executables that have shebangs will refer to the host. --- .../python/build-python-package-common.nix | 5 ++-- .../build-python-package-setuptools.nix | 11 ++++--- .../python/build-python-package.nix | 5 ++-- .../python/cpython/2.7/default.nix | 3 ++ .../interpreters/python/cpython/default.nix | 29 ++++++++++++++----- .../interpreters/python/default.nix | 7 ++--- .../python/mk-python-derivation.nix | 7 +++-- .../interpreters/python/wrap-python.nix | 3 +- pkgs/development/interpreters/python/wrap.sh | 12 ++++++-- .../python-modules/cypari2/default.nix | 7 ++--- .../python-modules/pyyaml/default.nix | 4 ++- .../python-modules/setuptools/default.nix | 11 +++++-- pkgs/top-level/all-packages.nix | 3 +- pkgs/top-level/python-packages.nix | 2 -- 14 files changed, 68 insertions(+), 41 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 2b383fe985d..0f8e088d434 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -1,7 +1,6 @@ # This function provides generic bits to install a Python wheel. { python -, bootstrapped-pip }: { buildInputs ? [] @@ -10,7 +9,7 @@ , ... } @ attrs: attrs // { - buildInputs = buildInputs ++ [ bootstrapped-pip ]; + buildInputs = buildInputs ++ [ python.pythonForBuild.pkgs.bootstrapped-pip ]; configurePhase = attrs.configurePhase or '' runHook preConfigure @@ -24,7 +23,7 @@ attrs // { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" pushd dist - ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild popd runHook postInstall diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index bc512357acd..4c66fdec5f6 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -2,7 +2,6 @@ { lib , python -, bootstrapped-pip }: { @@ -26,13 +25,13 @@ in attrs // { buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup - ${python.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + ${python.pythonForBuild.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel runHook postBuild ''; installCheckPhase = attrs.checkPhase or '' runHook preCheck - ${python.interpreter} nix_run_setup test + ${python.pythonForBuild.interpreter} nix_run_setup test runHook postCheck ''; @@ -47,9 +46,9 @@ in attrs // { if test -e setup.py; then tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" - mkdir -p $tmp_path/${python.sitePackages} - ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 + export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.pythonForBuild.sitePackages} + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 fi ${postShellHook} ''; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 391086a662e..b664cf0b14f 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -10,17 +10,16 @@ , ensureNewerSourcesForZipFilesHook , toPythonModule , namePrefix -, bootstrapped-pip , flit , writeScript , update-python-libraries }: let - setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; + setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; - common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; + common = import ./build-python-package-common.nix { inherit python; }; mkPythonDerivation = import ./mk-python-derivation.nix { inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook; inherit toPythonModule namePrefix writeScript update-python-libraries; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 23b88b168b5..249c4ac9cf7 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -32,6 +32,9 @@ assert x11Support -> tcl != null with stdenv.lib; let + + pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + passthru = passthruFun rec { inherit self sourceVersion packageOverrides; implementation = "cpython"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0d1794f04fa..6e738a598dc 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -21,6 +21,7 @@ , sourceVersion , sha256 , passthruFun +, bash }: assert x11Support -> tcl != null @@ -46,7 +47,8 @@ let nativeBuildInputs = [ nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - buildPackages.stdenv.cc crossPython + buildPackages.stdenv.cc + pythonForBuild ]; buildInputs = filter (p: p != null) [ @@ -56,11 +58,11 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - crossPython = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; - pythonForBuild = if stdenv.hostPlatform == stdenv.buildPlatform then + pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else crossPython.interpreter; + else pythonForBuild.interpreter; in with passthru; stdenv.mkDerivation { pname = "python3"; @@ -215,14 +217,25 @@ in with passthru; stdenv.mkDerivation { # We rebuild three times, once for each optimization level # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. # This is automatically used when `SOURCE_DATE_EPOCH` is set. - find $out -name "*.py" | ${pythonForBuild} -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuild} -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuild} -OO -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + ''; + + preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Ensure patch-shebangs uses shebangs of host interpreter. + export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH ''; # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. - disallowedReferences = [ openssl.dev ]; + disallowedReferences = [ + openssl.dev + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Ensure we don't have references to build-time packages. + # These typically end up in shebangs. + pythonForBuild buildPackages.bash + ]; inherit passthru; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 877bf647d26..786ae76c1dd 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -21,7 +21,6 @@ with pkgs; overrides = packageOverrides; }; in rec { - sitePackages = "lib/${libPrefix}/site-packages"; isPy27 = pythonVersion == "2.7"; isPy33 = pythonVersion == "3.3"; # TODO: remove isPy34 = pythonVersion == "3.4"; # TODO: remove @@ -35,7 +34,7 @@ with pkgs; withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; interpreter = "${self}/bin/${executable}"; - inherit executable implementation libPrefix pythonVersion; + inherit executable implementation libPrefix pythonVersion sitePackages; inherit sourceVersion; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; @@ -112,8 +111,8 @@ in { inherit passthruFun; }; - pypy3 = callPackage ./pypy { - self = pypy3; + pypy35 = callPackage ./pypy { + self = pypy35; sourceVersion = { major = "6"; minor = "0"; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index b9a6835908f..7718bdfde5d 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -77,7 +77,7 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr buildInputs = [ wrapPython ] ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip - ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools +# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs ++ pythonPath; @@ -100,9 +100,12 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Check if we have two packages with the same name in the closure and fail. # If this happens, something went wrong with the dependencies specs. # Intentionally kept in a subdirectory, see catch_conflicts/README.md. - ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py + ${python.pythonForBuild.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 4ff0a62d7fb..6a19a215241 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -9,7 +9,8 @@ makeSetupHook { deps = makeWrapper; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; - substitutions.python = python; + substitutions.python = python.pythonForBuild; + substitutions.pythonHost = python; substitutions.magicalSedExpression = let # Looks weird? Of course, it's between single quoted shell strings. # NOTE: Order DOES matter here, so single character quotes need to be diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 6fa8c316a17..b2d65422db4 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -16,8 +16,8 @@ buildPythonPath() { declare -A pythonPathsSeen=() program_PYTHONPATH= program_PATH= - pythonPathsSeen["@python@"]=1 - addToSearchPath program_PATH @python@/bin + pythonPathsSeen["@pythonHost@"]=1 + addToSearchPath program_PATH @pythonHost@/bin for path in $pythonPath; do _addToPythonPath $path done @@ -53,7 +53,13 @@ wrapPythonProgramsIn() { # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Python to use besides one with this hook anyway. if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#!@executable@^" + fi + + if head -n1 "$f" | grep -q '#!.*'; then + # Cross-compilation hack: ensure shebangs are for the host + echo "Rewriting $(head -n 1 $f) to #!@pythonHost@" + sed -i "$f" -e "1 s^#!@python@^#!@pythonHost@^" fi # catch /python and /.python-wrapped diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index a77e98dae4c..09326ad1a0b 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -1,5 +1,4 @@ { stdenv -, bootstrapped-pip , buildPythonPackage , python , fetchPypi @@ -24,11 +23,11 @@ buildPythonPackage rec { # That is because while the default install phase succeeds to build the package, # it fails to generate the file "auto_paridecl.pxd". installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + mkdir -p "$out/lib/${python.sitePackages}" + export PYTHONPATH="$out/lib/${python.sitePackages}:$PYTHONPATH" # install "." instead of "*.whl" - ${bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . ''; buildInputs = [ diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index e66ca0df5b9..b4732e34c4e 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, libyaml }: +{ lib, buildPythonPackage, fetchPypi, libyaml, buildPackages }: buildPythonPackage rec { pname = "PyYAML"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; }; + nativeBuildInputs = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = [ libyaml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 09f848d456b..2663d6667e5 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -17,19 +17,24 @@ stdenv.mkDerivation rec { sha256 = "86bb4d8e1b0fabad1f4642b64c335b673e53e7a381de03c9a89fe678152c4c64"; }; - nativeBuildInputs = [ unzip wrapPython ]; - buildInputs = [ python ]; + nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; doCheck = false; # requires pytest installPhase = '' dst=$out/${python.sitePackages} mkdir -p $dst export PYTHONPATH="$dst:$PYTHONPATH" - ${python.interpreter} setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --prefix=$out wrapPythonPrograms ''; pythonPath = []; + dontPatchShebangs = true; + + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ python.pythonForBuild ]; + + meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = https://pypi.python.org/pypi/setuptools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b49b4f45e4..142173d4725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7937,6 +7937,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; + pypy3 = pypy35; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -7954,7 +7955,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy3; + inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0e45ea9ecd..d3aa62faadd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -43,7 +43,6 @@ let else ff; buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit namePrefix; @@ -51,7 +50,6 @@ let })); buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; namePrefix = ""; toPythonModule = x: x; # Application does not provide modules. From 0a2caa41fe0da9e5c36f47994594650f00e1d111 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Jan 2019 10:05:50 +0100 Subject: [PATCH 121/200] Python: drop `python.majorVersion` Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`. For implementation version, use `python.sourceVersion`. Some expressions were broken. Those that were identified were fixed. fixup major --- pkgs/applications/audio/ingen/default.nix | 2 +- pkgs/applications/misc/blender/default.nix | 10 +++++----- .../instant-messengers/profanity/default.nix | 2 +- pkgs/applications/science/misc/golly/beta.nix | 4 ++-- pkgs/applications/science/misc/golly/default.nix | 5 ++--- pkgs/development/interpreters/python/default.nix | 2 -- .../libraries/physics/geant4/g4py/default.nix | 2 +- pkgs/development/python-modules/tensorflow/bin.nix | 2 +- pkgs/tools/misc/calamares/default.nix | 4 ++-- pkgs/tools/networking/unbound/python.nix | 6 +++--- 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index e10a25b8917..1e249b51fb7 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { for program in ingenams ingenish do wrapProgram $out/bin/$program \ - --prefix PYTHONPATH : $out/lib/python${python.majorVersion}/site-packages:$PYTHONPATH + --prefix PYTHONPATH : $out/${python.sitePackages}:$PYTHONPATH done ''; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b9d4b83e4f1..340c08a958e 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { "-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_PLAYER=ON" "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=python${python.majorVersion}m" + "-DPYTHON_LIBRARY=${python.libPrefix}" "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" - "-DPYTHON_VERSION=${python.majorVersion}" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" + "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" ] @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { postInstall = optionalString enableNumpy '' wrapProgram $out/bin/blender \ - --prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages + --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 327b02b2352..cf852ada369 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; LDFLAGS = [ ] - ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ]; + ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ]; meta = { description = "A console based XMPP client"; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 83b9c5a04a1..6f11caf4d9a 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "golly-${version}"; + pname = "golly"; version = "2.8.99.2.20161122"; #src = fetchurl { # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + NIX_LDFLAGS="-l${python2.libPrefix} -lperl"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index cfa4dca4b0d..74fa4cc02ed 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { - baseName="golly"; + pname = "golly"; version = "3.2"; - name="${baseName}-${version}"; src = fetchurl { sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd"; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + NIX_LDFLAGS="-l${python2.libPrefix} -lperl"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 786ae76c1dd..b45dc55390c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -39,8 +39,6 @@ with pkgs; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit pythonForBuild; - - majorVersion = pythonVersion; # Backwards compatibility. Should be dropped. }; in { diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 551d61af3ad..f28f0fd6420 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Fix for boost 1.67+ substituteInPlace CMakeLists.txt \ - --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})" + --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})" for f in `find . -name CMakeLists.txt`; do substituteInPlace "$f" \ --replace "boost_python" "\''${Boost_LIBRARIES}" diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index b925b74e03b..90f8c9e6e30 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ in buildPythonPackage rec { format = "wheel"; src = let - pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.majorVersion}"; + pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.pythonVersion}"; pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index c799b08bd44..edc6a2e4643 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; cmakeFlags = [ - "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DCMAKE_VERBOSE_MAKEFILE=True" "-DCMAKE_BUILD_TYPE=Release" "-DWITH_PYTHONQT:BOOL=ON" diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 67e6f2e9c43..c20169d3913 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" ''; - preConfigure = "export PYTHON_VERSION=${python.majorVersion}"; + preConfigure = "export PYTHON_VERSION=${python.pythonVersion}"; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { # All we want is the Unbound Python module postInstall = '' - # Generate the built in root anchor and root key and store these in a logical place + # Generate the built in root anchor and root key and store these in a logical place # to be used by tools depending only on the Python module $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key # We don't need anything else rm -fR $out/bin $out/share $out/include $out/etc/unbound - patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so + patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so ''; meta = with stdenv.lib; { From d91b496eac0ff3ccd05d23d5a56199c826802d9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Jan 2019 12:00:44 +0100 Subject: [PATCH 122/200] pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly. --- .../interpreters/python/default.nix | 28 ++++ .../interpreters/python/pypy/prebuilt.nix | 123 ++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 pkgs/development/interpreters/python/pypy/prebuilt.nix diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b45dc55390c..bb5c3b3a97f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -123,4 +123,32 @@ in { inherit passthruFun; }; + pypy27_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy27_prebuilt; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + pythonVersion = "2.7"; + inherit passthruFun; + ncurses = ncurses5; + }; + + pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy35_prebuilt; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 + pythonVersion = "3.5"; + inherit passthruFun; + ncurses = ncurses5; + }; + }) \ No newline at end of file diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix new file mode 100644 index 00000000000..cf23a47e5db --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -0,0 +1,123 @@ +{ stdenv +, fetchurl +, python-setup-hook +, self +, which +# Dependencies +, bzip2 +, zlib +, openssl +, expat +, libffi +, ncurses +, tcl +, tk +# For the Python package set +, packageOverrides ? (self: super: {}) +, sourceVersion +, pythonVersion +, sha256 +, passthruFun +}: + +# This version of PyPy is primarily added to speed-up translation of +# our PyPy source build when developing that expression. + +with stdenv.lib; + +let + isPy3k = majorVersion == "3"; + passthru = passthruFun rec { + inherit self sourceVersion pythonVersion packageOverrides; + implementation = "pypy"; + libPrefix = "pypy${pythonVersion}"; + executable = "pypy${if isPy3k then "3" else ""}"; + pythonForBuild = self; # Not possible to cross-compile with. + sitePackages = "site-packages"; + }; + pname = "${passthru.executable}_prebuilt"; + version = with sourceVersion; "${major}.${minor}.${patch}"; + + majorVersion = substring 0 1 pythonVersion; + + setupHook = python-setup-hook sitePackages; + + deps = [ + bzip2 + zlib + openssl + expat + libffi + ncurses + tcl + tk + ]; + +in with passthru; stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + inherit sha256; + }; + + buildInputs = [ which ]; + + installPhase = '' + mkdir -p $out/lib + echo "Moving files to $out" + mv -t $out bin include lib-python lib_pypy site-packages + + mv $out/bin/libpypy*-c.so $out/lib/ + + rm $out/bin/*.debug + + echo "Patching binaries" + interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) + patchelf --set-interpreter $interpreter \ + --set-rpath $out/lib \ + $out/bin/pypy* + + pushd $out + find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \; + + echo "Removing bytecode" + find . -name "__pycache__" -type d -depth -exec rm -rf {} \; + popd + ''; + + doInstallCheck = true; + + # Check whether importing of (extension) modules functions + installCheckPhase = let + modules = [ + "ssl" + "sys" + "curses" + ] ++ optionals (!isPy3k) [ + "Tkinter" + ] ++ optionals isPy3k [ + "tkinter" + ]; + imports = concatMapStringsSep "; " (x: "import ${x}") modules; + in '' + echo "Testing whether we can import modules" + $out/bin/${executable} -c '${imports}' + ''; + + setupHook = python-setup-hook sitePackages; + + donPatchElf = true; + dontStrip = true; + + inherit passthru; + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (3.5.3)"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + +} \ No newline at end of file From 63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 4 Jan 2019 12:31:42 +0100 Subject: [PATCH 123/200] python: add isPy2 attribute to passthru Some packages relied on it. For consistency, also introduce isPy3 (which is the same as isPy3k). --- pkgs/development/interpreters/python/default.nix | 4 +++- pkgs/development/python-modules/matplotlib/2.nix | 2 +- pkgs/servers/uwsgi/default.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index bb5c3b3a97f..f1461d784be 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -27,7 +27,9 @@ with pkgs; isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; - isPy3k = lib.strings.substring 0 1 pythonVersion == "3"; + isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; + isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; + isPy3k = isPy3; isPyPy = interpreter == "pypy"; buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index dec34c64f0a..129b864a241 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt4 ] - ++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ]; + ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; patches = [ ./basedirlist.patch ] ++ diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 074b19724d2..91053019ac1 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -7,7 +7,7 @@ , ruby, php-embed, mysql }: -let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { +let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { interpreter = pkg.interpreter; path = "plugins/python"; inputs = [ pkg ncurses ]; From 473624ea41a995bc2e0f58cdeb9cbb14d8fb078f Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 30 Dec 2018 20:23:39 +0100 Subject: [PATCH 124/200] xorg: move sources into single file tarballs.list --- pkgs/servers/x11/xorg/extra.list | 11 - .../x11/xorg/generate-expr-from-tarballs.pl | 12 +- pkgs/servers/x11/xorg/old.list | 15 - .../xorg/{tarballs-7.7.list => tarballs.list} | 303 ++++++++++-------- 4 files changed, 168 insertions(+), 173 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/extra.list delete mode 100644 pkgs/servers/x11/xorg/old.list rename pkgs/servers/x11/xorg/{tarballs-7.7.list => tarballs.list} (89%) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list deleted file mode 100644 index 107d5ce18b8..00000000000 --- a/pkgs/servers/x11/xorg/extra.list +++ /dev/null @@ -1,11 +0,0 @@ -http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 -mirror://xorg/individual/app/appres-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index aba45a21534..754075e4f06 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -1,13 +1,9 @@ #! /usr/bin/env perl -# Typical command to generate the list of tarballs: - -# export i="mirror://xorg/X11R7.7/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.7.list -# manually update extra.list -# then run: cat tarballs-7.7.list extra.list old.list | perl ./generate-expr-from-tarballs.pl -# tarballs-x.y.list is generated + changes for individual packages -# extra.list are packages not contained in the tarballs -# old.list are packages that used to be part of the tarballs +# Usage: +# +# manually update tarballs.list +# then run: cat tarballs.list | perl ./generate-expr-from-tarballs.pl use strict; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list deleted file mode 100644 index fdd5a837d8b..00000000000 --- a/pkgs/servers/x11/xorg/old.list +++ /dev/null @@ -1,15 +0,0 @@ -mirror://xorg/individual/app/twm-1.0.8.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 -mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 -mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 -mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 -mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 -mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 -mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 -mirror://xorg/individual/util/imake-1.0.7.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs.list similarity index 89% rename from pkgs/servers/x11/xorg/tarballs-7.7.list rename to pkgs/servers/x11/xorg/tarballs.list index 30b553b93db..90639551406 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,13 +1,172 @@ -mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 +mirror://xorg/individual/app/appres-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 +mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 +mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 +mirror://xorg/individual/app/twm-1.0.9.tar.bz2 +mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 +mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 +mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 +mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 +mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 +mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2 +mirror://xorg/individual/app/xev-1.2.2.tar.bz2 +mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 +mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 +mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 +mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 +mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 +mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 +mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 +mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 +mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 +mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 +mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 +mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 +mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 +mirror://xorg/individual/app/xset-1.2.3.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 +mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 +mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 +mirror://xorg/individual/font/font-util-1.3.1.tar.bz2 +mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 +mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 +mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 +mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 +mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 +mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 +mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 +mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 +mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 +mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 +mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 +mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 +mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 +mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 +mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 +mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 +mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 +mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 +mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 +mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2 +mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 +mirror://xorg/individual/proto/presentproto-1.1.tar.bz2 +mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 +mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2 +mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 +mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 +mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2 +mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 +mirror://xorg/individual/util/imake-1.0.7.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 +mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 +mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 -mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 -mirror://xorg/individual/proto/presentproto-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -42,164 +201,30 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-util-1.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 -mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 -mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2 -mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 -mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 -mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 -mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 -mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 -mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 -mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 -mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 -mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 -mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 -mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 -mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 -mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 -mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 -mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 -mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 -mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 -mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 -mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 -mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 -mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 -mirror://xorg/individual/app/twm-1.0.9.tar.bz2 -mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 -mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 -mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 -mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 -mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 -mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 -mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2 -mirror://xorg/individual/app/xev-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 -mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 -mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 -mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 -mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 -mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 -mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 -mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2 -mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 -mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 -mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 -mirror://xorg/individual/app/xset-1.2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 -mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 -mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 -mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 From 167e609faae5825a77b6d9cb59f3046a1c8dae5d Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 30 Dec 2018 20:27:42 +0100 Subject: [PATCH 125/200] xorg: use https for sources without mirrors --- pkgs/servers/x11/xorg/default.nix | 18 +++++++++--------- pkgs/servers/x11/xorg/tarballs.list | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1f953e89ec8..e181179a87d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1239,7 +1239,7 @@ lib.makeScope newScope (self: with self; { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + url = https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1252,7 +1252,7 @@ lib.makeScope newScope (self: with self; { name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + url = https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1590,7 +1590,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1603,7 +1603,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1629,7 +1629,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1642,7 +1642,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1655,7 +1655,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1668,7 +1668,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1681,7 +1681,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 90639551406..8c2254db891 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,13 +1,13 @@ +https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 +https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 -http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz From d848495a9f1ed0d956cfcda5f6c0e2b9cea48057 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 30 Dec 2018 20:33:15 +0100 Subject: [PATCH 126/200] xorg: update mirrors to https and remove an outdated one --- pkgs/build-support/fetchurl/mirrors.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 6ee9ceb5286..eccfe1964ac 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -257,9 +257,8 @@ rec { # X.org. xorg = [ - http://xorg.freedesktop.org/releases/ - http://ftp.gwdg.de/pub/x11/x.org/pub/ - http://ftp.x.org/pub/ # often incomplete (e.g. files missing from X.org 7.4) + https://xorg.freedesktop.org/releases/ + https://ftp.x.org/archive/ ]; # Apache mirrors (see http://www.apache.org/mirrors/). From c3db044b54a1d46d51633c180569d9393e1cd2fd Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 30 Dec 2018 21:02:05 +0100 Subject: [PATCH 127/200] xorg: replace *proto with xorgproto --- pkgs/servers/x11/xorg/default.nix | 935 +++++++++------------------- pkgs/servers/x11/xorg/tarballs.list | 31 +- 2 files changed, 280 insertions(+), 686 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e181179a87d..d192c75049f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,20 +5,7 @@ lib.makeScope newScope (self: with self; { inherit pixman; - applewmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "applewmproto-1.4.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; - sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -27,7 +14,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto libXt ]; + buildInputs = [ libX11 xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -44,20 +31,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - bigreqsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "bigreqsproto-1.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; - sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -66,72 +40,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - compositeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "compositeproto-0.4.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; - sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - damageproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "damageproto-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; - sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - dmxproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "dmxproto-2.3.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; - sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - dri2proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "dri2proto-2.8"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; - sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - dri3proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "dri3proto-1.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; - sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -148,19 +57,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fixesproto = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto }: stdenv.mkDerivation { - name = "fixesproto-5.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; - sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xextproto ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; @@ -608,19 +504,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "fontsproto-2.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; - sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; @@ -689,20 +572,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - glproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "glproto-1.4.17"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; - sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -711,11 +581,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libICE xproto ]; + buildInputs = [ libICE xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - imake = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -724,37 +594,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - inputproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "inputproto-2.3.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; - sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - kbproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "kbproto-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; - sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -763,11 +607,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ applewmproto libX11 libXext xextproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libFS = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, xproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -776,11 +620,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto xproto xtrans ]; + buildInputs = [ xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -789,11 +633,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto xtrans ]; + buildInputs = [ xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -802,11 +646,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libICE libuuid xproto xtrans ]; + buildInputs = [ libICE libuuid xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -815,11 +659,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ windowswmproto libX11 libXext xextproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { name = "libX11-1.6.7"; builder = ./builder.sh; src = fetchurl { @@ -828,11 +672,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; + buildInputs = [ xorgproto libxcb xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -841,11 +685,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -854,11 +698,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { @@ -867,11 +711,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; + buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXcomposite-0.4.4"; builder = ./builder.sh; src = fetchurl { @@ -880,11 +724,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ compositeproto libX11 libXfixes xproto ]; + buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.1.15"; builder = ./builder.sh; src = fetchurl { @@ -893,11 +737,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; + buildInputs = [ xorgproto libX11 libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXdamage-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -906,11 +750,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; + buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -919,11 +763,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { @@ -932,11 +776,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xextproto xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { @@ -945,11 +789,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fixesproto libX11 xextproto xproto ]; + buildInputs = [ xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { @@ -958,11 +802,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.3"; builder = ./builder.sh; src = fetchurl { @@ -971,11 +815,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.2"; builder = ./builder.sh; src = fetchurl { @@ -984,11 +828,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; + buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXi = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { name = "libXi-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -997,11 +841,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; + buildInputs = [ xorgproto libX11 libXext libXfixes ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1010,11 +854,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xineramaproto ]; + buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1023,11 +867,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xproto libXt ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXp = callPackage ({ stdenv, pkgconfig, fetchurl, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1036,11 +880,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ printproto libX11 libXau libXext xextproto ]; + buildInputs = [ xorgproto libX11 libXau libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { @@ -1049,11 +893,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xproto libXt ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -1062,11 +906,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ presentproto libX11 xextproto xproto ]; + buildInputs = [ xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { @@ -1075,11 +919,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; + buildInputs = [ xorgproto libX11 libXext libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, renderproto, libX11, xproto }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { @@ -1088,11 +932,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ renderproto libX11 xproto ]; + buildInputs = [ xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXres = callPackage ({ stdenv, pkgconfig, fetchurl, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1101,11 +945,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { name = "libXt-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1114,11 +958,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libICE kbproto libSM libX11 xproto ]; + buildInputs = [ libICE xorgproto libSM libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1127,11 +971,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; + buildInputs = [ xorgproto libX11 libXext libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXv = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { @@ -1140,11 +984,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ videoproto libX11 libXext xextproto xproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1153,11 +997,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; + buildInputs = [ xorgproto libX11 libXext libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1166,11 +1010,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; + buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1179,11 +1023,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; + buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1192,11 +1036,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; + buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1205,11 +1049,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dmxproto libX11 libXext xextproto ]; + buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1218,7 +1062,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto zlib ]; + buildInputs = [ xorgproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1261,7 +1105,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, kbproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1270,11 +1114,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ kbproto libX11 ]; + buildInputs = [ xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { @@ -1283,11 +1127,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1296,7 +1140,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1313,7 +1157,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "makedepend-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1322,7 +1166,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1339,7 +1183,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1348,102 +1192,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libfontenc freetype xproto zlib ]; + buildInputs = [ libfontenc freetype xorgproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - presentproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "presentproto-1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; - sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - printproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXau }: stdenv.mkDerivation { - name = "printproto-1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; - sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXau ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - randrproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "randrproto-1.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; - sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - recordproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "recordproto-1.14.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; - sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - renderproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "renderproto-0.11.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; - sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - resourceproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "resourceproto-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; - sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - scrnsaverproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "scrnsaverproto-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; - sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { @@ -1452,7 +1205,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xproto ]; + buildInputs = [ xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1482,7 +1235,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1491,7 +1244,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1508,33 +1261,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - videoproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "videoproto-2.3.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; - sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - windowswmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "windowswmproto-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; - sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.0"; builder = ./builder.sh; src = fetchurl { @@ -1543,11 +1270,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; + buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { name = "xauth-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1556,7 +1283,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXau libXext libXmu xproto ]; + buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1599,7 +1326,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1608,11 +1335,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xproto ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1621,11 +1348,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1634,11 +1361,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbproto xproto ]; + buildInputs = [ gperf m4 libxcb xcbproto xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xorgproto }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1647,11 +1374,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutil xproto ]; + buildInputs = [ gperf m4 libxcb xcbutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1660,11 +1387,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xproto ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1673,11 +1400,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xproto ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1686,11 +1413,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xproto ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1699,20 +1426,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xcmiscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xcmiscproto-1.2.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; - sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1781,7 +1495,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1790,11 +1504,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, glproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1803,11 +1517,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glproto libX11 ]; + buildInputs = [ xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1816,24 +1530,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto libXrandr ]; + buildInputs = [ libX11 xorgproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xextproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xextproto-7.3.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; - sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1842,50 +1543,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu xproto libXrender libXt ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86bigfontproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xf86bigfontproto-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; - sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xf86dgaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xf86dgaproto-2.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; - sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xf86driproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xf86driproto-2.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; - sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { @@ -1894,11 +1556,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto udev xorgserver xproto ]; + buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -1907,11 +1569,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto kbproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1920,11 +1582,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.28.0"; builder = ./builder.sh; src = fetchurl { @@ -1933,11 +1595,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { @@ -1946,11 +1608,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1959,11 +1621,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; + buildInputs = [ xorgproto libX11 libXi xorgserver libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1972,11 +1634,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto udev randrproto xorgserver xproto ]; + buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1985,24 +1647,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgserver xproto ]; + buildInputs = [ xorgserver xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86miscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xf86miscproto-0.9.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; - sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2011,11 +1660,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto mesa_noglu libGL libdrm udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { @@ -2024,11 +1673,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2037,11 +1686,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-18.0.1"; builder = ./builder.sh; src = fetchurl { @@ -2050,11 +1699,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { @@ -2063,11 +1712,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { @@ -2076,11 +1725,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2089,11 +1738,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { @@ -2102,11 +1751,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.17"; builder = ./builder.sh; src = fetchurl { @@ -2115,11 +1764,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2128,11 +1777,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xextproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -2141,11 +1790,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ libpciaccess xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; src = fetchurl { @@ -2154,11 +1803,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { @@ -2167,11 +1816,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -2180,11 +1829,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + buildInputs = [ xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.5"; builder = ./builder.sh; src = fetchurl { @@ -2193,11 +1842,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { @@ -2206,11 +1855,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -2219,11 +1868,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2232,11 +1881,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { @@ -2245,11 +1894,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { @@ -2258,11 +1907,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { @@ -2271,11 +1920,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2284,11 +1933,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { @@ -2297,11 +1946,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.6"; builder = ./builder.sh; src = fetchurl { @@ -2310,11 +1959,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.10.7"; builder = ./builder.sh; src = fetchurl { @@ -2323,11 +1972,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { @@ -2336,11 +1985,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -2349,11 +1998,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { @@ -2362,11 +2011,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { @@ -2375,11 +2024,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2388,11 +2037,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2401,11 +2050,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2414,11 +2063,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { @@ -2427,11 +2076,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2440,11 +2089,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2453,11 +2102,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2466,11 +2115,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ randrproto videoproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -2479,11 +2128,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2492,11 +2141,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { @@ -2505,11 +2154,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2518,11 +2167,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2531,11 +2180,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgserver xproto ]; + buildInputs = [ xorgserver xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -2544,24 +2193,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86vidmodeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xf86vidmodeproto-2.3.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; - sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xorgproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2570,11 +2206,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXfont xproto xtrans ]; + buildInputs = [ libXfont xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2583,7 +2219,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto libXxf86vm ]; + buildInputs = [ libX11 xorgproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2600,7 +2236,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { name = "xhost-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2609,24 +2245,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXau libXmu xproto ]; + buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xineramaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xineramaproto-1.2.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; - sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xinit-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2635,11 +2258,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.2"; builder = ./builder.sh; src = fetchurl { @@ -2648,11 +2271,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; + buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { @@ -2661,7 +2284,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libxkbfile xproto ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2678,7 +2301,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2687,11 +2310,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libxkbfile xproto ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2700,11 +2323,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto libX11 libXaw xproto libXt ]; + buildInputs = [ xorgproto libX11 libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xkeyboard-config-2.24"; builder = ./builder.sh; src = fetchurl { @@ -2713,11 +2336,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xkill-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2726,7 +2349,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXmu xproto ]; + buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2756,7 +2379,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2765,7 +2388,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2795,7 +2418,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xmodmap-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -2804,7 +2427,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2834,6 +2457,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { + name = "xorgproto-2018.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2; + sha256 = "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.19.6"; builder = ./builder.sh; @@ -2860,7 +2496,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2869,11 +2505,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXmu xproto ]; + buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xprop-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2882,24 +2518,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xproto-7.0.31"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; - sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - - xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2908,11 +2531,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto libXrandr libXrender ]; + buildInputs = [ libX11 xorgproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xrdb-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -2921,11 +2544,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXmu xproto ]; + buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xrefresh-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2934,11 +2557,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -2947,7 +2570,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2977,7 +2600,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2986,11 +2609,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto libXv ]; + buildInputs = [ libX11 xorgproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2999,11 +2622,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { name = "xwininfo-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -3012,11 +2635,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libxcb xproto ]; + buildInputs = [ libX11 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -3025,7 +2648,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8c2254db891..0782efdfad2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -142,19 +142,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 -mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 -mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 -mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 -mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2 -mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 -mirror://xorg/individual/proto/presentproto-1.1.tar.bz2 -mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 -mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2 -mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 -mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 -mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2 +mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.7.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 @@ -162,13 +150,7 @@ mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 -mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 @@ -209,21 +191,10 @@ mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 From 51d6b1bdece85e0d136e91b7cead120240698a8c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 02:37:38 +0100 Subject: [PATCH 128/200] xorg: adjust overrides to xorgproto --- pkgs/servers/x11/xorg/overrides.nix | 57 ++++++++++++----------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f7f401c148f..9a3a3f1a1d5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -20,7 +20,7 @@ in self: super: { bdftopcf = super.bdftopcf.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ]; + buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; }); bitmap = super.bitmap.overrideAttrs (attrs: { @@ -103,6 +103,7 @@ self: super: rm -rf $out/share/doc ''; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; + propagatedBuildInputs = [ self.xorgproto ]; }); libAppleWM = super.libAppleWM.overrideAttrs (attrs: { @@ -114,6 +115,7 @@ self: super: libXau = super.libXau.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ self.xorgproto ]; }); libXdmcp = super.libXdmcp.overrideAttrs (attrs: { @@ -156,10 +158,6 @@ self: super: configureFlags = [ "--disable-selective-werror" ]; }); - compositeproto = super.compositeproto.overrideAttrs (attrs: { - propagatedBuildInputs = [ self.fixesproto ]; - }); - libICE = super.libICE.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; }); @@ -198,7 +196,7 @@ self: super: libXext = super.libXext.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; - propagatedBuildInputs = [ self.xproto self.libXau ]; + propagatedBuildInputs = [ self.xorgproto self.libXau ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); @@ -239,7 +237,7 @@ self: super: outputs = [ "out" "dev" "doc" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = [ self.renderproto ]; + propagatedBuildInputs = [ self.xorgproto ]; }); libXres = super.libXres.overrideAttrs (attrs: { @@ -256,7 +254,7 @@ self: super: outputs = [ "out" "dev" "doc" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - buildInputs = attrs.buildInputs ++ [self.renderproto]; + buildInputs = attrs.buildInputs ++ [self.xorgproto]; }); libXp = super.libXp.overrideAttrs (attrs: { @@ -447,12 +445,23 @@ self: super: meta = attrs.meta // { license = lib.licenses.mit; }; }); + xorgproto = super.xorgproto.overrideAttrs (attrs: { + buildInputs = []; + }); + xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed: # exchange attrs if abiCompat is set let version = (builtins.parseDrvName attrs_passed.name).version; attrs = - if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed + if (abiCompat == null || lib.hasPrefix abiCompat version) then + attrs_passed // { + buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; patchPhase = '' + for i in dri3/*.c + do + sed -i -e "s|#include |#include |" $i + done + '';} else if (abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; @@ -461,7 +470,7 @@ self: super: sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else if (abiCompat == "1.18") then { name = "xorg-server-1.18.4"; @@ -471,7 +480,7 @@ self: super: sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ] + buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ # Needed for NSDefaultRunLoopMode symbols. cf-private @@ -486,14 +495,8 @@ self: super: commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ zlib libGL libGLU dbus - xf86bigfontproto glproto xf86driproto - compositeproto scrnsaverproto resourceproto - xf86dgaproto - dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont libxshmfence libunwind - damageproto xcmiscproto bigreqsproto - inputproto xextproto randrproto renderproto presentproto - dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + xorgproto + libXext pixman libXfont libxshmfence libunwind libXfont2 ]; # XQuartz requires two compilations: the first to get X / XQuartz, @@ -550,7 +553,7 @@ self: super: Xplugin Carbon Cocoa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ - libAppleWM applewmproto + libAppleWM xorgproto ]; # XQuartz patchset @@ -635,7 +638,7 @@ self: super: "--with-launchagents-dir=\${out}/LaunchAgents" ]; propagatedBuildInputs = [ self.xauth ] - ++ lib.optionals isDarwin [ self.libX11 self.xproto ]; + ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; prePatch = '' sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp ''; @@ -683,18 +686,6 @@ self: super: buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile]; }); - kbproto = super.kbproto.overrideAttrs (attrs: { - outputs = [ "out" "doc" ]; - }); - - xextproto = super.xextproto.overrideAttrs (attrs: { - outputs = [ "out" "doc" ]; - }); - - xproto = super.xproto.overrideAttrs (attrs: { - outputs = [ "out" "doc" ]; - }); - xrdb = super.xrdb.overrideAttrs (attrs: { configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; }); From f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 04:40:47 +0100 Subject: [PATCH 129/200] treewide/xorg: replace *proto with xorgproto --- pkgs/applications/audio/bristol/default.nix | 2 +- .../audio/gxplugins-lv2/default.nix | 4 ++-- pkgs/applications/audio/mid2key/default.nix | 4 ++-- .../graphics/cinepaint/default.nix | 4 ++-- pkgs/applications/graphics/xaos/default.nix | 6 ++--- .../applications/graphics/xournal/default.nix | 4 ++-- pkgs/applications/misc/dunst/default.nix | 4 ++-- pkgs/applications/misc/evilvte/default.nix | 2 +- pkgs/applications/misc/keepassx/default.nix | 4 ++-- pkgs/applications/misc/mrxvt/default.nix | 4 ++-- pkgs/applications/misc/pwsafe/default.nix | 4 ++-- pkgs/applications/misc/xkbd/default.nix | 6 ++--- pkgs/applications/misc/xterm/default.nix | 2 +- .../networking/browsers/firefox/common.nix | 4 ++-- .../mozilla-plugins/mozplugger/default.nix | 4 ++-- .../networking/browsers/palemoon/default.nix | 2 +- .../instant-messengers/ekiga/default.nix | 12 +++++----- .../instant-messengers/psi/default.nix | 8 +++---- .../instant-messengers/vacuum/default.nix | 4 ++-- .../mailreaders/thunderbird/default.nix | 4 ++-- .../science/electronics/alliance/default.nix | 4 ++-- .../science/electronics/tkgate/1.x.nix | 4 ++-- pkgs/applications/video/cinelerra/default.nix | 4 ++-- pkgs/applications/video/kodi/default.nix | 12 +++++----- pkgs/applications/video/xawtv/default.nix | 8 +++---- pkgs/applications/video/xine-ui/default.nix | 2 +- .../virtualization/virtualbox/default.nix | 4 ++-- .../window-managers/evilwm/default.nix | 4 ++-- .../window-managers/fluxbox/default.nix | 4 ++-- .../window-managers/i3/easyfocus.nix | 4 ++-- .../window-managers/i3/i3ipc-glib.nix | 4 ++-- .../window-managers/jwm/default.nix | 6 ++--- .../window-managers/oroborus/default.nix | 4 ++-- .../window-managers/ratpoison/default.nix | 4 ++-- .../window-managers/stalonetray/default.nix | 4 ++-- .../window-managers/tabbed/default.nix | 4 ++-- pkgs/data/misc/xorg-rgb/default.nix | 4 ++-- pkgs/desktops/enlightenment/efl.nix | 2 +- .../panel-plugins/xfce4-clipman-plugin.nix | 4 ++-- .../panel-plugins/xfce4-cpugraph-plugin.nix | 4 ++-- pkgs/development/compilers/fpc/lazarus.nix | 6 ++--- .../development/compilers/gcc/4.8/default.nix | 6 ++--- .../development/compilers/gcc/4.9/default.nix | 6 ++--- pkgs/development/compilers/gcc/5/default.nix | 6 ++--- pkgs/development/compilers/gcc/6/default.nix | 6 ++--- pkgs/development/compilers/gcl/2.6.13-pre.nix | 8 +++---- pkgs/development/compilers/gcl/default.nix | 8 +++---- .../compilers/ocaml/ber-metaocaml.nix | 4 ++-- pkgs/development/compilers/ocaml/generic.nix | 6 ++--- .../interpreters/clisp/default.nix | 6 ++--- pkgs/development/interpreters/clisp/hg.nix | 6 ++--- .../development/interpreters/lush/default.nix | 4 ++-- .../interpreters/python/cpython/default.nix | 6 ++--- pkgs/development/libraries/SDL2/default.nix | 4 ++-- pkgs/development/libraries/allegro/5.nix | 16 ++++++------- .../development/libraries/allegro/default.nix | 10 ++++---- pkgs/development/libraries/box2d/default.nix | 4 ++-- .../libraries/chipmunk/default.nix | 6 ++--- .../libraries/directfb/default.nix | 4 ++-- pkgs/development/libraries/dssi/default.nix | 4 ++-- pkgs/development/libraries/fltk/1.4.nix | 4 ++-- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/imlib/default.nix | 4 ++-- .../libraries/libclxclient/default.nix | 4 ++-- .../libraries/libfakekey/default.nix | 4 ++-- .../libraries/libglvnd/default.nix | 4 ++-- .../libraries/libvdpau/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 3 +-- pkgs/development/libraries/ogre/1.9.x.nix | 16 ++++++------- pkgs/development/libraries/ogre/default.nix | 16 ++++++------- pkgs/development/libraries/ois/default.nix | 6 ++--- pkgs/development/libraries/qt-3/default.nix | 9 ++++--- .../development/libraries/simgear/default.nix | 6 ++--- pkgs/development/libraries/vtk/default.nix | 4 ++-- .../libraries/wxwidgets/2.8/default.nix | 4 ++-- .../libraries/wxwidgets/2.9/default.nix | 4 ++-- .../libraries/wxwidgets/3.0/default.nix | 4 ++-- .../python-modules/virtkey/default.nix | 4 ++-- .../tools/misc/intel-gpu-tools/default.nix | 4 ++-- pkgs/games/0ad/game.nix | 6 ++--- pkgs/games/construo/default.nix | 4 ++-- pkgs/games/extremetuxracer/default.nix | 12 +++++----- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/games/fsg/default.nix | 4 ++-- pkgs/games/lincity/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 4 ++-- pkgs/games/liquidwar/default.nix | 4 ++-- pkgs/games/openlierox/default.nix | 4 ++-- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/stardust/default.nix | 8 +++---- pkgs/games/torcs/default.nix | 4 ++-- pkgs/games/warmux/default.nix | 4 ++-- pkgs/games/xboard/default.nix | 4 ++-- pkgs/games/xconq/default.nix | 4 ++-- pkgs/games/xsokoban/default.nix | 4 ++-- pkgs/misc/screensavers/slock/default.nix | 4 ++-- pkgs/misc/screensavers/xautolock/default.nix | 4 ++-- pkgs/misc/xosd/default.nix | 4 ++-- pkgs/os-specific/linux/ati-drivers/builder.sh | 2 +- .../os-specific/linux/ati-drivers/default.nix | 6 ++--- pkgs/os-specific/linux/directvnc/default.nix | 4 ++-- pkgs/os-specific/linux/seturgent/default.nix | 4 ++-- .../linux/xf86-input-mtrack/default.nix | 6 ++--- .../linux/xf86-input-multitouch/default.nix | 11 ++------- .../linux/xf86-input-wacom/default.nix | 8 +++---- .../linux/xf86-video-nested/default.nix | 8 +++---- pkgs/servers/nas/default.nix | 4 ++-- pkgs/servers/x11/quartz-wm/default.nix | 2 +- pkgs/servers/x11/xorg/default.nix | 24 +++++++++---------- .../x11/xorg/generate-expr-from-tarballs.pl | 8 +++---- pkgs/tools/X11/hsetroot/default.nix | 4 ++-- pkgs/tools/X11/keynav/default.nix | 4 ++-- pkgs/tools/X11/ksuperkey/default.nix | 4 ++-- pkgs/tools/X11/ratmen/default.nix | 4 ++-- pkgs/tools/X11/skippy-xd/default.nix | 6 ++--- pkgs/tools/X11/x11vnc/default.nix | 10 ++++---- pkgs/tools/X11/x2vnc/default.nix | 5 ++-- pkgs/tools/X11/xcape/default.nix | 4 ++-- pkgs/tools/X11/xdotool/default.nix | 4 ++-- pkgs/tools/X11/xinput_calibrator/default.nix | 4 ++-- pkgs/tools/X11/xmacro/default.nix | 4 ++-- pkgs/tools/X11/xmagnify/default.nix | 4 ++-- pkgs/tools/X11/xnee/default.nix | 8 +++---- pkgs/tools/X11/xpra/default.nix | 11 ++++----- .../tools/X11/xpra/xf86videodummy/default.nix | 4 ++-- pkgs/tools/X11/xvkbd/default.nix | 4 ++-- pkgs/tools/admin/tigervnc/default.nix | 12 ++++------ pkgs/tools/graphics/gifsicle/default.nix | 4 ++-- pkgs/tools/misc/xdaliclock/default.nix | 4 ++-- pkgs/tools/system/plan9port/builder.sh | 4 ++-- pkgs/tools/system/plan9port/default.nix | 9 +++---- pkgs/tools/video/vncrec/default.nix | 8 +++---- pkgs/top-level/all-packages.nix | 3 +-- 133 files changed, 348 insertions(+), 367 deletions(-) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 42e99fa5186..e1ed12b9bd2 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext - xorg.xproto + xorg.xorgproto ]; patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index e7e4744eea2..62f11cbfb74 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }: +{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xorg.libX11 xproto cairo lv2 + xorg.libX11 xorgproto cairo lv2 ]; installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 26ea2c7b0b2..3c5660724d3 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }: +{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { name = "mid2key-r1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvzf $src"; - buildInputs = [ alsaLib libX11 libXi libXtst xextproto ]; + buildInputs = [ alsaLib libX11 libXi libXtst xorgproto ]; buildPhase = "make"; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 9c736f5ffb5..ac05e7a3631 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11, pythonPackages, gettext, intltool, babl, gegl, - glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, + glib, makedepend, xorgproto, libXmu, openexr, libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib libX11 python pygtk gettext intltool babl - gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined + gegl glib makedepend xorgproto libXmu openexr libGLU_combined libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index a6f97bb5334..182f68f3112 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext -, xextproto, libXt, zlib, gettext, intltool, perl }: +{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext +, libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { name = "xaos-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ - aalib gsl libpng libX11 xproto libXext xextproto + aalib gsl libpng libX11 xorgproto libXext libXt zlib gettext intltool perl ]; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index cfad449fb02..cd9d068b8ac 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui -, pango, libX11, xproto, zlib, poppler +, pango, libX11, xorgproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: let @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas - pango libX11 xproto zlib poppler + pango libX11 xorgproto zlib poppler ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libgnomeprint libgnomeprintui ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 12f1f78acb9..b28e7673992 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false +, libXinerama, libnotify, libxdg_basedir, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver - libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr + libXinerama libnotify libxdg_basedir pango xorgproto librsvg libXrandr ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index b72fcde4a9e..f088016938a 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11 - xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig + xorg.xorgproto xorg.libXext makeWrapper pkgconfig ]; buildPhase = '' diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index ed706b138cc..89ceca8a4f1 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xextproto, libXtst }: +{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { name = "keepassx-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./random.patch ]; - buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ]; + buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ]; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index 3f7ce3cc5d5..a6efb19b577 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE +{ stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE , freetype, pkgconfig, which }: stdenv.mkDerivation { name = "mrxvt-0.5.4"; buildInputs = - [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ]; + [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index a0b702fa145..25b3a6b4e7a 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto +, wxGTK31, libXi, libXt, libXtst, xercesc, xorgproto , qrencode, libuuid, libyubikey, yubikey-personalization }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig zip ]; buildInputs = [ gettext perl qrencode libuuid - libXi libXt libXtst wxGTK31 xercesc xextproto + libXi libXt libXtst wxGTK31 xercesc xorgproto libyubikey yubikey-personalization ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index ccbb88bd1a8..3023e830dc7 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto -, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook +{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xorgproto +, xinput, libXi, libXext, libXtst, libXpm, libX11, autoreconfHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libXrender libXft libXext libXtst libXpm libX11 - libXi xextproto xinput xproto + libXi xorgproto xinput ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index e29bdd46e26..45f356b2e1f 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE + [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8f135614f4d..b3719e841e5 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU_combined - xorg.libXScrnSaver xorg.scrnsaverproto - xorg.libXext xorg.xextproto sqlite unzip makeWrapper + xorg.libXScrnSaver xorg.xorgproto + xorg.libXext sqlite unzip makeWrapper libevent libstartup_notification libvpx /* cairo */ icu libpng jemalloc glib ] diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index a226cb6fa3b..c6c1d6a334c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, firefox, libX11, xproto }: +{ stdenv, fetchurl, firefox, libX11, xorgproto }: stdenv.mkDerivation rec { name = "mozplugger-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19"; }; - buildInputs = [ firefox libX11 xproto ]; + buildInputs = [ firefox libX11 xorgproto ]; installPhase = '' mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7" diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index fcc653e08f4..0d863ae9131 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libpulseaudio sqlite unzip which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver - libXt pixman scrnsaverproto xextproto + libXt pixman xorgproto ]); enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 1eaaf3b12df..18d593bbdec 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,8 +1,8 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook -, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib -, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: +, libsigcxx, gtk, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret +, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib +, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { name = "ekiga-4.0.1"; @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool evolution-data-server gnome-doc-utils avahi - libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite + libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite gnome3.libsoup glib gnome3.defaultIconTheme boost - autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr - nss zlib libsecret libXrandr randrproto which libxslt libtasn1 + autoreconfHook pkgconfig libxml2 unixODBC db nspr + nss zlib libsecret libXrandr which libxslt libtasn1 gmp nettle makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index daa9d04cfb5..e895b3cc00d 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM +{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM , libICE, qca2, pkgconfig, which, glib -, libXScrnSaver, scrnsaverproto +, libXScrnSaver }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ enchant qt4 zlib sox libX11 xproto libSM libICE - qca2 pkgconfig which glib scrnsaverproto libXScrnSaver + [ enchant qt4 zlib sox libX11 xorgproto libSM libICE + qca2 pkgconfig which glib libXScrnSaver ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 9d5d5c1b80f..109566b5d07 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , qt4, qmake4Hook, openssl - , xproto, libX11, libXScrnSaver, scrnsaverproto + , xorgproto, libX11, libXScrnSaver , xz, zlib }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib + qt4 openssl xorgproto libX11 libXScrnSaver xz zlib ]; # hack: needed to fix build issues in diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b53c7b910f6..4c41488acb4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -37,8 +37,8 @@ in stdenv.mkDerivation rec { dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr nss libnotify xorg.pixman yasm libGLU_combined - xorg.libXScrnSaver xorg.scrnsaverproto - xorg.libXext xorg.xextproto sqlite unzip + xorg.libXScrnSaver xorg.xorgproto + xorg.libXext sqlite unzip hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 97d1db83a16..57e1e219b9a 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, xproto, motif, libX11, libXt, libXpm, bison +, xorgproto, motif, libX11, libXt, libXpm, bison , flex, automake, autoconf, libtool }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf flex ]; - buildInputs = [ xproto motif xproto libX11 libXt libXpm bison ]; + buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; sourceRoot = "alliance/src/"; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index ab2b75917b9..2c346b0e74a 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }: +{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: let libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which yacc flex imake gccmakedep ]; - buildInputs = [ tcl tk libX11 xproto ]; + buildInputs = [ tcl tk libX11 xorgproto ]; dontUseImakeConfigure = true; patchPhase = '' diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 090afde8199..eb3946b9ed0 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -2,7 +2,7 @@ , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xextproto, libtheora, libpng +, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng , libdv, libuuid, file, nasm, perl , fontconfig, intltool }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 libXft xextproto + libXext libXxf86vm libXv libXi libX11 libXft xorgproto libtheora libpng libdv libuuid nasm perl diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 9272d3c8e26..05105b64af7 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -4,10 +4,10 @@ , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xproto, inputproto, libxml2 -, libXt, libXmu, libXext, xextproto -, libXinerama, libXrandr, randrproto -, libXtst, libXfixes, fixesproto, systemd +, libX11, xorgproto, libxml2 +, libXt, libXmu, libXext +, libXinerama, libXrandr +, libXtst, libXfixes, systemd , alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad @@ -123,8 +123,8 @@ in stdenv.mkDerivation rec { boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre - libX11 xproto inputproto libXt libXmu libXext xextproto - libXinerama libXrandr randrproto libXtst libXfixes fixesproto + libX11 xorgproto libXt libXmu libXext + libXinerama libXrandr libXtst libXfixes alsaLib libGLU_combined glew fontconfig freetype ftgl libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 5bc9ad8852a..f6f8016ec1d 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xproto, libv4l -, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l +, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}: stdenv.mkDerivation rec { name = "xawtv-3.105"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; - buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS perl alsaLib aalib - fontsproto libXaw libXpm libXext libSM libICE xextproto libv4l]; + buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib + libXaw libXpm libXext libSM libICE libv4l]; meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 4dfc3fd052a..4d3d88d5be8 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto + xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto xorg.libXinerama xorg.libXi xorg.libXft ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 66a9872b06d..828db24c325 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 -, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap +, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus @@ -35,7 +35,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; buildInputs = - [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL + [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 56ae70dce08..1907fbb68f9 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, - xproto, xextproto, randrproto, renderproto, kbproto, patches ? [] }: + xorgproto, patches ? [] }: stdenv.mkDerivation rec { name = "evilwm-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 libXext libXrandr libXrender - xproto xextproto randrproto renderproto kbproto ]; + xorgproto ]; prePatch = ''substituteInPlace ./Makefile --replace /usr $out \ --replace "CC = gcc" "#CC = gcc"''; diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 47febfa00e9..c92b70153a7 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , freetype, fribidi -, libXext, libXft, libXpm, libXrandr, libXrender, xextproto +, libXext, libXft, libXpm, libXrandr, libXrender, xorgproto , libXinerama , imlib2 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; + buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index f72ef13173c..7cdc8854951 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms +{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms , xorg , i3ipc-glib , glib }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ]; + buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' installPhase = '' diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 6f709c999f4..54f23831706 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb +{ stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb , autoreconfHook, json-glib, gtk-doc, which , gobject-introspection }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook which pkgconfig ]; - buildInputs = [ libxcb json-glib gtk-doc xproto gobject-introspection ]; + buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ]; preAutoreconf = '' diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 9085385fe25..6a7c1436b09 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, - libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xproto, xextproto, - xineramaproto, librsvg, freetype, fontconfig }: + libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xorgproto, + librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { name = "jwm-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender - libXau libXdmcp libXmu libpng libjpeg expat xproto xextproto xineramaproto + libXau libXdmcp libXmu libpng libjpeg expat xorgproto librsvg freetype fontconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 2681d31ccb1..00ff6252010 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -2,7 +2,7 @@ , freetype, fribidi , libSM, libICE, libXt, libXaw, libXmu , libXext, libXft, libXpm, libXrandr -, libXrender, xextproto, libXinerama }: +, libXrender, xorgproto, libXinerama }: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext - libXft libXpm libXrandr libXrender xextproto libXinerama ]; + libXft libXpm libXrandr libXrender xorgproto libXinerama ]; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index a69d3164a13..0a1a095e0ce 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, autoconf, automake -, libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi +, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi , libXrandr, fontconfig, freetype, readline }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl - libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr + libX11 xorgproto libXt libXpm libXft libXtst libXi libXrandr fontconfig freetype readline ]; postInstall = '' diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 75d25a0e43d..64fa600765b 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto }: +{ stdenv, fetchurl, libX11, xorgproto }: stdenv.mkDerivation rec { name = "stalonetray-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"; }; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index a9c0f993d77..0943881da28 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, xproto, libX11, libXft, customConfig ? null, patches ? [] }: +{stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp ${builtins.toFile "config.h" customConfig} ./config.h ''; - buildInputs = [ xproto libX11 libXft ]; + buildInputs = [ xorgproto libX11 libXft ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 9a3db92adcc..e1136299260 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xproto}: +{stdenv, fetchurl, pkgconfig, xorgproto}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rgb"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [xproto]; + buildInputs = [xorgproto]; meta = { inherit version; description = "X11 colorname to RGB mapping database"; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 93d80d76352..ea4e6cd1f1c 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto + gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto xorg.libX11 udev systemd ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index cb32d567643..280f39f8d99 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; + buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 8048a857029..e088e74cfb1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ]; + buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index b8d93d944f1..8507fe4b222 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -2,7 +2,7 @@ stdenv, fetchurl , fpc , gtk2, glib, pango, atk, gdk_pixbuf -, libXi, inputproto, libX11, xproto, libXext, xextproto +, libXi, xorgproto, libX11, libXext , makeWrapper }: let @@ -15,8 +15,8 @@ let name = "lazarus-${version}"; }; buildInputs = [ - fpc gtk2 glib libXi inputproto - libX11 xproto libXext xextproto pango atk + fpc gtk2 glib libXi xorgproto + libX11 libXext pango atk stdenv.cc makeWrapper gdk_pixbuf ]; in diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 9cfe03d6655..6467cfc801d 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -16,8 +16,8 @@ , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, libXrender ? null, xorgproto ? null +, libXrandr ? null, libXi ? null , x11Support ? langJava , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -89,7 +89,7 @@ let version = "4.8.5"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto + xorgproto ]; javaAwtGtk = langJava && x11Support; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 9b23fe78599..1676668d911 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -16,8 +16,8 @@ , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, libXrender ? null, xorgproto ? null +, libXrandr ? null, libXi ? null , x11Support ? langJava , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -94,7 +94,7 @@ let version = "4.9.4"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto + xorgproto ]; javaAwtGtk = langJava && x11Support; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 5db2ac3d413..6049cdcb6e8 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -16,8 +16,8 @@ , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, libXrender ? null, xorgproto ? null +, libXrandr ? null, libXi ? null , x11Support ? langJava , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -81,7 +81,7 @@ let version = "5.5.0"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto + xorgproto ]; javaAwtGtk = langJava && x11Support; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 99c79a99dce..a467527c613 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -16,8 +16,8 @@ , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, libXrender ? null, xorgproto ? null +, libXrandr ? null, libXi ? null , x11Support ? langJava , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -78,7 +78,7 @@ let version = "6.5.0"; xlibs = [ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto + xorgproto ]; javaAwtGtk = langJava && x11Support; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 1e8bdbd4e68..2ea95b332fe 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which -, texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace -, libXext, xextproto, libXt, libXaw, libXmu } : +, texinfo, libX11, xorgproto, libXi, gmp, readline, strace +, libXext, libXt, libXaw, libXmu } : assert stdenv ? cc ; assert stdenv.cc.isGNU ; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr m4 binutils emacs gmp - libX11 xproto inputproto libXi - libXext xextproto libXt libXaw libXmu + libX11 xorgproto libXi + libXext libXt libXaw libXmu zlib which texinfo readline strace ]; diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 233372caa80..643dd4b7dbd 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which -, texinfo, libX11, xproto, inputproto, libXi, gmp -, libXext, xextproto, libXt, libXaw, libXmu } : +, texinfo, libX11, xorgproto, libXi, gmp +, libXext, libXt, libXaw, libXmu } : assert stdenv ? cc ; assert stdenv.cc.isGNU ; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr m4 binutils emacs gmp - libX11 xproto inputproto libXi - libXext xextproto libXt libXaw libXmu + libX11 xorgproto libXi + libXext libXt libXaw libXmu zlib which texinfo ]; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 999b2ebd6f6..a933151de12 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl , ncurses -, libX11, xproto, buildEnv +, libX11, xorgproto, buildEnv }: let useX11 = stdenv.isi686 || stdenv.isx86_64; - x11deps = [ libX11 xproto ]; + x11deps = [ libX11 xorgproto ]; inherit (stdenv.lib) optionals; baseOcamlBranch = "4.07"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d1ee43c9152..7ada5b804e3 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -11,7 +11,7 @@ let in { stdenv, fetchurl, ncurses, buildEnv -, libX11, xproto, useX11 ? safeX11 stdenv +, libX11, xorgproto, useX11 ? safeX11 stdenv , flambdaSupport ? false }: @@ -25,7 +25,7 @@ let in let - x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; + x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; }; x11lib = x11env + "/lib"; x11inc = x11env + "/include"; in @@ -48,7 +48,7 @@ stdenv.mkDerivation (args // rec { buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses - ++ optionals useX11 [ libX11 xproto ]; + ++ optionals useX11 [ libX11 xorgproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index e6112c5a334..f850a9f57b8 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -4,7 +4,7 @@ # by default # - full: contains base plus modules in withModules { stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi , libffcall , coreutils @@ -21,7 +21,7 @@ }: assert x11Support -> (libX11 != null && libXau != null && libXt != null - && libXpm != null && xproto != null && libXext != null && xextproto != null); + && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { v = "2.49"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi ++ stdenv.lib.optional ffcallAvailable libffcall ++ stdenv.lib.optionals x11Support [ - libX11 libXau libXt libXpm xproto libXext xextproto + libX11 libXau libXt libXpm xorgproto libXext ]; patches = [ diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 47dbf8a225c..550535f30ae 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -4,7 +4,7 @@ # by default # - full: contains base plus modules in withModules { stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi, libffcall, automake , coreutils # build options @@ -20,7 +20,7 @@ }: assert x11Support -> (libX11 != null && libXau != null && libXt != null - && libXpm != null && xproto != null && libXext != null && xextproto != null); + && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { v = "2.50pre20171114"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi ++ stdenv.lib.optional ffcallAvailable libffcall ++ stdenv.lib.optionals x11Support [ - libX11 libXau libXt libXpm xproto libXext xextproto + libX11 libXau libXt libXpm xorgproto libXext ]; # First, replace port 9090 (rather low, can be used) diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 9575409f986..5a241fbf83e 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL +{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd + libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 6e738a598dc..1b4a5e75137 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -8,7 +8,7 @@ , openssl , readline , sqlite -, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false +, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , zlib , callPackage , self @@ -26,7 +26,7 @@ assert x11Support -> tcl != null && tk != null - && xproto != null + && xorgproto != null && libX11 != null; with stdenv.lib; @@ -53,7 +53,7 @@ let buildInputs = filter (p: p != null) [ zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] - ++ optionals x11Support [ tcl tk libX11 xproto ] + ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals stdenv.isDarwin [ CF configd ]; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index e009204133e..b31a0703a03 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon , dbusSupport ? stdenv.isLinux, dbus , udevSupport ? false, udev @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Propagated for #include in SDL_opengles.h. ++ optional openglSupport libGL # Propagated for #include and in SDL_syswm.h. - ++ optionals x11Support [ libX11 xproto ]; + ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] ++ optional alsaSupport alsaLib diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 269a139a3d6..9f8ca69a70f 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac -, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora +, libXxf86dga, libXxf86misc +, libXxf86vm, openal, libGLU_combined, libjpeg, flac +, libXi, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined - kbproto libjpeg flac - inputproto libXi fixesproto libXfixes + libXxf86vm openal libGLU_combined + libjpeg flac + libXi libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp libpulseaudio libpthreadstubs ]; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 133c0726acb..eca32b740e3 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }: +, libXxf86dga, libXxf86misc +, libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "allegro-${version}"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined + libXxf86vm openal libGLU_combined ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index e65980be320..ef5f2dc9496 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto +{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto , libXi, pkgconfig }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi + unzip cmake libGLU_combined freeglut libX11 xorgproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index ad233402f19..f460b69a4f8 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto -, inputproto, libXi, libXmu +{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto +, libXi, libXmu }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index fc533c277bb..3d831efbcb7 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ - xproto libX11 libXext #xextproto - #renderproto libXrender + xorgproto libX11 libXext + libXrender ]); NIX_LDFLAGS="-lgcc_s"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 8eae64eae2e..9be19f51e7e 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig +, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xproto libICE pkgconfig + libsamplerate libtool autoconf automake xorgproto libICE pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 5d6397c6a1b..3cdebe184d7 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ inputproto ] + propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index b1c798476ea..270936a91b9 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ inputproto ] + propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index eec68015c25..a6281156afa 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXext, xextproto, libjpeg, libungif, libtiff, libpng}: +{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { "--x-libraries=${libX11.out}/lib" ]; - buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; + buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng]; meta = with stdenv.lib; { description = "An image loading and rendering library for X11"; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 6e6ca647fc0..49bc2347ba7 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5"; }; - buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; + buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; nativeBuildInputs = [ pkgconfig ]; - NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; patchPhase = '' cd source diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index fa04655341d..ec73e8ec09f 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xextproto }: +{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: stdenv.mkDerivation rec { name = "libfakekey-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXi libXtst xextproto ]; + buildInputs = [ libX11 libXi libXtst xorgproto ]; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 27c1cb0e390..15efdd4fd4e 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }: let driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; - buildInputs = [ libX11 libXext glproto ]; + buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/GLX/Makefile.am \ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 35c339b45d0..dd3703e6aeb 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = with xorg; [ dri2proto libXext ]; + buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 95baab1627b..d7e05c9e9fb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -145,8 +145,7 @@ let self = stdenv.mkDerivation { ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; buildInputs = with xorg; [ - expat llvmPackages.llvm libglvnd - glproto dri2proto dri3proto presentproto + expat llvmPackages.llvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 0f6495f0c9c..42babc32ecd 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,10 +1,10 @@ { fetchFromGitHub, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 0b7202459f9..d847f447048 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -25,11 +25,11 @@ stdenv.mkDerivation { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 25bb7a365f2..253d185fa0c 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto -, libXi, inputproto, libXaw, libXmu, libXt }: +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xorgproto +, libXi, libXaw, libXmu, libXt }: let majorVersion = "1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; buildInputs = [ - autoconf automake libtool libX11 xproto libXi inputproto libXaw + autoconf automake libtool libX11 xorgproto libXi libXaw libXmu libXt ]; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 95b82f8f3cf..3f3e9158622 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null, randrproto ? null +, xrandrSupport ? true, libXrandr ? null , xineramaSupport ? true, libXinerama ? null , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, libGLU_combined ? null, libXmu ? null -, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null && randrproto != null; +assert xrandrSupport -> libXrandr != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; assert openglSupport -> libGLU_combined != null && libXmu != null; @@ -40,7 +40,7 @@ stdenv.mkDerivation { "-v" "-system-zlib" "-system-libpng" "-system-libjpeg" "-qt-gif" - "-I${xextproto}/include" + "-I${xorgproto}/include" (mk threadSupport "thread") (mk xrenderSupport "xrender") (mk xrandrSupport "xrandr") @@ -55,7 +55,6 @@ stdenv.mkDerivation { "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" ] ++ stdenv.lib.optionals xrandrSupport [ "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - "-I${randrproto}/include" ] ++ stdenv.lib.optionals xineramaSupport [ "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" ] ++ stdenv.lib.optionals cursorSupport [ diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 196fb59bb17..927715535b5 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut +{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi +, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5"; }; - buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto + buildInputs = [ plib freeglut xorgproto libX11 libXext libXi libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index afd29aeb006..dee363f23b6 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = if !stdenv.isDarwin - then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index bbb3b0faf34..6d2e25709b5 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, libX11, cairo , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 19c3ca307c5..426f5cf92a1 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 5d3086fc504..45bf5f779c2 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile +, xorgproto, gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 6fc50b81803..cf62704e8be 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: +{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: let majorVersion = "0.63"; @@ -14,7 +14,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ]; + buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ]; meta = with lib; { description = "Extension to emulate keypresses and to get the layout information from the X server"; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index a8f358ab55b..3e0c1d55951 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev +{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , procps, utilmacros, gnome2, openssl, peg }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig utilmacros ]; - buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod + buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps gnome2.gtkdoc openssl peg ]; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index ab9ffd0470b..29513c88418 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { stdenv, lib, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2 +, openal, libGLU_combined, xorgproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal - libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox + libGLU_combined xorgproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = [ - "-I${xproto}/include/X11" + "-I${xorgproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" "-I${SDL2}/include/SDL2" diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 38a67289d39..c6ccac69b8c 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }: +{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { name = "construo-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa"; }; - buildInputs = [ libX11 zlib xproto ] + buildInputs = [ libX11 zlib xorgproto ] ++ stdenv.lib.optional (libGL != null) libGL ++ stdenv.lib.optional (freeglut != null) freeglut; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 26703b8288e..fba1ce01c45 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, libGLU_combined, libX11, xproto, tcl, freeglut, freetype -, sfml, libXi, inputproto -, libXmu, libXext, xextproto, libXt, libSM, libICE +{ stdenv, fetchurl, libGLU_combined, libX11, xorgproto, tcl, freeglut, freetype +, sfml, libXi +, libXmu, libXext, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool }: @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libGLU_combined libX11 xproto tcl freeglut freetype - sfml libXi inputproto - libXmu libXext xextproto libXt libSM libICE + libGLU_combined libX11 xorgproto tcl freeglut freetype + sfml libXi + libXmu libXext libXt libSM libICE libpng pkgconfig gettext intltool ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index f3b77d87e17..b70dec62388 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib -, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto +, libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib - libSM libunwind libX11 xproto libXext xextproto libXi inputproto + libSM libunwind libX11 xorgproto libXext libXi libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase glew qtdeclarative ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index b662588acaa..5c8d2541a01 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xorgproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 6d8fddf3899..0abbfda33c7 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libX11, libXext, xextproto, libICE, libSM, xproto, libpng12, zlib }: +{ stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: stdenv.mkDerivation rec { name = "lincity-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libICE libpng12 libSM libX11 libXext - xextproto zlib xproto + xorgproto zlib ]; patches = [ diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index a5142dba88f..b860d2ee58b 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig -, zlib, libxml2, libxslt, xproto, libX11, libGLU_combined, SDL +, zlib, libxml2, libxslt, xorgproto, libX11, libGLU_combined, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zlib libxml2 libxslt xproto libX11 libGLU_combined SDL SDL_mixer SDL_image + zlib libxml2 libxslt xorgproto libX11 libGLU_combined SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs ]; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 303855fb348..af7101f216d 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xproto, libX11, libXrender +{ stdenv, fetchurl, xorgproto, libX11, libXrender , gmp, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xproto libX11 gmp guile + xorgproto libX11 gmp guile libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 2b3e065e6b6..4b1385f3e10 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, gd, SDL, SDL_image, SDL_mixer, zlib +{ stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib , libxml2, pkgconfig, curl, cmake, libzip }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp -R ../share/gamedir/* $out/share/OpenLieroX ''; - buildInputs = [ libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2 + buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2 pkgconfig curl cmake libzip ]; meta = { diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 5f6e20c39b6..ad0c7441d7f 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 enet libjpeg openscenegraph libvorbis ]; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 5130db6cb3c..1408b66ab41 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11 -, libXi, inputproto, libXmu, libXext, xextproto, libGLU_combined }: +{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xorgproto, libX11 +, libXi, libXmu, libXext, libGLU_combined }: stdenv.mkDerivation rec { name = "stardust-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - zlib libtiff libxml2 SDL xproto libX11 libXi inputproto - libXmu libXext xextproto libGLU_combined + zlib libtiff libxml2 SDL xorgproto libX11 libXi + libXmu libXext libGLU_combined ]; installFlags = [ "bindir=\${out}/bin" ]; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index b941f3bd2e0..f1718201998 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, makeWrapper }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; installTargets = "install datainstall"; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index c99183bfbea..04712b3ebff 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake , zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer -, SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig +, SDL_net, SDL_ttf, libunwind, libX11, xorgproto, libxml2, pkgconfig , gettext, intltool, libtool, perl }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer - SDL_net SDL_ttf libunwind libX11 xproto libxml2 perl + SDL_net SDL_ttf libunwind libX11 xorgproto libxml2 perl ]; enableParallelBuilding = true; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index c2c0dc764df..4a8e7188ce8 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu +{stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu , libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango , gtk2 }: @@ -13,7 +13,7 @@ let sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib"; }; buildInputs = [ - libX11 xproto libXt libXaw libSM libICE libXmu + libX11 xorgproto libXt libXaw libSM libICE libXmu libXext gnuchess texinfo libXpm pkgconfig librsvg cairo pango gtk2 ]; diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index 82dfd217217..6e852639979 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk +{ stdenv, fetchurl, cpio, xorgproto, libX11, libXmu, libXaw, libXt, tcl, tk , libXext, fontconfig, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca"; }; - buildInputs = [ cpio xproto libX11 libXmu libXaw libXt tcl tk libXext + buildInputs = [ cpio xorgproto libX11 libXmu libXaw libXt tcl tk libXext fontconfig makeWrapper ]; configureFlags = [ diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 3e9add56903..cf08db68cf0 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, libXpm, libXt }: +{ stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }: stdenv.mkDerivation rec { name = "xsokoban-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; - buildInputs = [ libX11 xproto libXpm libXt ]; + buildInputs = [ libX11 xorgproto libXpm libXt ]; NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 5e658abff47..f5e8b60cea0 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, writeText -, xproto, libX11, libXext, libXrandr +, xorgproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; - buildInputs = [ xproto libX11 libXext libXrandr ]; + buildInputs = [ xorgproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cce4b351c57..257b943c9e7 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, scrnsaverproto }: +, imake, gccmakedep, libXScrnSaver, xorgproto }: stdenv.mkDerivation rec { name = "xautolock-2.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; installTargets = "install install.man"; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ]; + buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; meta = with stdenv.lib; { description = "A program that launches a given program when your X session has been idle for a given time."; homepage = http://www.ibiblio.org/pub/linux/X11/screensavers; diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 8f8c58ecc4a..c8cda8482bf 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }: +{ stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: stdenv.mkDerivation rec { name = "xosd-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg"; }; - buildInputs = [ libX11 libXext libXt xextproto xproto ]; + buildInputs = [ libX11 libXext libXt xorgproto ]; meta = with stdenv.lib; { description = "Displays text on your screen"; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 6cb8cacbffa..f6ad8e2c03b 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -263,7 +263,7 @@ if test -z "$libsOnly"; then cd programs/fglrx_gamma gcc -fPIC -I${libXxf86vm.dev}/include \ - -I${xf86vidmodeproto}/include \ + -I${xorgproto}/include \ -I$out/X11R6/include \ -L$out/lib \ -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index bc35d14321b..24d0aa695f3 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXrandr = xorg.libXrandr; libXrender = xorg.libXrender; libXxf86vm = xorg.libXxf86vm; - xf86vidmodeproto = xorg.xf86vidmodeproto; + xorgproto = xorg.xorgproto; libSM = xorg.libSM; libICE = xorg.libICE; libfreetype = freetype; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE + xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE patchelf unzip libGLU_combined @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # outputs TODO: probably many fixes are needed; LD_LIBRARY_PATH = makeLibraryPath [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE + xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE libGLU_combined fontconfig freetype diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index b11a4d6d8f2..e8c1e9bfe5e 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xproto }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation rec { name = "directvnc-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ directfb zlib libjpeg xproto ]; + buildInputs = [ directfb zlib libjpeg xorgproto ]; meta = with stdenv.lib; { description = "DirectFB VNC client"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 42b5317d556..15582574ecb 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, unzip }: +{ stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ - libX11 xproto unzip + libX11 xorgproto unzip ]; installPhase = '' diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index ef6e3f4c67f..2897e9200fd 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -5,8 +5,7 @@ , pkgconfig , mtdev , xorgserver -, xproto -, inputproto +, xorgproto , pixman , autoreconfHook }: @@ -19,8 +18,7 @@ stdenv.mkDerivation { pkgconfig mtdev xorgserver - xproto - inputproto + xorgproto pixman autoreconfHook ]; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 527471bad32..71242348f68 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -1,12 +1,7 @@ { stdenv , fetchgit , mtdev -, xorgserver -, xproto , pixman -, xextproto -, inputproto -, randrproto , xorg , libpciaccess }: @@ -30,13 +25,11 @@ stdenv.mkDerivation { ''; buildInputs = with xorg; [ - mtdev xproto xextproto inputproto libpciaccess randrproto renderproto - xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto - dri3proto presentproto + mtdev xorgproto libpciaccess libxcb ]; buildPhase = '' - make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" + make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorg.xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" ''; installPhase = '' diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e0e211642af..ac095ffaf89 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl -, inputproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: +, xorgproto, libX11, libXext, libXi, libXrandr, libXrender +, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: stdenv.mkDerivation rec { name = "xf86-input-wacom-0.36.0"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; }; - buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ]; + buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender + ncurses pkgconfig xorgserver udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 54d16473770..14d2b249fc0 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, autoreconfHook, fontsproto, libX11, libXext -, pixman, pkgconfig, renderproto, utilmacros, xorgserver +{ stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext +, pixman, pkgconfig, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = - [ autoreconfHook fontsproto libX11 libXext pixman - pkgconfig renderproto utilmacros xorgserver + [ autoreconfHook xorgproto libX11 libXext pixman + pkgconfig utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 86f75a21359..0b6451d104f 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, bison, flex, gccmakedep -, xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: +, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: let pname = "nas"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ imake bison flex gccmakedep ]; - buildInputs = [ xproto libXau libXt libXext libXaw libXpm ]; + buildInputs = [ xorgproto libXau libXt libXext libXaw libXpm ]; buildFlags = [ "WORLDOPTS=" "World" ]; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index ccb3937ac85..52cb1e750a6 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { buildInputs = [ xorg.libXinerama xorg.libAppleWM - xorg.applewmproto + xorg.xorgproto xorg.libXrandr xorg.libXext pixman diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d192c75049f..22525a43218 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1326,7 +1326,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1335,11 +1335,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + buildInputs = [ gperf m4 libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1348,11 +1348,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1361,7 +1361,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbproto xorgproto ]; + buildInputs = [ gperf m4 libxcb xcbproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1391,7 +1391,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1400,11 +1400,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + buildInputs = [ gperf m4 libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1413,7 +1413,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xorgproto ]; + buildInputs = [ gperf m4 libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2470,7 +2470,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { @@ -2479,7 +2479,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 754075e4f06..33b3a1ba9ad 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -37,9 +37,9 @@ $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; $pcMap{"gbm"} = "mesa_noglu"; $pcMap{"\$PIXMAN"} = "pixman"; -$pcMap{"\$RENDERPROTO"} = "renderproto"; -$pcMap{"\$DRI3PROTO"} = "dri3proto"; -$pcMap{"\$DRI2PROTO"} = "dri2proto"; +$pcMap{"\$RENDERPROTO"} = "xorgproto"; +$pcMap{"\$DRI3PROTO"} = "xorgproto"; +$pcMap{"\$DRI2PROTO"} = "xorgproto"; my $downloadCache = "./download-cache"; @@ -225,7 +225,7 @@ while (<>) { process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; push @requires, "libxslt" if $pkg =~ /libxcb/; - push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/; + push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/; print "REQUIRES $pkg => @requires\n"; print "NATIVE_REQUIRES $pkg => @nativeRequires\n"; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 5baf6a4b51f..cf2227403b0 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xproto }: +{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }: stdenv.mkDerivation rec { name = "hsetroot-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake imlib2 libtool libX11 xproto ]; + buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ]; patches = [ underlinkingPatch ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 53ef29d7d43..7863542d190 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, xextproto, libXtst, libXi, libXext +{ stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xextproto libXtst libXi libXext libXinerama libXrandr + buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr glib cairo xdotool ]; patchPhase = '' diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index cd80e328657..f7d8914722a 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchgit, libX11, libXtst, pkgconfig, inputproto, libXi, xproto, xextproto }: +{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: stdenv.mkDerivation rec { name = "ksuperkey-git-2015-07-21"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libX11 libXtst inputproto libXi xproto xextproto + libX11 libXtst xorgproto libXi ]; src = fetchgit { diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index 806a8388082..aa5e346334a 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, xproto, libX11}: +{stdenv, fetchurl, perl, xorgproto, libX11}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; }; buildInputs = [ - perl xproto libX11 + perl xorgproto libX11 ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 71a4f012a01..16462f5243b 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchgit, xproto, libX11, libXft, libXcomposite, libXdamage -, libXext, xextproto, libXinerama, libjpeg, giflib, pkgconfig +{stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage +, libXext, libXinerama, libjpeg, giflib, pkgconfig }: let buildInputs = [ - xproto libX11 libXft libXcomposite libXdamage libXext xextproto + xorgproto libX11 libXft libXcomposite libXdamage libXext libXinerama libjpeg giflib pkgconfig ]; in diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 6dc785621b5..c8d3bb6cc97 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = - [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage - xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg - xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr - xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto - xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto + [ xorg.libXfixes xorg.xorgproto openssl xorg.libXdamage + zlib xorg.libX11 libjpeg + xorg.libXtst xorg.libXinerama xorg.libXrandr + xorg.libXext + xorg.libXi xorg.libXrender libvncserver ]; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index f3ab23d364c..cb01d0a4d4a 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -8,9 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; - buildInputs = - [ xorg.libX11 xorg.xproto xorg.xextproto xorg.libXext - xorg.libXrandr xorg.randrproto + buildInputs = with xorg; [ + libX11 xorgproto libXext libXrandr ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index 23e675bb59b..fae2d56fbbe 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xextproto, +{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto, libXi }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXtst xextproto libXi ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ]; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 59ddac0eca1..bb6abfa9b58 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xextproto, libXi, libXinerama, libxkbcommon }: +{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { name = "xdotool-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ]; + buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ]; preBuild = '' mkdir -p $out/lib diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 1ed15303069..43b46fcb8d7 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: +{ stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { pname = "xinput_calibrator"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper ]; + buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index fee601d1575..fd944f40044 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }: +{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { name = "xmacro-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preInstall = "echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; - buildInputs = [ libX11 libXtst xextproto libXi inputproto ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index ecc1f6b6f25..463df6ad935 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, libX11, xproto }: +{ stdenv, fetchFromGitLab, libX11, xorgproto }: stdenv.mkDerivation rec { name = "xmagnify-0.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { prePatch = ''substituteInPlace ./Makefile --replace /usr $out''; - buildInputs = [ libX11 xproto ]; + buildInputs = [ libX11 xorgproto ]; meta = with stdenv.lib; { description = "Tiny screen magnifier for X11"; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index c7fd376a8ed..7b7d5d1aeed 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, libX11, xproto, libXext, xextproto, libXtst -, gtk2, libXi, inputproto, pkgconfig, recordproto, texinfo }: +{ fetchurl, stdenv, libX11, xorgproto, libXext, libXtst +, gtk2, libXi, pkgconfig, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libX11 xproto libXext xextproto libXtst gtk2 - libXi inputproto pkgconfig recordproto + [ libX11 xorgproto libXext libXtst gtk2 + libXi pkgconfig texinfo ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index ecbd36e1162..1d6ea45c9c5 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -29,14 +29,13 @@ in buildPythonApplication rec { ]; nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ]; - buildInputs = [ + buildInputs = with xorg; [ + libX11 xorgproto libXrender libXi + libXtst libXfixes libXcomposite libXdamage + libXrandr libxkbfile + ] ++ [ cython - xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto - xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto - xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage - xorg.libXrandr xorg.libxkbfile - pango cairo gdk_pixbuf atk gtk3 glib ffmpeg libvpx x264 libwebp diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix index ab786d9bce8..8d04745ed7f 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ b/pkgs/tools/X11/xpra/xf86videodummy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto +, xorgproto, xorgserver , pkgconfig , xpra }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./0005-support-for-30-bit-depth-in-dummy-driver.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + buildInputs = [ xorgproto xorgserver ]; meta = { description = "Dummy driver for Xorg with xpra patches"; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 6ccc8a24cae..368012b468f 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, libXt, libXaw, libXtst -, libXi, libXpm, xextproto, gccmakedep, Xaw3d }: +, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: stdenv.mkDerivation rec { name = "xvkbd-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ libXt libXaw libXtst xextproto libXi Xaw3d libXpm ]; + buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; installTargets = [ "install" "install.man" ]; makeFlags = [ "BINDIR=$(out)/bin" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 317646501ca..37a0f47c7af 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -3,7 +3,7 @@ , libjpeg_turbo, pixman, fltk , fontDirectories , cmake, gettext, libtool -, glproto, libGLU +, libGLU , gnutls, pam, nettle , xterm, openssh , makeWrapper}: @@ -80,13 +80,11 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ libjpeg_turbo fltk pixman gnutls pam nettle - fixesproto damageproto compositeproto randrproto - xcmiscproto bigreqsproto randrproto renderproto - fontsproto videoproto scrnsaverproto resourceproto presentproto + xorgproto utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft - libxkbfile libXfont2 libpciaccess xineramaproto - glproto libGLU - ] ++ xorgserver.buildInputs; + libxkbfile libXfont2 libpciaccess + libGLU + ] ++ xorg.xorgserver.buildInputs; nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ] ++ xorg.xorgserver.nativeBuildInputs; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 76cb3ab199c..0fbfae1b966 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xproto, libXt, libX11, gifview ? false, static ? false }: +{ stdenv, fetchurl, xorgproto, libXt, libX11, gifview ? false, static ? false }: with stdenv.lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha"; }; - buildInputs = optional gifview [ xproto libXt libX11 ]; + buildInputs = optional gifview [ xorgproto libXt libX11 ]; configureFlags = [] ++ optional (!gifview) [ "--disable-gifview" ]; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index b97b562b306..8260d7921ec 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }: +{ stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: stdenv.mkDerivation rec { name = "xdaliclock-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # on aarch64 doesn't find the files to patch and the aarch64 build fails! preConfigure = "cd X11"; - buildInputs = [ libX11 xproto libXt libICE libSM libXext ]; + buildInputs = [ libX11 xorgproto libXt libICE libSM libXext ]; preInstall = '' mkdir -vp $out/bin $out/share/man/man1 diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 7729bae897c..c0d7134bcc5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config - echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${xorgproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config + echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xorgproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index c71c70b57a7..83b006e786f 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchgit, which, libX11, libXt, fontconfig, freetype -, xproto ? null -, xextproto ? null +, xorgproto ? null , libXext ? null , zlib ? null # For building web manuals @@ -45,9 +44,8 @@ stdenv.mkDerivation rec { perl libX11 fontconfig - xproto + xorgproto libXt - xextproto libXext freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. ]; @@ -69,8 +67,7 @@ stdenv.mkDerivation rec { freetype_dev = freetype.dev; zlib_dev = zlib.dev; - xproto_exp = xproto; - xextproto_exp = xextproto; + xorgproto_exp = xorgproto; libX11_exp = libX11; libXt_exp = libXt; libXext_exp = libXext; diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 49a2c4d4acb..41140949593 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libX11, xproto, imake, gccmakedep, libXt, libXmu -, libXaw, libXext, xextproto, libSM, libICE, libXpm, libXp +{ stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu +, libXaw, libXext, libSM, libICE, libXpm, libXp }: stdenv.mkDerivation rec { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ - libX11 xproto libXt libXmu libXaw - libXext xextproto libSM libICE libXpm libXp + libX11 xorgproto libXt libXmu libXaw + libXext libSM libICE libXpm libXp ]; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142173d4725..680c26153ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13041,9 +13041,8 @@ in # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ - freetype fontconfig xorg.xproto xorg.libX11 xorg.libXt + freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt xorg.libXft xorg.libXext xorg.libSM xorg.libICE - xorg.xextproto ]; }; From a8bc355b06b1a7ab9f76a094f0ea75c14c955e64 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:15:59 +0100 Subject: [PATCH 130/200] xorg/xf86-video-neomagic: 1.2.9 -> 1.3.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 22525a43218..d86f5807c3c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1860,11 +1860,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-neomagic-1.2.9"; + name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; - sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; + url = mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2; + sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0782efdfad2..4f5aa0d5698 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -81,7 +81,7 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 From e8a384e0cab7031eaecb4f6b47701a0733c11e37 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:20:24 +0100 Subject: [PATCH 131/200] xorg/xf86-video-chips: 1.2.7 -> 1.3.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d86f5807c3c..1749e1439a8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1704,11 +1704,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.2.7"; + name = "xf86-video-chips-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; - sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2; + sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 4f5aa0d5698..b1b27f188da 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -69,7 +69,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 From 1bd651ba90b6452de3c63b39dbae5fb2b043fc58 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:23:27 +0100 Subject: [PATCH 132/200] xorg/amdgpu: 1.4.0 -> 18.1.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1749e1439a8..fd3e1f1e7ce 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1652,11 +1652,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-1.4.0"; + name = "xf86-video-amdgpu-18.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; - sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2; + sha256 = "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b1b27f188da..6ddf047811a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -65,7 +65,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 From 7ac2e3fb777844ea0665016a1719b4d24a7b4dae Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:28:17 +0100 Subject: [PATCH 133/200] xorg/xf86-input-libinput: 0.28.0 -> 0.28.1 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fd3e1f1e7ce..12abdbf2609 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1587,11 +1587,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-0.28.0"; + name = "xf86-input-libinput-0.28.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2; - sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.1.tar.bz2; + sha256 = "12yr0yki94j2416bfhmkz5jpacffm27jkra89fl7h03c0y749nls"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6ddf047811a..e377a79b0fd 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -60,7 +60,7 @@ mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.28.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 From 4235b0a4475c60a4c7fc08bb1c0f4ad79a0dc814 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:30:23 +0100 Subject: [PATCH 134/200] xorg/libdmx: 1.1.3 -> 1.1.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 12abdbf2609..2cfbfaa9f3d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1041,11 +1041,11 @@ lib.makeScope newScope (self: with self; { }) {}; libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libdmx-1.1.3"; + name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; - sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; + url = mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2; + sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e377a79b0fd..3d6246f8f1f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 mirror://xorg/individual/font/font-util-1.3.1.tar.bz2 -mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 From beaca82e4834b84c7ae219328da30c52a8cfe81f Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:32:07 +0100 Subject: [PATCH 135/200] xorg/mkfontscale: 1.1.2 -> 1.1.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 9 --------- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2cfbfaa9f3d..7b0f29e0c01 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1184,11 +1184,11 @@ lib.makeScope newScope (self: with self; { }) {}; mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.1.2"; + name = "mkfontscale-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; - sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; + url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2; + sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9a3a3f1a1d5..29a7e39cdd9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -75,15 +75,6 @@ self: super: preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin"; }); - mkfontscale = super.mkfontscale.overrideAttrs (attrs: { - patches = lib.singleton (fetchpatch { - name = "mkfontscale-fix-sig11.patch"; - url = "https://bugs.freedesktop.org/attachment.cgi?id=113951"; - sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim"; - }); - patchFlags = [ "-p0" ]; - }); - libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3d6246f8f1f..d16005a7a73 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -12,7 +12,7 @@ mirror://xorg/individual/app/appres-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 From 3c6e5b03bbb659d9e97deefa5f5b86be9a901383 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:35:22 +0100 Subject: [PATCH 136/200] xorg/appres: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7b0f29e0c01..a22f6f738d4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -6,11 +6,11 @@ lib.makeScope newScope (self: with self; { inherit pixman; appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { - name = "appres-1.0.4"; + name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; - sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; + url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2; + sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d16005a7a73..a4db8e01117 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -8,7 +8,7 @@ https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 -mirror://xorg/individual/app/appres-1.0.4.tar.bz2 +mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 From b43838632eff843c044ff7c4b29ae16493ff1ad2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:48:16 +0100 Subject: [PATCH 137/200] xorg: replace old X11R7 links with individual ones for easier upgrades --- pkgs/servers/x11/xorg/default.nix | 98 ++++++++++++++--------------- pkgs/servers/x11/xorg/tarballs.list | 98 ++++++++++++++--------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a22f6f738d4..1d871ff6508 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -48,7 +48,7 @@ lib.makeScope newScope (self: with self; { name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -61,7 +61,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -75,7 +75,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -89,7 +89,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -103,7 +103,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -117,7 +117,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -131,7 +131,7 @@ lib.makeScope newScope (self: with self; { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -144,7 +144,7 @@ lib.makeScope newScope (self: with self; { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -158,7 +158,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -172,7 +172,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -186,7 +186,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -200,7 +200,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -214,7 +214,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -228,7 +228,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -242,7 +242,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -256,7 +256,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -270,7 +270,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -284,7 +284,7 @@ lib.makeScope newScope (self: with self; { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -298,7 +298,7 @@ lib.makeScope newScope (self: with self; { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -312,7 +312,7 @@ lib.makeScope newScope (self: with self; { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -326,7 +326,7 @@ lib.makeScope newScope (self: with self; { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -340,7 +340,7 @@ lib.makeScope newScope (self: with self; { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -354,7 +354,7 @@ lib.makeScope newScope (self: with self; { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -368,7 +368,7 @@ lib.makeScope newScope (self: with self; { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -382,7 +382,7 @@ lib.makeScope newScope (self: with self; { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -396,7 +396,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -410,7 +410,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -424,7 +424,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -438,7 +438,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; + url = mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -452,7 +452,7 @@ lib.makeScope newScope (self: with self; { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -466,7 +466,7 @@ lib.makeScope newScope (self: with self; { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; + url = mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -480,7 +480,7 @@ lib.makeScope newScope (self: with self; { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -494,7 +494,7 @@ lib.makeScope newScope (self: with self; { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -508,7 +508,7 @@ lib.makeScope newScope (self: with self; { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -535,7 +535,7 @@ lib.makeScope newScope (self: with self; { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -549,7 +549,7 @@ lib.makeScope newScope (self: with self; { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; + url = mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -602,7 +602,7 @@ lib.makeScope newScope (self: with self; { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; + url = mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -654,7 +654,7 @@ lib.makeScope newScope (self: with self; { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; + url = mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -680,7 +680,7 @@ lib.makeScope newScope (self: with self; { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; + url = mirror://xorg/individual/lib/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1148,7 +1148,7 @@ lib.makeScope newScope (self: with self; { name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; + url = mirror://xorg/individual/app/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1174,7 +1174,7 @@ lib.makeScope newScope (self: with self; { name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; + url = mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1304,7 +1304,7 @@ lib.makeScope newScope (self: with self; { name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; + url = mirror://xorg/individual/data/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1876,7 +1876,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; + url = mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2110,7 +2110,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + url = mirror://xorg/individual/driver/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2175,7 +2175,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; + url = mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2487,7 +2487,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; + url = mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2500,7 +2500,7 @@ lib.makeScope newScope (self: with self; { name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; + url = mirror://xorg/individual/app/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2578,7 +2578,7 @@ lib.makeScope newScope (self: with self; { name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; + url = mirror://xorg/individual/app/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2643,7 +2643,7 @@ lib.makeScope newScope (self: with self; { name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; + url = mirror://xorg/individual/app/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a4db8e01117..7537e5048bd 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -12,6 +12,8 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 +mirror://xorg/individual/app/luit-1.1.1.tar.bz2 +mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 @@ -46,17 +48,22 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/app/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 +mirror://xorg/individual/app/xsetroot-1.1.0.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xwud-1.0.4.tar.bz2 +mirror://xorg/individual/data/xbitmaps-1.1.1.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 +mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 @@ -82,6 +89,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 @@ -99,18 +107,58 @@ mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 +mirror://xorg/individual/font/encodings-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2 +mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2 +mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/individual/font/font-util-1.3.1.tar.bz2 +mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 +mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 +mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 @@ -133,6 +181,7 @@ mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 @@ -150,52 +199,3 @@ mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 -mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 From b3beb5d268b105e0e5c01e15bf5fa760b217ac95 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:49:51 +0100 Subject: [PATCH 138/200] xorg/xbitmaps: 1.1.1 -> 1.1.2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1d871ff6508..dca06771fbe 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1301,11 +1301,11 @@ lib.makeScope newScope (self: with self; { }) {}; xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xbitmaps-1.1.1"; + name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xbitmaps-1.1.1.tar.bz2; - sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; + url = mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2; + sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 7537e5048bd..f6e982106d2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -59,7 +59,7 @@ mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwud-1.0.4.tar.bz2 -mirror://xorg/individual/data/xbitmaps-1.1.1.tar.bz2 +mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 From 349a422d852a883aad1b071a45977bda2019ee3b Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:51:09 +0100 Subject: [PATCH 139/200] xorg/xdriinfo: 1.0.5 -> 1.0.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dca06771fbe..9820d3e0b55 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1509,11 +1509,11 @@ lib.makeScope newScope (self: with self; { }) {}; xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "xdriinfo-1.0.5"; + name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; - sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; + url = mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2; + sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f6e982106d2..51bce086a6f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -28,7 +28,7 @@ mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 -mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2 +mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 From 533280bac994e5a85fc34f0fadcb8c7eb17a8439 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:53:17 +0100 Subject: [PATCH 140/200] xorg/xcursor-themes: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9820d3e0b55..903932beb56 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1470,11 +1470,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.4"; + name = "xcursor-themes-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; - sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2; + sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 51bce086a6f..8102a30c5f3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -60,7 +60,7 @@ mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwud-1.0.4.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 From f20fae7fe34e4139bc4f656ea2c5480dbc948ec9 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:54:45 +0100 Subject: [PATCH 141/200] xorg/libXScrnSaver: 1.2.2 -> 1.2.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 903932beb56..75607bb5111 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -677,11 +677,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXScrnSaver-1.2.2"; + name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXScrnSaver-1.2.2.tar.bz2; - sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; + url = mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2; + sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8102a30c5f3..66338550535 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -181,7 +181,7 @@ mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 -mirror://xorg/individual/lib/libXScrnSaver-1.2.2.tar.bz2 +mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 From 088a0b922bb0ddf082ea3219020f447fffa394e7 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:56:23 +0100 Subject: [PATCH 142/200] xorg/iceauth: 1.0.7 -> 1.0.8 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 75607bb5111..91bde469272 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -573,11 +573,11 @@ lib.makeScope newScope (self: with self; { }) {}; iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { - name = "iceauth-1.0.7"; + name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; - sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; + url = mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2; + sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 66338550535..01b454aef0a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz -mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/luit-1.1.1.tar.bz2 mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 From b26372961d110e9d6ac36e115dd5c12c62dea127 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:57:40 +0100 Subject: [PATCH 143/200] xorg/libxshmfence: 1.2 -> 1.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 91bde469272..04294e147ab 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1119,11 +1119,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libxshmfence-1.2"; + name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; - sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; + url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 01b454aef0a..de14fa0fa68 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -182,7 +182,7 @@ mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 -mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 From d6fc30a3196f6c77c054fa56af7af01cf05b0aa5 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 13:59:25 +0100 Subject: [PATCH 144/200] xorg/libXxf86misc: 1.0.3 -> 1.0.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 04294e147ab..4a94f5040dc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86misc-1.0.3"; + name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; - sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; + url = mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2; + sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index de14fa0fa68..ae6f601669b 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 +mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2 From 563dbdca4a0ba384e0fc18f94867d82d9d463982 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:00:45 +0100 Subject: [PATCH 145/200] xorg/xmessage: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4a94f5040dc..33e08e6a473 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2406,11 +2406,11 @@ lib.makeScope newScope (self: with self; { }) {}; xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmessage-1.0.4"; + name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; - sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; + url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2; + sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ae6f601669b..7a86316e9e4 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -46,7 +46,7 @@ mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/app/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From f659a6625a5b213e5199a7fe0884290f286c105c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:02:10 +0100 Subject: [PATCH 146/200] xorg/xfs: 1.1.4 -> 1.2.0 --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 33e08e6a473..c0ffbcd5559 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2197,16 +2197,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xorgproto, xtrans }: stdenv.mkDerivation { - name = "xfs-1.1.4"; + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; - sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; + url = mirror://xorg/individual/app/xfs-1.2.0.tar.bz2; + sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXfont xorgproto xtrans ]; + buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 7a86316e9e4..1e992ad7be2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -31,7 +31,7 @@ mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 +mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 From cf334c3e0fa423a768d81c501d45f8e655366ebd Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:04:01 +0100 Subject: [PATCH 147/200] xorg/xf86-input-synaptics: 1.9.0 -> 1.9.1 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c0ffbcd5559..2071325186f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1613,11 +1613,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { - name = "xf86-input-synaptics-1.9.0"; + name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; - sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2; + sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1e992ad7be2..2a39d9d6e2b 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -69,7 +69,7 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.28.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 From 730f3178b4a303e24f72479a626318a2810324ca Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:05:21 +0100 Subject: [PATCH 148/200] xorg/xf86-input-mouse: 1.9.2 -> 1.9.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2071325186f..71931a2ce18 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1600,11 +1600,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-mouse-1.9.2"; + name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; - sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2; + sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 2a39d9d6e2b..2d79f74e985 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -68,7 +68,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.28.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 From 79a49047cb82a5d819622a0378e91ced4ccc3d5e Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:06:53 +0100 Subject: [PATCH 149/200] xorg/xf86-input-evdev: 2.10.5 -> 2.10.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 71931a2ce18..d9761bf3691 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1548,11 +1548,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-evdev-2.10.5"; + name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; - sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2; + sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 2d79f74e985..62f712e41f9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -64,7 +64,7 @@ mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.28.1.tar.bz2 From 6a6a5a6dd47a29a6eadbc94d6b6d84cf08bab5d2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:08:55 +0100 Subject: [PATCH 150/200] xorg/xf86-video-fbdev: 0.4.4 -> 0.5.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d9761bf3691..cab84b30ac8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1743,11 +1743,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-fbdev-0.4.4"; + name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; - sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; + url = mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2; + sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 62f712e41f9..36798035938 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -79,7 +79,7 @@ mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 From d9c5a888c78394f334faad08f5ed2de4820ebb6c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:49:39 +0100 Subject: [PATCH 151/200] xorg/xf86-video-mach: 6.9.5 -> 6.9.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cab84b30ac8..ee5c5e1e4a8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1834,11 +1834,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mach64-6.9.5"; + name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; - sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; + url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2; + sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 36798035938..997a47d2db2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -86,7 +86,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 From 7dfdc2e3ffd875a8348d57e39a42bb90ba5f876b Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:50:53 +0100 Subject: [PATCH 152/200] xorg/xf86-video-geode: 2.11.17 -> 2.11.19 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ee5c5e1e4a8..cceee5a5638 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1756,11 +1756,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-geode-2.11.17"; + name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; - sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; + url = mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2; + sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 997a47d2db2..9437cd1b47d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -80,7 +80,7 @@ mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 +mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 From 6739615ec05fce16e4a75453cc47f5a7b7c45e10 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:52:02 +0100 Subject: [PATCH 153/200] xorg/xf86-video-r128: 6.10.2 -> 6.11.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cceee5a5638..a143ae86fcd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1938,11 +1938,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-r128-6.10.2"; + name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; - sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2; + sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9437cd1b47d..2313de5b30a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -94,7 +94,7 @@ mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 From bbb75b1221aedd6fdfdc69b413994adc0a3f6f16 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:53:10 +0100 Subject: [PATCH 154/200] xorg/xf86-video-rendition: 4.2.6 -> 4.2.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a143ae86fcd..c463d8ce684 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1951,11 +1951,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-rendition-4.2.6"; + name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; - sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; + url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2; + sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 2313de5b30a..248329753e1 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -95,7 +95,7 @@ mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 From 2a0c13fa14a5e508f293274792fd4e27d3f0d89c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:54:48 +0100 Subject: [PATCH 155/200] xorg/xf86-video-vmware: 13.2.1 -> 13.3.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c463d8ce684..dc71c5a0803 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2146,11 +2146,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vmware-13.2.1"; + name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; - sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2; + sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 248329753e1..23aafc65304 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -110,7 +110,7 @@ mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 From f0e564c260c84165e5344398fde0c916992c5c51 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:58:13 +0100 Subject: [PATCH 156/200] xorg/xf86-video-v4l: 0.2.0 -> 0.3.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dc71c5a0803..0e21aea6a69 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2107,11 +2107,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-v4l-0.2.0"; + name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-v4l-0.2.0.tar.bz2; - sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; + url = mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2; + sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 23aafc65304..934e3ca40a7 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -107,7 +107,7 @@ mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-v4l-0.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 From 1c8a40981e5315b5ac8f81411dd21ad12f8300c4 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 14:59:35 +0100 Subject: [PATCH 157/200] xorg/xkill: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0e21aea6a69..2703f3c62f3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2341,11 +2341,11 @@ lib.makeScope newScope (self: with self; { }) {}; xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xkill-1.0.4"; + name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; - sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; + url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2; + sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 934e3ca40a7..163afc1fdc2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -41,7 +41,7 @@ mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 From 6559206ff6af11993a18aa030d6de1ed0e3c88b4 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:00:41 +0100 Subject: [PATCH 158/200] xorg/xlsclients: 1.1.3 -> 1.1.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2703f3c62f3..6ad58625247 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2367,11 +2367,11 @@ lib.makeScope newScope (self: with self; { }) {}; xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsclients-1.1.3"; + name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; - sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; + url = mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2; + sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 163afc1fdc2..ffa3bad38e5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -43,7 +43,7 @@ mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 From 1d356fa37b581ff95baa5438c41082d8939495e6 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:01:39 +0100 Subject: [PATCH 159/200] xorg/xprop: 1.2.2 -> 1.2.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6ad58625247..a80d68ecd19 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2510,11 +2510,11 @@ lib.makeScope newScope (self: with self; { }) {}; xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.2"; + name = "xprop-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; - sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; + url = mirror://xorg/individual/app/xprop-1.2.3.tar.bz2; + sha256 = "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ffa3bad38e5..280d9486ad0 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -49,7 +49,7 @@ mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/app/xpr-1.0.4.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 From 373595eb77ad16a793c6127dae8397a782d89078 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:02:52 +0100 Subject: [PATCH 160/200] xorg/xpr: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a80d68ecd19..d834dc42669 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2497,11 +2497,11 @@ lib.makeScope newScope (self: with self; { }) {}; xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xpr-1.0.4"; + name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xpr-1.0.4.tar.bz2; - sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; + url = mirror://xorg/individual/app/xpr-1.0.5.tar.bz2; + sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 280d9486ad0..46efe28b1c9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -48,7 +48,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 -mirror://xorg/individual/app/xpr-1.0.4.tar.bz2 +mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 From 12145ac403e18b67c6da4b285a9ee7e065661f32 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:12:46 +0100 Subject: [PATCH 161/200] xorg/xlsfonts: 1.0.5 - 1.0.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d834dc42669..5796685f4ae 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2380,11 +2380,11 @@ lib.makeScope newScope (self: with self; { }) {}; xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xlsfonts-1.0.5"; + name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; - sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; + url = mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2; + sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 46efe28b1c9..0591dc7e7e2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -44,7 +44,7 @@ mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 -mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 +mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 From 526d0b5a2fffc3996d2a39572e3adf11493b619f Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:14:21 +0100 Subject: [PATCH 162/200] xorg/xrdb: 1.1.0 -> 1.1.1 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5796685f4ae..5cee46dad1b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2536,11 +2536,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.1.0"; + name = "xrdb-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; - sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; + url = mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2; + sha256 = "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0591dc7e7e2..67c4d4567eb 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -51,7 +51,7 @@ mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 -mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 +mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.0.tar.bz2 From 71648beaaa619ed7515649dee98aef764a13f482 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:15:25 +0100 Subject: [PATCH 163/200] xorg/xsetroot: 1.1.0 -> 1.1.2 --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5cee46dad1b..c89f2ce91a6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2574,16 +2574,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation { - name = "xsetroot-1.1.0"; + xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xsetroot-1.1.0.tar.bz2; - sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; + url = mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2; + sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 67c4d4567eb..77a6bb6b2d3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -54,7 +54,7 @@ mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 -mirror://xorg/individual/app/xsetroot-1.1.0.tar.bz2 +mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 From 057bc147dcd554e0c2b93f518e343d97daa96702 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:17:05 +0100 Subject: [PATCH 164/200] xorg/xset: 1.2.3 -> 1.2.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c89f2ce91a6..f7ed6e21307 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2562,11 +2562,11 @@ lib.makeScope newScope (self: with self; { }) {}; xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { - name = "xset-1.2.3"; + name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; - sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; + url = mirror://xorg/individual/app/xset-1.2.4.tar.bz2; + sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 77a6bb6b2d3..69053ec084c 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -53,7 +53,7 @@ mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 -mirror://xorg/individual/app/xset-1.2.3.tar.bz2 +mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 From 92b45380ebd769a39bd23c1f1c2b5ca711bff840 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:18:41 +0100 Subject: [PATCH 165/200] xorg/xwud: 1.0.4 -> 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f7ed6e21307..fbcd22a45b9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2640,11 +2640,11 @@ lib.makeScope newScope (self: with self; { }) {}; xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwud-1.0.4"; + name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwud-1.0.4.tar.bz2; - sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; + url = mirror://xorg/individual/app/xwud-1.0.5.tar.bz2; + sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 69053ec084c..0da7a67c072 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -58,7 +58,7 @@ mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 -mirror://xorg/individual/app/xwud-1.0.4.tar.bz2 +mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 From 97eb0c724cc5cee87ea4335e54564dfa88d6b2fe Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:20:23 +0100 Subject: [PATCH 166/200] xorg/xwininfo: 1.1.3 -> 1.1.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fbcd22a45b9..3ff29ac4443 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2627,11 +2627,11 @@ lib.makeScope newScope (self: with self; { }) {}; xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { - name = "xwininfo-1.1.3"; + name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; - sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; + url = mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2; + sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0da7a67c072..55767c9f36b 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -57,7 +57,7 @@ mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 -mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 From 2a95041a6c945a66fdd8c37d5663676bf7dcaadf Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:21:22 +0100 Subject: [PATCH 167/200] xorg/xwd: 1.0.6 -> 1.0.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3ff29ac4443..cb86e8c973e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2614,11 +2614,11 @@ lib.makeScope newScope (self: with self; { }) {}; xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwd-1.0.6"; + name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; - sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; + url = mirror://xorg/individual/app/xwd-1.0.7.tar.bz2; + sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 55767c9f36b..074c2a6b878 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -56,7 +56,7 @@ mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 -mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 +mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 From 940472899451ace98ac561344e128ef1f65ca7cf Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:22:26 +0100 Subject: [PATCH 168/200] xorg/xrefresh: 1.0.5 -> 1.0.6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cb86e8c973e..ffcf35d9d5e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2549,11 +2549,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xrefresh-1.0.5"; + name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; - sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; + url = mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2; + sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 074c2a6b878..f79ea1f7139 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -52,7 +52,7 @@ mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 -mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 +mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 From f8d909ccc85c61aeabdc1b921c9215d829b85fe0 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:23:39 +0100 Subject: [PATCH 169/200] xorg/twm: 1.0.9 -> 1.0.10 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ffcf35d9d5e..96aee0680ed 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1236,11 +1236,11 @@ lib.makeScope newScope (self: with self; { }) {}; twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "twm-1.0.9"; + name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; - sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; + url = mirror://xorg/individual/app/twm-1.0.10.tar.bz2; + sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f79ea1f7139..83bc2bfb9c9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -18,7 +18,7 @@ mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 -mirror://xorg/individual/app/twm-1.0.9.tar.bz2 +mirror://xorg/individual/app/twm-1.0.10.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 From cacc649518fa38953b3943253a05d42e4c12b46e Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:24:41 +0100 Subject: [PATCH 170/200] xorg/xf86-video-i740: 1.3.6 -> 1.4.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 96aee0680ed..58a109e6739 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1808,11 +1808,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i740-1.3.6"; + name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; - sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; + url = mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2; + sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 83bc2bfb9c9..0b5276c1345 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -84,7 +84,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 From b39fb3eceaccd4b34f45bdce05951afc08a74619 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:25:30 +0100 Subject: [PATCH 171/200] xorg/libSM: 1.2.2 -> 1.2.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 58a109e6739..d4f12c2a0b8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -638,11 +638,11 @@ lib.makeScope newScope (self: with self; { }) {}; libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libSM-1.2.2"; + name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; - sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; + url = mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2; + sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0b5276c1345..cd26da97a3a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -157,7 +157,7 @@ mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 -mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 +mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 From 44c8d99e6ccc70cbeca8e0fdcfce24c072da8aba Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:26:19 +0100 Subject: [PATCH 172/200] xorg/xf86-video-i128: 1.3.6 -> 1.4.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d4f12c2a0b8..f5f5526f3c7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1795,11 +1795,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i128-1.3.6"; + name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; - sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; + url = mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2; + sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cd26da97a3a..e870e73c8f7 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -83,7 +83,7 @@ mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 From 06324d92753a7d71deec46cb78a4450d5eea6abc Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:27:24 +0100 Subject: [PATCH 173/200] xorg/xf86-video-mga: 1.6.5 -> 2.0.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f5f5526f3c7..6843e4ebcf8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1847,11 +1847,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mga-1.6.5"; + name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; - sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; + url = mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2; + sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e870e73c8f7..ef993f1694d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -87,7 +87,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 From cc6cf8ceee5ca6ea221b21c019135eddcb71704b Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:32:06 +0100 Subject: [PATCH 174/200] xorg/editres: init at 1.0.7 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6843e4ebcf8..8eacb374a84 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -44,6 +44,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + editres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "editres-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/editres-1.0.7.tar.bz2; + sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.4"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ef993f1694d..0cb95a562b5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -9,6 +9,7 @@ https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 +mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From f31d54a4836454ce64c63ccfb7c3bce4d07da99d Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:33:43 +0100 Subject: [PATCH 175/200] xorg/listres: init at 1.0.4 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8eacb374a84..57fb1c2a5ba 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1144,6 +1144,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + listres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "listres-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/listres-1.0.4.tar.bz2; + sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXmu xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0cb95a562b5..286ef8c8b1a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -10,6 +10,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/editres-1.0.7.tar.bz2 +mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 61750944780febe8e64eb20d0532a53eaa33d9c2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:34:45 +0100 Subject: [PATCH 176/200] xorg/viewres: init at 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 57fb1c2a5ba..bfefe3b994e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1287,6 +1287,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + viewres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "viewres-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/viewres-1.0.5.tar.bz2; + sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXmu libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.0"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 286ef8c8b1a..812a06f10a4 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,6 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 +mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From aadee8046ae58244d47344254205459af9400291 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:35:35 +0100 Subject: [PATCH 177/200] xorg/oclock: init at 1.0.4 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bfefe3b994e..4b7bee35a3f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1222,6 +1222,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + name = "oclock-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/oclock-1.0.4.tar.bz2; + sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "sessreg-1.1.1"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 812a06f10a4..364ff3592fc 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -12,6 +12,7 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 +mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 48ef1f27e25c5a0187643e949942f06c55bac729 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:36:41 +0100 Subject: [PATCH 178/200] xorg/xconsole: init at 1.0.7 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4b7bee35a3f..7af171bf69b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1508,6 +1508,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xconsole = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "xconsole-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2; + sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.6"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 364ff3592fc..e5a00545404 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -13,6 +13,7 @@ mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 +mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 55affc7cdf39700fa1624df1d6c9eff59e2a7674 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:37:30 +0100 Subject: [PATCH 179/200] xorg/xtrap: init at 1.0.3 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7af171bf69b..505aa695bf8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2665,6 +2665,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt }: stdenv.mkDerivation { + name = "xtrap-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2; + sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.3"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e5a00545404..115f20e5608 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -14,6 +14,7 @@ mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 +mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 69ba22d17a4c66c2c6bf9f0462e45f6bb88450d8 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:38:14 +0100 Subject: [PATCH 180/200] xorg/ico: init at 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 505aa695bf8..fc11846eb86 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -598,6 +598,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + ico = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "ico-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/ico-1.0.5.tar.bz2; + sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "imake-1.0.7"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 115f20e5608..b8e908a8118 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -15,6 +15,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 +mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 26908f87268f55440efa5612c7a208faf2e4ed09 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:39:06 +0100 Subject: [PATCH 181/200] xorg/transset: init at 1.0.2 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fc11846eb86..34983e36bee 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1287,6 +1287,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + transset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "transset-1.0.2"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/transset-1.0.2.tar.bz2; + sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.10"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b8e908a8118..a6726a363c5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -16,6 +16,7 @@ mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 +mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From cd9b4d78088bd3b808ddd679593f2d60456315f8 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:40:00 +0100 Subject: [PATCH 182/200] xorg/xsm: init at 1.0.4 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 34983e36bee..09114c0b44f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2678,6 +2678,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xsm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + name = "xsm-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xsm-1.0.4.tar.bz2; + sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libX11 libXaw libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a6726a363c5..53f3832ab7a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -17,6 +17,7 @@ mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 +mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 7ca9622ea9fef06079bb0bf82a2f09fbef76b88c Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:41:47 +0100 Subject: [PATCH 183/200] xorg/xload: init at 1.1.3 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 09114c0b44f..c9195cf304c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2444,6 +2444,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "xload-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xload-1.1.3.tar.bz2; + sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.2"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 53f3832ab7a..cf76ed9d7b5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -18,6 +18,7 @@ mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xload-1.1.3.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From e0a9ffc3c3f86c1a3873e8271e17080467b9a0e5 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:43:23 +0100 Subject: [PATCH 184/200] xorg/xfontsel: init at 1.0.6 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c9195cf304c..80fa4b71770 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2288,6 +2288,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "xfontsel-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2; + sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.2.0"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cf76ed9d7b5..d02b1c69784 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -19,6 +19,7 @@ mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 +mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From d9ea05f1a762f292947e292e709032321d704712 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:45:50 +0100 Subject: [PATCH 185/200] xorg/libXaw3d: init at 1.6.3 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 80fa4b71770..633ef00b410 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -741,6 +741,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + libXaw3d = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + name = "libXaw3d-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXcomposite-0.4.4"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d02b1c69784..8aabf5739e4 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -20,6 +20,7 @@ mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 +mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 2be77479e44a53513828e14455401b2ed314bcac Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:48:07 +0100 Subject: [PATCH 186/200] xorg/fonttosfnt: init at 1.0.5 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 633ef00b410..4c7c2bbef08 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -531,6 +531,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + name = "fonttosfnt-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2; + sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc freetype xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8aabf5739e4..928136d419d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -21,6 +21,7 @@ mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 +mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From 50a53b2e7871e53b69aa759de475481347e0b2d2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 15:50:17 +0100 Subject: [PATCH 187/200] xorg/xf86-video-omap: init at 0.4.5 --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4c7c2bbef08..39464c97515 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2028,6 +2028,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videoomap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-omap-0.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2; + sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libdrm xorgserver ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 928136d419d..1f74ad5aa96 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -22,6 +22,7 @@ mirror://xorg/individual/app/xload-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 From b48304439bb0c228604e1ce552f51d8ef0738450 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 16:00:53 +0100 Subject: [PATCH 188/200] xorg: generator script update to support tgz --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 33b3a1ba9ad..938b0b7b2f9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -62,7 +62,7 @@ while (<>) { #next unless $pkg eq "xcbutil"; } - $tarball =~ /\/([^\/]*)\.tar\.(bz2|gz|xz)$/; + $tarball =~ /\/([^\/]*)\.(tar\.(bz2|gz|xz)|tgz)$/; my $pkgName = $1; print " $pkg $pkgName\n"; From 8851116a474342de907ff69ebced1032125e4827 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 16:01:39 +0100 Subject: [PATCH 189/200] xorg/luit: 1.1.1 -> 20181211 --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 39464c97515..34b34911941 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1209,16 +1209,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - luit = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc }: stdenv.mkDerivation { - name = "luit-1.1.1"; + luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + name = "luit-20181211"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/luit-1.1.1.tar.bz2; - sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; + url = ftp://ftp.invisible-island.net/luit/luit-20181211.tgz; + sha256 = "18mf3savxjs29hf4xhhc5h278qy0bbj9ddssx44w0bnlg107jhp1"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libfontenc ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1f74ad5aa96..f2eaab9c267 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -26,7 +26,7 @@ mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 -mirror://xorg/individual/app/luit-1.1.1.tar.bz2 +ftp://ftp.invisible-island.net/luit/luit-20181211.tgz mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 From 2dd21b28265c55510aab5c8ca6334aacf6dc3f10 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 16:21:23 +0100 Subject: [PATCH 190/200] edid-decode: 2017-09-18 -> 2018-12-06 --- pkgs/tools/misc/edid-decode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 246898a7231..5eb4055d5b9 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit }: let - version = "2017-09-18"; + version = "2018-12-06"; in stdenv.mkDerivation rec { name = "edid-decode-unstable-${version}"; src = fetchgit { - url = "git://anongit.freedesktop.org/xorg/app/edid-decode"; - rev = "f56f329ed23a25d002352dedba1e8f092a47286f"; - sha256 = "1qzaq342dsdid0d99y7kj60p6bzgp2zjsmspyckddc68mmz4cs9n"; + url = "git://linuxtv.org/edid-decode.git"; + rev = "6def7bc83dfb0338632e06a8b14c93faa6af8879"; + sha256 = "0v6d6jy309pb02l377l0fpmgfsvcpiqc5bvyrli34v413mhq6p15"; }; installPhase = '' From b981b8e0feffbc12baa68294bb3a291c2f96cffe Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 16:29:26 +0100 Subject: [PATCH 191/200] xorg/xorgserver: 1.19.6 -> 1.20.3 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 34b34911941..2f881d7f8f8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2627,11 +2627,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.19.6"; + name = "xorg-server-1.20.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2; - sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2; + sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f2eaab9c267..50a250e5ced 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -212,4 +212,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2 From fca792353f44b57f2a55bddf2d63385792a7649b Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Mon, 31 Dec 2018 16:41:48 +0100 Subject: [PATCH 192/200] xorg: tarballs listed alphabetically (again) --- pkgs/servers/x11/xorg/tarballs.list | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 50a250e5ced..45b3ae9396a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,3 +1,4 @@ +ftp://ftp.invisible-island.net/luit/luit-20181211.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 @@ -9,42 +10,36 @@ https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 -mirror://xorg/individual/app/editres-1.0.7.tar.bz2 -mirror://xorg/individual/app/listres-1.0.4.tar.bz2 -mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 -mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 -mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 -mirror://xorg/individual/app/ico-1.0.5.tar.bz2 -mirror://xorg/individual/app/transset-1.0.2.tar.bz2 -mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 -mirror://xorg/individual/app/xload-1.1.3.tar.bz2 -mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 -mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 -mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/editres-1.0.7.tar.bz2 +mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 -ftp://ftp.invisible-island.net/luit/luit-20181211.tgz +mirror://xorg/individual/app/ico-1.0.5.tar.bz2 +mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 +mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 +mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/twm-1.0.10.tar.bz2 +mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 +mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 +mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 @@ -56,6 +51,7 @@ mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 +mirror://xorg/individual/app/xload-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 @@ -69,6 +65,8 @@ mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 +mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 @@ -106,6 +104,7 @@ mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 +mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 @@ -176,6 +175,7 @@ mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 +mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 From 23e49b78e5a2904f4fa920ef07d81e58cf4ae339 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 4 Jan 2019 14:10:06 +0100 Subject: [PATCH 193/200] xorg.xorgproto: add legacy support This adds support for e.g. printproto needed for libXp Adapted from @MP2E's patch in #48549 --- pkgs/servers/x11/xorg/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 29a7e39cdd9..a3cc183bb3a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,7 +2,7 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - freetype, tradcpp, fontconfig, + freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, @@ -438,6 +438,9 @@ self: super: xorgproto = super.xorgproto.overrideAttrs (attrs: { buildInputs = []; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ]; + # adds support for printproto needed for libXp + mesonFlags = [ "-Dlegacy=true" ]; }); xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed: From aca57f1aed4068ee374d51b211844972dcb0192f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 Jan 2019 02:28:03 -0800 Subject: [PATCH 194/200] libnice: 0.1.14 -> 0.1.15 Port to meson, split outputs, enable tests. --- .../development/libraries/libnice/default.nix | 45 ++++++++++++++++--- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 8582dc4e1d9..b78c8a8bbe1 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,18 +1,53 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { - name = "libnice-0.1.14"; + name = "libnice-0.1.15"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; + sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + # Fix generating data + # Note: upstream is not willing to merge our fix + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; + sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; + }) + + # Fix test-different-number-streams + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch; + sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z"; + }) + # Fix test-gstreamer + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch; + sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0"; + }) + ]; + + nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; propagatedBuildInputs = [ glib gupnp-igd ]; - doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory" + mesonFlags = [ + "-Dgupnp=enabled" + "-Dgstreamer=enabled" + "-Dignored-network-interface-prefix=enabled" + "-Dexamples=enabled" + "-Dtests=enabled" + "-Dgtk_doc=enabled" + "-Dintrospection=enabled" + ]; + + doCheck = true; meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/; From d3697b0bb9aad8f20563435325a34e7c59b49623 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 5 Jan 2019 14:40:29 +0100 Subject: [PATCH 195/200] ed: 1.14.2 -> 1.15 (#53415) Release announcement: http://lists.gnu.org/archive/html/info-gnu/2019-01/msg00003.html --- pkgs/applications/editors/ed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index afbd6d908c3..90a7eeffb04 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (rec { name = "ed-${version}"; - version = "1.14.2"; + version = "1.15"; src = fetchurl { url = "mirror://gnu/ed/${name}.tar.lz"; - sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm"; + sha256 = "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d"; }; nativeBuildInputs = [ lzip ]; From 2712f12244b78e05eddd37770478a84e929ef19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 10 Jan 2019 07:58:20 +0100 Subject: [PATCH 196/200] gtk3: fix segfaults when opening dialogs Fixes https://github.com/NixOS/nixpkgs/issues/53697 Closes https://github.com/NixOS/nixpkgs/pull/53736 --- pkgs/development/libraries/gtk+/3.x.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5c6cd2c7eda..01133b92ee1 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -35,11 +35,16 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/issues/1521 + # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1521 (fetchpatch { url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; }) + # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1523 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch; + sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf"; + }) ]; buildInputs = [ libxkbcommon epoxy json-glib isocodes ] From 74a64a8a616a613cf8918954091cbaa2bfdc75ed Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Jan 2019 18:03:40 +0100 Subject: [PATCH 197/200] systemd: 239 -> 239.20190110 Fixes CVE-2018-16864 & CVE-2018-16865 (journald stack clash). Fixes #53755. Also updates the debian patches to fix CVE-2018-15686. Fixes #52250. --- pkgs/os-specific/linux/systemd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1d45109ac85..d4623ccd633 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "239"; + version = "239.20190110"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "31859ddd35fc3fa82a583744caa836d356c31d7f"; - sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1"; + rev = "nixos-v${version}"; + sha256 = "1m9mhv7b4kfa43z79106gpgxx51zlhvvfjrlmimdsvsiw72nzldj"; }; prePatch = let @@ -37,8 +37,8 @@ in stdenv.mkDerivation rec { # When the URL disappears, it typically means that Debian has new patches # (probably security) and updating to new tarball will apply them as well. name = "systemd-debian-patches.tar.xz"; - url = mirror://debian/pool/main/s/systemd/systemd_239-11~bpo9+1.debian.tar.xz; - sha256 = "136f6p4jbi4z94mf4g099dfcacwka8jwhza0wxxw2q5l5q3xiysh"; + url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz; + sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg"; }; # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/* in '' From 3cd97916fe5d1fa5d24d87c2b1e98f837e1206c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Jan 2019 11:20:43 +0100 Subject: [PATCH 198/200] xorg xcursor-themes: fix build after #53127 --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a3cc183bb3a..27fc33e764b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -616,7 +616,7 @@ self: super: }); xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [self.xcursorgen]; + buildInputs = attrs.buildInputs ++ [ self.xcursorgen self.xorgproto ]; configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }); From 3d730814998c6f7ac8bfb753b9514a0df4a9d183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Jan 2019 12:11:05 +0100 Subject: [PATCH 199/200] libnice: avoid one test for now /cc #53293. --- pkgs/development/libraries/libnice/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index b78c8a8bbe1..32529d83914 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { }) ]; + # TMP: one test is still problematic, apparently + postPatch = "sed '/test-drop-invalid/d' -i tests/meson.build"; + nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; propagatedBuildInputs = [ glib gupnp-igd ]; From 3131a8ea84a35437b5617598dc3fd3d0bb135829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Jan 2019 17:14:27 +0100 Subject: [PATCH 200/200] libnice: disable all tests for now :-( Before this commit it built fine a few times for me, i.e. without the single test, but it failed on Hydra anyway. I guess jtojnar also tested the final expression with all tests, so apparently they are sensitive the the kind of machine they run on. --- pkgs/development/libraries/libnice/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 32529d83914..e71bcd0e368 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -33,9 +33,6 @@ stdenv.mkDerivation rec { }) ]; - # TMP: one test is still problematic, apparently - postPatch = "sed '/test-drop-invalid/d' -i tests/meson.build"; - nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; propagatedBuildInputs = [ glib gupnp-igd ]; @@ -50,7 +47,8 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" ]; - doCheck = true; + # TODO; see #53293 etc. + #doCheck = true; meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/;