From 61da203324125f1969da086cb297c1ecd76350a6 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sun, 12 Apr 2020 15:04:02 +0200 Subject: [PATCH 001/400] boot.initrd.luks: remove x86_64/i586 AES modules Commit 1d2c3279311e4f03fcf164e1366f2fda9f4bfccf in the upstream kernel repository removed support for the scalar x86_64 and i586 AES assembly implementations, since the generic AES implementation generated by the compiler is faster for both platforms. Remove the modules from the cryptoModules list. This causes a regression for kernel versions >=5.4 which include the removal. This should have no negative impact on AES performance on older kernels since the generic implementation should be faster there as well since the implementation was hardly touched from its initial submission. Fixes #84842 --- nixos/modules/system/boot/luksroot.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 31f1e22cda3..7e406f37c13 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -467,8 +467,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" "af_alg" "algif_skcipher" - - (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' A list of cryptographic kernel modules needed to decrypt the root device(s). From 1919db9478fb55dbbaead3a1342927fa80d105ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 17:35:50 +0000 Subject: [PATCH 002/400] capnproto: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/capnproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 9020ccf08b5..ad2517f2589 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969"; + sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i"; }; meta = with stdenv.lib; { From bdbffbe91b7d66649c3710c535c6f1268e5d5a00 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 6 May 2020 00:45:01 -0400 Subject: [PATCH 003/400] hwdata: 0.316 -> 0.335 --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 2f6e6cd5cc9..9b54f404f72 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.316"; + version = "0.335"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; + sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; + outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l"; meta = { homepage = "https://github.com/vcrhonek/hwdata"; From 7127dd3fb63f179d8ed40ef4884d8cf44278fd27 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 22 May 2020 22:19:38 +0200 Subject: [PATCH 004/400] gen-oath-safe: add dependency on file command --- pkgs/tools/security/gen-oath-safe/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 15b8820bfd5..68536a519aa 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: +{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: stdenv.mkDerivation rec { pname = "gen-oath-safe"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { let path = stdenv.lib.makeBinPath [ coreutils + file libcaca.bin openssl.bin python From d782c3daed3caf6bfeddec547c8161e1b06171dc Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 13 Jun 2020 08:34:56 +0300 Subject: [PATCH 005/400] cdetheme: small adjustments --- pkgs/data/themes/{cde-motif-theme => cdetheme}/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/data/themes/{cde-motif-theme => cdetheme}/default.nix (95%) diff --git a/pkgs/data/themes/cde-motif-theme/default.nix b/pkgs/data/themes/cdetheme/default.nix similarity index 95% rename from pkgs/data/themes/cde-motif-theme/default.nix rename to pkgs/data/themes/cdetheme/default.nix index cc83047e3cc..ae738604751 100644 --- a/pkgs/data/themes/cde-motif-theme/default.nix +++ b/pkgs/data/themes/cdetheme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - pname = "cde-motif-theme"; + pname = "cdetheme"; version = "1.3"; src = fetchFromGitHub { @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ gnidorah ]; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26a5e269629..3f74c5ef317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17885,7 +17885,7 @@ in cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cde-motif-theme { }; + cde-gtk-theme = callPackage ../data/themes/cdetheme { }; charis-sil = callPackage ../data/fonts/charis-sil { }; From 5c4f17c50eae8a95db71295d16785f42abc8002e Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Tue, 16 Jun 2020 10:27:30 +0200 Subject: [PATCH 006/400] sequoia: 0.16.0 -> 0.17.0 --- pkgs/tools/security/sequoia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index e6081fbf472..1eb941e852e 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"; + sha256 = "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb"; }; - cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha"; + cargoSha256 = "074bbr7dfk8cqdarrjy4sm37f5jmv2l5gwwh3zcmy2wrfg7vi1h6"; nativeBuildInputs = [ pkgconfig From c26c77b5a33c13af80fd533f2712b7dd7a587dfc Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Wed, 17 Jun 2020 12:44:24 +0200 Subject: [PATCH 007/400] sequoia: exclude tests for 'sequoia-store' Tests for 'sequoia-store' often error with 'Too many open filehandles' on ofBorg and Hydra. Exclude them until a better solution can be found. --- pkgs/tools/security/sequoia/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 1eb941e852e..0700988adbd 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -56,6 +56,10 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + # Please check if this is still needed when updating. + # Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. + CARGO_TEST_ARGS = " --all --exclude sequoia-store"; + postPatch = '' # otherwise, the check fails because we delete the `.git` in the unpack phase substituteInPlace openpgp-ffi/Makefile \ From 3068eb8e90bc8037dc8a760d1aea99c2162e5154 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 17 Jun 2020 13:26:03 +0200 Subject: [PATCH 008/400] faad2: 2.8.8 -> 2.9.2 - change upstream to GitHub - use autoreconfHook Fixes: https://nvd.nist.gov/vuln/detail/CVE-2019-6956 Changelog: https://github.com/knik0/faad2/blob/2_9_2/ChangeLog --- pkgs/development/libraries/faad2/default.nix | 38 +++++--------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 1a6d67ba805..7040ad0f451 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -1,44 +1,24 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub, autoreconfHook , drmSupport ? false # Digital Radio Mondiale }: with stdenv.lib; stdenv.mkDerivation rec { pname = "faad2"; - version = "2.8.8"; + version = "2.9.2"; - src = fetchurl { - url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; - sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; + src = fetchFromGitHub { + owner = "knik0"; + repo = "faad2"; + rev = builtins.replaceStrings [ "." ] [ "_" ] version; + sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c"; }; - patches = let - fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { - url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" - + "/debian/patches/${pname}.patch?inline=false"; - inherit name sha256; - }; - in [ - (fp { - # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) - pname = "0004-Fix-a-couple-buffer-overflows"; - sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; - }) - (fp { - name = "CVE-2018-20362.patch"; - pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; - sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; - }) - (fp { - name = "CVE-2018-20194.patch"; - pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; - sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; - }) - ]; - configureFlags = [] ++ optional drmSupport "--with-drm"; + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://www.audiocoding.com/faad2.html"; From 5693ae4ba98cfa7b9729597938b3b93f487c2c84 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 19 Jun 2020 19:24:39 +0200 Subject: [PATCH 009/400] sqlite: 3.32.2 -> 3.32.3 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 35d3d062ab7..cd0042e722a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.2"; + version = "3.32.3"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid"; + sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; }; outputs = [ "bin" "dev" "out" ]; From 263ee09508bd51506664346e28293d1f258fec27 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 19 Jun 2020 19:24:53 +0200 Subject: [PATCH 010/400] sqlite-analyzer: 3.32.2 -> 3.32.3 --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index cf8a9aaa732..5c65c84e54d 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.32.2"; + version = "3.32.3"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0"; + sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk"; }; nativeBuildInputs = [ unzip ]; From 5afd967d702b4ba38b9ed61c9fa77b9441cf956d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 19 Jun 2020 19:44:11 +0200 Subject: [PATCH 011/400] efibootmgr: Fix the cross compilation --- pkgs/tools/system/efibootmgr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 3323ac24897..dd898de0fc2 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # We have no LTO here since commit 22284b07. postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; - makeFlags = [ "EFIDIR=nixos" ]; + makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ]; installFlags = [ "prefix=$(out)" ]; From bf965338df18335c1894855566badd0a4ecbccfa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Jun 2020 00:32:06 +0200 Subject: [PATCH 012/400] openldap: Fix the cross compilation --- pkgs/development/libraries/openldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a4274f064e5..56955b88ee4 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' - make $makeFlags -C contrib/slapd-modules/passwd/sha2 - make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 + make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2 ''; doCheck = false; # needs a running LDAP server From e09a802795bea71a69550808478400efdd3a8780 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:15 +0000 Subject: [PATCH 013/400] [cpan2nix] perlPackages.ArchiveTar: 2.32 -> 2.36 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e212da33769..002db57b078 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -720,10 +720,10 @@ let ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "2.32"; + version = "2.36"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz"; - sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.36.tar.gz; + sha256 = "16ba52e0babe54f8c4deb11b103a46186763173607d59649130d0fffdd36968e"; }; meta = { description = "Manipulates TAR archives"; From b6fc3ce6ecd82db10b5185619c17f5a8e8e1c1a1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:16 +0000 Subject: [PATCH 014/400] [cpan2nix] perlPackages.BCOW: 0.002 -> 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 002db57b078..3e72bdd7722 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1019,10 +1019,10 @@ let BCOW = buildPerlPackage { pname = "B-COW"; - version = "0.002"; + version = "0.004"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz"; - sha256 = "0z2px2x15vr1y5rxsv7d80kh186ld7a45nbm4lsbs07g8y0p7rzw"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz; + sha256 = "0lazb25jzhdha4dmrkdxn1pw1crc6iqzspvcq315p944xmsvgbzw"; }; meta = { description = "B::COW additional B helpers to check COW status"; From 2dbf1288c014f96dc9f64988911e62a64008d00e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:17 +0000 Subject: [PATCH 015/400] [cpan2nix] perlPackages.BusinessISSN: 1.003 -> 1.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3e72bdd7722..702dd6729df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1236,10 +1236,10 @@ let BusinessISSN = buildPerlPackage { pname = "Business-ISSN"; - version = "1.003"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz"; - sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz; + sha256 = "97ecab15d24d11e2852bf0b28f84c8798bd38402a0a69e17be0e6689b272715e"; }; meta = { description = "Work with International Standard Serial Numbers"; From 9b5f3108adf4d3cf2c615b615fbd290e54f4bc8d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:17 +0000 Subject: [PATCH 016/400] [cpan2nix] perlPackages.CGIMinimal: 1.29 -> 1.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 702dd6729df..64a358ee43c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2211,10 +2211,10 @@ let CGIMinimal = buildPerlModule { pname = "CGI-Minimal"; - version = "1.29"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz"; - sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; + url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz; + sha256 = "b94d50821b02611da6ee5423193145078c4dbb282f2b162a4b0d58094997bc47"; }; meta = { description = "A lightweight CGI form processing package"; From 4e90248cd337a52206b4f1ad915de095368891b5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:18 +0000 Subject: [PATCH 017/400] [cpan2nix] perlPackages.CPANPerlReleases: 5.20200120 -> 5.20200607 --- 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 64a358ee43c..f48644cb3df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3483,10 +3483,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20200120"; + version = "5.20200607"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz"; - sha256 = "0xhn05aiyrdcxhmps0qg9ivr9p7278mjix7719rv2k5kd2nf1jg8"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200607.tar.gz; + sha256 = "0x09ghg5s69kajpw19qs8bhdzma900ipry4zizi37qcdby3kadf1"; }; meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; From ef59078fbc45f9a738695ea247452b7c3f0f2266 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:18 +0000 Subject: [PATCH 018/400] [cpan2nix] perlPackages.CacheFastMmap: 1.48 -> 1.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 f48644cb3df..d4a8fa6ce8e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1275,10 +1275,10 @@ let CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.48"; + version = "1.49"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz"; - sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz; + sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm"; }; }; From 25465a25bfb7450eddd8975125490ea84e9892e8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:18 +0000 Subject: [PATCH 019/400] [cpan2nix] perlPackages.CacheMemcachedFast: 0.25 -> 0.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4a8fa6ce8e..ffbc48e4266 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1310,10 +1310,10 @@ let CacheMemcachedFast = buildPerlPackage { pname = "Cache-Memcached-Fast"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz"; - sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; + url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz; + sha256 = "16m0xafidycrlcvbv3zmbr5pzvqyqyr2qb0khpry99nc4bcld3jy"; }; meta = { description = "Perl client for B, in C language"; From 6679ba3f279498a8370225b72202c685a4d958e1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:23 +0000 Subject: [PATCH 020/400] [cpan2nix] perlPackages.commonsense: 3.74 -> 3.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 ffbc48e4266..ab2f04d26c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2864,10 +2864,10 @@ let commonsense = buildPerlPackage { pname = "common-sense"; - version = "3.74"; + version = "3.75"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz"; - sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz; + sha256 = "0zhfp8f0czg69ycwn7r6ayg6idm5kyh2ai06g5s6s07kli61qsm8"; }; meta = { description = "Implements some sane defaults for Perl programs"; From 6824f1b1b92bfd298b51de17186e7b642cee0cf2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:23 +0000 Subject: [PATCH 021/400] [cpan2nix] perlPackages.CompressBzip2: 2.26 -> 2.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 ab2f04d26c2..51c8cda07b0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2877,10 +2877,10 @@ let CompressBzip2 = buildPerlPackage { pname = "Compress-Bzip2"; - version = "2.26"; + version = "2.27"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz"; - sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.27.tar.gz; + sha256 = "a284c506ac8ef5b02136a15814271dcba10400b5ce818359cf3325ccde7bb3d3"; }; meta = { description = "Interface to Bzip2 compression library"; From c982c1254f0c041fe28e052a654f7110e8844f71 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:25 +0000 Subject: [PATCH 022/400] [cpan2nix] perlPackages.CryptECB: 2.21 -> 2.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51c8cda07b0..fa5ea3cfb25 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3595,10 +3595,10 @@ let CryptECB = buildPerlPackage { pname = "Crypt-ECB"; - version = "2.21"; + version = "2.22"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.21.tar.gz"; - sha256 = "890f8b3040220ea705ee5ca4f9bd23435a1779bc3ffa75533736e6c9c21d1015"; + url = mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz; + sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa"; }; meta = with stdenv.lib; { description = "Use block ciphers using ECB mode"; From a902ff99e8d13e2a2460e64562055e4994dbe7e5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:28 +0000 Subject: [PATCH 023/400] [cpan2nix] perlPackages.CryptX: 0.066 -> 0.068 --- 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 fa5ea3cfb25..21d0a6b7c45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3994,10 +3994,10 @@ let CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.066"; + version = "0.068"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz"; - sha256 = "e7e823ac4db0b452e885b0e0d5adfc8a9c5f688938f1adf3f1d91432b3238335"; + url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.068.tar.gz; + sha256 = "b1806a1fa4d4b8c9265f44ac706eb0b05107d644edb24ffea1b507168e88fd59"; }; meta = { description = "Crypto toolkit"; From 12ebbef0eaf48248aa4fd80d9b4290ababe8a314 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:28 +0000 Subject: [PATCH 024/400] [cpan2nix] perlPackages.DBI: 1.642 -> 1.643 --- 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 21d0a6b7c45..969cc39f9b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5209,10 +5209,10 @@ let DBI = buildPerlPackage { pname = "DBI"; - version = "1.642"; + version = "1.643"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz"; - sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz; + sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI From ebeaeb6aa14590072f9c6aa46a27066ed1c6ef81 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:30 +0000 Subject: [PATCH 025/400] [cpan2nix] perlPackages.DataSerializer: 0.60 -> 0.65 --- 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 969cc39f9b9..60a856eb118 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4318,10 +4318,10 @@ let DataSerializer = buildPerlModule { pname = "Data-Serializer"; - version = "0.60"; + version = "0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz"; - sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; + url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.65.tar.gz; + sha256 = "048zjy8valnil8yawa3vrxr005rz95gpfwvmy2jq0g830195l58j"; }; meta = { description = "Modules that serialize data structures"; From 3c75b3363076b5fe36f0843845ae42b7aa9dc07d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:30 +0000 Subject: [PATCH 026/400] [cpan2nix] perlPackages.DataUUID: 1.224 -> 1.226 --- 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 60a856eb118..0f031aa6319 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4450,10 +4450,10 @@ let DataUUID = buildPerlPackage { pname = "Data-UUID"; - version = "1.224"; + version = "1.226"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz"; - sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz; + sha256 = "0lv4k4ibxwkw7zz9hw97s34za9nvjxb4kbmgmx5sj4fll3zmfg89"; }; }; From 0d4df4884cf40305bc0cddee42e7d25edbbc0dda Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:31 +0000 Subject: [PATCH 027/400] [cpan2nix] perlPackages.DevelHide: 0.0010 -> 0.0013 --- 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 0f031aa6319..22e02ae8ee8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5558,10 +5558,10 @@ let DevelHide = buildPerlPackage { pname = "Devel-Hide"; - version = "0.0010"; + version = "0.0013"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz"; - sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz; + sha256 = "1jvyy3yasiwyjsn9ay9sja3ch4wcjc4wk5l22vjsclq29z7vphvg"; }; }; From ff30a6e7b92ba63c41195603bb7d068dcf95cb2a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:32 +0000 Subject: [PATCH 028/400] [cpan2nix] perlPackages.DevelPPPort: 3.56 -> 3.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22e02ae8ee8..c4d259f9c24 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5000,10 +5000,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.56"; + version = "3.58"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz"; - sha256 = "628476dbfeb7be92471e48f75fe0d36659b92493669ebd02cf04e3a13429521b"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.58.tar.gz; + sha256 = "531ff79f9e74962df2dba7b2e526b8a5208cfb6bcdc01d85732fda8c1fde0c00"; }; meta = { description = "Perl/Pollution/Portability"; From 47cc3e941abf0c85337689e186bc5377824a9582 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:34 +0000 Subject: [PATCH 029/400] [cpan2nix] perlPackages.Encode: 3.02 -> 3.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 c4d259f9c24..eec7dddd831 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6401,10 +6401,10 @@ let Encode = buildPerlPackage { pname = "Encode"; - version = "3.02"; + version = "3.06"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz"; - sha256 = "5865be4951870f62f43722818d076d7724306c75c8f268346b282351cbc820a8"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.06.tar.gz; + sha256 = "5b2dcd6861287880584e63b2e518840d483aa38da70194cf64d9957282851eea"; }; meta = { description = "Character encodings in Perl"; From d7e133afdf1123b87265cb301b77dace8545573e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:36 +0000 Subject: [PATCH 030/400] [cpan2nix] perlPackages.ExporterTiny: 1.002001 -> 1.002002 --- 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 eec7dddd831..9b365cfb961 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6676,10 +6676,10 @@ let ExporterTiny = buildPerlPackage { pname = "Exporter-Tiny"; - version = "1.002001"; + version = "1.002002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz"; - sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz; + sha256 = "00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101"; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; From 57575a6d3fbe2e5e1ced95d4db30c38e231a2318 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:42 +0000 Subject: [PATCH 031/400] [cpan2nix] perlPackages.FileSlurp: 9999.29 -> 9999.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b365cfb961..fbe0a1c6310 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7511,10 +7511,10 @@ let FileSlurp = buildPerlPackage { pname = "File-Slurp"; - version = "9999.29"; + version = "9999.30"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz"; - sha256 = "1iqr7qi6rg45f4xa3fp48b30mnbw30xs9izxa5zf6fd6pgh4fvhf"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.30.tar.gz; + sha256 = "0irpx72dk27d7c4cjr08dq4bwwbmq8gsr39hxd44widrn0yicdra"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; From 38a79f136f735254f3188268ed49d14c2d03c10c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:45 +0000 Subject: [PATCH 032/400] [cpan2nix] perlPackages.GitAutofixup: 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 fbe0a1c6310..de3952dd803 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7943,7 +7943,7 @@ let }; GitAutofixup = buildPerlPackage rec { - pname = "GitAutofixup"; + pname = "App-Git-Autofixup"; version = "0.002007"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; From eb6e241b89e637fe000cad9042135e260dbe2441 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:51 +0000 Subject: [PATCH 033/400] [cpan2nix] perlPackages.IPCSystemSimple: 1.26 -> 1.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de3952dd803..f439c3a0a45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9674,10 +9674,10 @@ let IPCSystemSimple = buildPerlPackage { pname = "IPC-System-Simple"; - version = "1.26"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz"; - sha256 = "57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd"; + url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz; + sha256 = "22e6f5222b505ee513058fdca35ab7a1eab80539b98e5ca4a923a70a8ae9ba9e"; }; meta = { description = "Run commands simply, with detailed diagnostics"; From 8c81ef0c0d69e51912fa5d0cb2c5053d25d35b5e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:51 +0000 Subject: [PATCH 034/400] [cpan2nix] perlPackages.Imager: 1.011 -> 1.012 --- 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 f439c3a0a45..a89cf4be1c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9213,10 +9213,10 @@ let Imager = buildPerlPackage { pname = "Imager"; - version = "1.011"; + version = "1.012"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz"; - sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; + url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz; + sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21"; }; 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"; From f67b6951acc55f92c73bf33c1a58f6e2c1d6573f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:52 +0000 Subject: [PATCH 035/400] [cpan2nix] perlPackages.JSONParse: 0.55 -> 0.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a89cf4be1c2..c985e4d1e84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9918,10 +9918,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.55"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz"; - sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; + url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.56.tar.gz; + sha256 = "1d8ir74sgf8kw1a7459ghdhh92kzrzaysapjbw1sb859sfsirkqw"; }; meta = { description = "Read JSON into a Perl variable"; From 4a4de14faabf6ab265470cc078053268a060c63f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:45:57 +0000 Subject: [PATCH 036/400] [cpan2nix] perlPackages.MCE: 1.865 -> 1.872 --- 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 c985e4d1e84..d5940e1695a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10786,10 +10786,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.865"; + version = "1.872"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz"; - sha256 = "1fhrc0mig5rzywz3lki0gkpvm9l9693cwaljzwxkprdkxnvk709c"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.872.tar.gz; + sha256 = "0ydih6w1di5fppcr2s9lxbyf8av7ksgqg0mirrw5mfcr92924p90"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; From 88eb0a95a5cf8945be6a9555c64b5e630441f9be Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:01 +0000 Subject: [PATCH 037/400] [cpan2nix] perlPackages.ModernPerl: 1.20190727 -> 1.20200211 --- 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 d5940e1695a..53a1e10ec1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11831,11 +11831,11 @@ let ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20190727"; + version = "1.20200211"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz"; - sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz; + sha256 = "da1c83cee84fab9edb9e31d7f7abac43e1337b2e66015191ec4b6da59298c480"; }; meta = { homepage = "https://github.com/chromatic/Modern-Perl"; From b441458f862e011e606172c7affdd64e7a67e4ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:03 +0000 Subject: [PATCH 038/400] [cpan2nix] perlPackages.Mojolicious: 8.32 -> 8.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 53a1e10ec1d..598433dc69c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12285,10 +12285,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.32"; + version = "8.54"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz"; - sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.54.tar.gz; + sha256 = "1z8br3i2z72fb9vja5023qzvhq2gh8gmx0bh35fwqj25pgfbkj62"; }; meta = { homepage = "https://mojolicious.org"; From 009e63ff7c83ff4c4b8eedfdcfc5f347ec3a22e6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:03 +0000 Subject: [PATCH 039/400] [cpan2nix] perlPackages.MozillaCA: 20180117 -> 20200520 --- 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 598433dc69c..5171789ab75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13412,10 +13412,10 @@ let MozillaCA = buildPerlPackage { pname = "Mozilla-CA"; - version = "20180117"; + version = "20200520"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz"; - sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz; + sha256 = "b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726"; }; postPatch = '' From 9d5aedaa965ad8cdb1bc5e516dbb362b6715d749 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:04 +0000 Subject: [PATCH 040/400] [cpan2nix] perlPackages.NetIPLite: 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 5171789ab75..bf3a34a0b45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13865,7 +13865,6 @@ let url = "mirror://cpan/authors/id/A/AL/ALEXKOM/Net-IP-Lite-0.03.tar.gz"; sha256 = "c9916e6cfaa53be275379ce4b2a550ae176ddfab50dad43b43ed43e8267802a9"; }; - buildInputs = [ TestException ]; meta = { homepage = "https://metacpan.org/pod/Net::IP::Lite"; description = "Perl extension for manipulating IPv4/IPv6 addresses"; From a311422aa6fd1e2ed995bd3f4a0b47e241be0604 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:05 +0000 Subject: [PATCH 041/400] [cpan2nix] perlPackages.NetOpenSSH: 0.78 -> 0.79 --- 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 bf3a34a0b45..4978b89106c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14439,10 +14439,10 @@ let NetOpenSSH = buildPerlPackage { pname = "Net-OpenSSH"; - version = "0.78"; + version = "0.79"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz"; - sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; + url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz; + sha256 = "4210fa64b50820f91ab4b6c0e02a579543fc071e73fbdec0f476447ca11172cc"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; From e75bac65c5d308ac0d17add70db9af6804c06b35 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:05 +0000 Subject: [PATCH 042/400] [cpan2nix] perlPackages.NetPing: 2.72 -> 2.73 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4978b89106c..938995f55e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13938,10 +13938,10 @@ let NetPing = buildPerlPackage { pname = "Net-Ping"; - version = "2.72"; + version = "2.73"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz"; - sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz; + sha256 = "a5fbeafd3e65778364bead8800ae6a06d468ed68208619b5d4c1debd4d197cf2"; }; meta = { description = "Check a remote host for reachability"; From 3badb3e44de5132ef6105f2e86e38759b31392c5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:10 +0000 Subject: [PATCH 043/400] [cpan2nix] perlPackages.Parent: 0.237 -> 0.238 --- 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 938995f55e1..44de4750aa0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14690,10 +14690,10 @@ let Parent = buildPerlPackage { pname = "parent"; - version = "0.237"; + version = "0.238"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz"; - sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz; + sha256 = "1lfjqjxsvgpsn6ycah4z0qygkykj4v8ca3cdki61k2p2ygg8zx9q"; }; }; From 1c5543ad4119644c8d55a1a6557692a8fcbdb1fe Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:11 +0000 Subject: [PATCH 044/400] [cpan2nix] perlPackages.ParseYapp: 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 44de4750aa0..afc81aad227 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14791,7 +14791,7 @@ let }; ParseYapp = buildPerlPackage { - pname = "Parser-Yapp"; + pname = "Parse-Yapp"; version = "1.21"; src = fetchurl { url = "mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz"; From cd43c302862ac86062f3bc7ce622530c4c66a2bd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:11 +0000 Subject: [PATCH 045/400] [cpan2nix] perlPackages.PathTiny: 0.112 -> 0.114 --- 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 afc81aad227..dc12cb2d719 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14834,10 +14834,10 @@ let PathTiny = buildPerlPackage { pname = "Path-Tiny"; - version = "0.112"; + version = "0.114"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz"; - sha256 = "813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz; + sha256 = "cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1"; }; meta = { description = "File path utility"; From 0cfa1d6ae9d611e1e7d39a3a03f2e918ad87d243 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:13 +0000 Subject: [PATCH 046/400] [cpan2nix] perlPackages.Perlosnames: 0.11 -> 0.122 --- 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 dc12cb2d719..f888499ada6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14944,10 +14944,10 @@ let Perlosnames = buildPerlPackage { pname = "Perl-osnames"; - version = "0.11"; + version = "0.122"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz"; - sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; + url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.122.tar.gz; + sha256 = "7075939d747e375178d00348d00c52ff9db2cebb18bae7473dcb09df825118a0"; }; meta = { description = "List possible $^O ($OSNAME) values, with description"; From 540530d373aae7774c52d0e8baffac872a8225ef Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:17 +0000 Subject: [PATCH 047/400] [cpan2nix] perlPackages.RegexpGrammars: 1.052 -> 1.057 --- 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 f888499ada6..2d04fbf94d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16111,10 +16111,10 @@ let RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.052"; + version = "1.057"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz"; - sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz; + sha256 = "af53c19818461cd701aeb57c49dffdb463edc4bf8f658d9ea4e6d534ac177041"; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; From 8aee13797927134b0ac29f950e583b6af4487cc7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:19 +0000 Subject: [PATCH 048/400] [cpan2nix] perlPackages.ScalarListUtils: 1.53 -> 1.55 --- 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 2d04fbf94d5..e80317ee24e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16314,10 +16314,10 @@ let ScalarListUtils = buildPerlPackage { pname = "Scalar-List-Utils"; - version = "1.53"; + version = "1.55"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz"; - sha256 = "bd4086b066fb3b18a0be2e7d9bc100a99aa0f233ad659492340415c7b2bdae99"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz; + sha256 = "4d2bdc1c72a7bc4d69d6a5cc85bc7566497c3b183c6175b832784329d58feb4b"; }; meta = { description = "Common Scalar and List utility subroutines"; From 80e10eda647e4ec6b849ea120404e9165db1825e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:26 +0000 Subject: [PATCH 049/400] [cpan2nix] perlPackages.SysMmap: 0.19 -> 0.20 --- 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 e80317ee24e..737403ac899 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17487,10 +17487,10 @@ let SysMmap = buildPerlPackage { pname = "Sys-Mmap"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz"; - sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; + url = mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz; + sha256 = "1kz22l7sh2mibliixyshc9958bqlkzsb13agcibp7azii4ncw80q"; }; meta = with stdenv.lib; { description = "Use mmap to map in a file as a Perl variable"; From 1ed5c6384a0d63d3f25ed5886212f4c82bb7f387 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:28 +0000 Subject: [PATCH 050/400] [cpan2nix] perlPackages.TestDeep: 1.128 -> 1.130 --- 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 737403ac899..1af53b6b337 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18292,10 +18292,10 @@ let TestDeep = buildPerlPackage { pname = "Test-Deep"; - version = "1.128"; + version = "1.130"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz"; - sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz; + sha256 = "0mkw18q5agr30djxr1y68rcfw8aq20ws872hmv88f9gnynag8r20"; }; meta = { }; From 4b0c040db5ebbf41ebf81712583565ce48125b67 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:32 +0000 Subject: [PATCH 051/400] [cpan2nix] perlPackages.TestRequires: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1af53b6b337..1bae3789045 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18967,10 +18967,10 @@ let TestRequires = buildPerlPackage { pname = "Test-Requires"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz"; - sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.11.tar.gz; + sha256 = "03q49vi09b4n31kpnmq4v2dga5ja438a8f1wgkgwvvlpjmadx22b"; }; meta = { description = "Checks to see if the module can be loaded"; From 7be74ab62f18906797c04319230df1e28cc2f1a7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:33 +0000 Subject: [PATCH 052/400] [cpan2nix] perlPackages.TestSimple13: 1.302171 -> 1.302175 --- 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 1bae3789045..12b0ffcba4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19194,10 +19194,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302171"; + version = "1.302175"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz"; - sha256 = "e27f90d2b2a6bc6ffa7675a072c2f41d5caffd99858dc69b2030940cc138368a"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302175.tar.gz; + sha256 = "c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49"; }; meta = { description = "Basic utilities for writing tests"; From d65afc1b3e3afa4f71d18115504ea9be5b80d128 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:34 +0000 Subject: [PATCH 053/400] [cpan2nix] perlPackages.Testutf8: 1.01 -> 1.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 12b0ffcba4f..8879aae2133 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20003,10 +20003,10 @@ let Testutf8 = buildPerlPackage { pname = "Test-utf8"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz"; - sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; + url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz; + sha256 = "df82f09c5940830b25a49f1c8162fa24d371e602880edef8d9a4d4bfd66b8bd7"; }; meta = { homepage = "https://github.com/2shortplanks/Test-utf8"; From 79fa72d5802fa00d5d597b3729e82b728da38850 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:34 +0000 Subject: [PATCH 054/400] [cpan2nix] perlPackages.TextAligner: 0.13 -> 0.16 --- 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 8879aae2133..ff5d80447c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19460,10 +19460,10 @@ let TextAligner = buildPerlModule { pname = "Text-Aligner"; - version = "0.13"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz"; - sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.16.tar.gz; + sha256 = "09ap457vrlqvw2544j907fbb5crs08hd7sy4syipzxc6wny7v1aw"; }; meta = { description = "Align text in columns"; From 31044f69052e6ecd91404bb30266863e4767fcfc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:35 +0000 Subject: [PATCH 055/400] [cpan2nix] perlPackages.TextCSV_XS: 1.40 -> 1.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 ff5d80447c0..d7c52fd4dda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19583,10 +19583,10 @@ let TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.40"; + version = "1.43"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz"; - sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675"; + url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.43.tgz; + sha256 = "cd94538e8ae9388d9e9e5527630f38f4d2b766e30310d283f0f9c692b94230bb"; }; meta = { description = "Comma-Separated Values manipulation routines"; From 3e3248a5d54211faaa4c9270b189070bb737af5e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:40 +0000 Subject: [PATCH 056/400] [cpan2nix] perlPackages.TimeDate: 2.31 -> 2.33 --- 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 d7c52fd4dda..f17c35bccf3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20280,10 +20280,10 @@ let TimeDate = buildPerlPackage { pname = "TimeDate"; - version = "2.31"; + version = "2.33"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz"; - sha256 = "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz; + sha256 = "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0"; }; }; From 0465fd1687696528697e2da20997351778fdd157 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:42 +0000 Subject: [PATCH 057/400] [cpan2nix] perlPackages.Tk: 804.034 -> 804.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 f17c35bccf3..50b8212e833 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20403,10 +20403,10 @@ let Tk = buildPerlPackage { pname = "Tk"; - version = "804.034"; + version = "804.035"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz"; - sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; + url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz; + sha256 = "4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; From ae017101ae40d28ac454a3b30d7f433cfc88c7a8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:46 +0000 Subject: [PATCH 058/400] [cpan2nix] perlPackages.YAMLLibYAML: 0.81 -> 0.82 --- 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 50b8212e833..e9c8aa735c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21557,10 +21557,10 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.81"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz"; - sha256 = "1rwmy4kywaa0hypy329gb8wbqdk01bv4179bbnjbg66kzl5ndpvh"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz; + sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02"; }; }; From d2cecddbb4e2d528379d368eb4651f49817e18b6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:53 +0000 Subject: [PATCH 059/400] [cpan2nix] perlPackages.Clone: 0.43 -> 0.45 --- 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 e9c8aa735c9..90247414668 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2795,10 +2795,10 @@ let Clone = buildPerlPackage { pname = "Clone"; - version = "0.43"; + version = "0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz"; - sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz; + sha256 = "1rm9g68fklni63jdkrlgqq6yfj95fm33p2bq90p475gsi8sfxdnb"; }; meta = { description = "Recursively copy Perl datatypes"; From 1caa2fbdfdbbfcfce48ed72cbb79a0b6bcd92e89 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:54 +0000 Subject: [PATCH 060/400] [cpan2nix] perlPackages.ConfigIniFiles: 3.000002 -> 3.000003 --- 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 90247414668..f50d6d59118 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3044,10 +3044,10 @@ let ConfigIniFiles = buildPerlModule { pname = "Config-IniFiles"; - version = "3.000002"; + version = "3.000003"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz"; - sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz; + sha256 = "3c457b65d98e5ff40bdb9cf814b0d5983eb0c53fb8696bda3ba035ad2acd6802"; }; propagatedBuildInputs = [ IOStringy ]; meta = { From 3fe18bae61bdd075e7ecca0b6e3d06ed687d7ac4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:55 +0000 Subject: [PATCH 061/400] [cpan2nix] perlPackages.DBDPg: 3.10.3 -> 3.12.3 --- 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 f50d6d59118..856b8736d88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5149,11 +5149,11 @@ let DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.10.3"; + version = "3.12.3"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz"; - sha256 = "0swj2pkga92z15rnq9f0j9s84j5ancgas0ncd4k230bd8advlgn6"; + url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.12.3.tar.gz; + sha256 = "0rrlg2rwgkpcx67qf7081g7mj2shpqhj2iyxrq5fixf32nb0ad4v"; }; buildInputs = [ pkgs.postgresql ]; From 87cbd6610ff9cd246621534bc34245a744d8bc87 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:46:57 +0000 Subject: [PATCH 062/400] [cpan2nix] perlPackages.EmailMIMEContentType: 1.022 -> 1.024 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 856b8736d88..61bb4580c8d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6278,16 +6278,17 @@ let EmailMIMEContentType = buildPerlPackage { pname = "Email-MIME-ContentType"; - version = "1.022"; + version = "1.024"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz"; - sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz; + sha256 = "42d164ac7ff4dc2ea848e710fe21fa85509a3bcbb91ed2d356e4aba951ed8835"; }; meta = { homepage = "https://github.com/rjbs/Email-MIME-ContentType"; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ TextUnidecode ]; }; EmailMIMEEncodings = buildPerlPackage { From a50f0d43de6b0cca03ed27783feaf3ef555689e6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:01 +0000 Subject: [PATCH 063/400] [cpan2nix] perlPackages.JSONMaybeXS: 1.004000 -> 1.004002 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61bb4580c8d..6c59252a8af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9880,15 +9880,16 @@ let JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; - version = "1.004000"; + version = "1.004002"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz"; - sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz; + sha256 = "1dbpdlrk4pjwbn3wzawwsj57jqzdvi01h4kqpknwbl1n7gf2z3iv"; }; meta = { description = "Use L with a fallback to L and L"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestNeeds ]; }; JSONPP = buildPerlPackage { From 047dd422031384224fe27ea8763e96a73fa2ece6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:06 +0000 Subject: [PATCH 064/400] [cpan2nix] perlPackages.NetDNS: 1.21 -> 1.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c59252a8af..0d73de9ab91 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13721,10 +13721,10 @@ let NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.21"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz"; - sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"; + url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.24.tar.gz; + sha256 = "11a6c2ba6cb1c6640f01c9bbf2036bcbe3974232e9b939ab94985230c92cde63"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From be19007447a9aa1da3aa3ac39cc17cc0fb1d1e65 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:09 +0000 Subject: [PATCH 065/400] [cpan2nix] perlPackages.TestCompile: v2.3.1 -> v2.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 0d73de9ab91..2926ca8bf10 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18238,10 +18238,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz"; - sha256 = "1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.0.tar.gz; + sha256 = "eff7e320527d7a33d9b27443871c1e9d5dbeb11408fb9843c56496f67b99ad78"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { From e2c1366ae403f3dca2a68ec73ce2ad9c9b1ec143 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:12 +0000 Subject: [PATCH 066/400] [cpan2nix] perlPackages.TextTable: 1.133 -> 1.134 --- 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 2926ca8bf10..db01f96f046 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19892,10 +19892,10 @@ let TextTable = buildPerlModule { pname = "Text-Table"; - version = "1.133"; + version = "1.134"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz"; - sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz; + sha256 = "02yigisvgshpgfyqwj0xad4jg473cd80a6c210nb5h5p32dl5kxs"; }; propagatedBuildInputs = [ TextAligner ]; meta = { From cfa2777a58c477da4df5ca361c52edf50000fc9c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:19 +0000 Subject: [PATCH 067/400] [cpan2nix] perlPackages.EV: 4.32 -> 4.33 --- 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 db01f96f046..92a6617d266 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6575,10 +6575,10 @@ let EV = buildPerlPackage { pname = "EV"; - version = "4.32"; + version = "4.33"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz"; - sha256 = "b82a8b89bb9cca475f6242c8621dc2c48f24851ca61558e1bd592b8506752936"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz; + sha256 = "4aee8391b88113b42187f91fd49245fdc8e9b193a15ac202f519caae2aa8ea35"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; From c9f9674edac32b922252dcefb270b5ca21ea38b5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:21 +0000 Subject: [PATCH 068/400] [cpan2nix] perlPackages.Glib: 1.3291 -> 1.3293 --- 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 92a6617d266..ddea332c665 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8004,10 +8004,10 @@ let Glib = buildPerlPackage { pname = "Glib"; - version = "1.3291"; + version = "1.3293"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz"; - sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"; + url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz; + sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 From 25abd3faee1c4c6d12d71920b6573b9e3929124a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:22 +0000 Subject: [PATCH 069/400] [cpan2nix] perlPackages.HTTPTinyish: 0.15 -> 0.16 --- 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 ddea332c665..1c590e2dd1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9186,10 +9186,10 @@ let HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz"; - sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.16.tar.gz; + sha256 = "1a3318b89987c2aa5dd18990a109e8af63049f87e4e1a9357583beed1c3bfbda"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { From 878f74ab966b13ff970523af9a690ddff0296d89 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:22 +0000 Subject: [PATCH 070/400] [cpan2nix] perlPackages.IOPager: 1.01 -> 1.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c590e2dd1d..b15cf5a560a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9477,11 +9477,11 @@ let }; IOPager = buildPerlPackage { - version = "1.01"; + version = "1.03"; pname = "IO-Pager"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz"; - sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa"; + url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz; + sha256 = "13mmykrb391584wkw907zrmy4hg1fa9hj3zw58whdq5bjc66r1mc"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests }; From 4fb1e2ca69eb72b2389f63cd05d948fd9bcfd22d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:22 +0000 Subject: [PATCH 071/400] [cpan2nix] perlPackages.IOSocketSSL: 2.066 -> 2.068 --- 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 b15cf5a560a..994898a0e62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9526,10 +9526,10 @@ let IOSocketSSL = buildPerlPackage { pname = "IO-Socket-SSL"; - version = "2.066"; + version = "2.068"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz"; - sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz; + sha256 = "4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; # Fix path to default certificate store. From e9291b0979daae5cd3c78c058416219e771d38a6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:25 +0000 Subject: [PATCH 072/400] [cpan2nix] perlPackages.StringInterpolate: cleanup dependencies: perlPackages.SafeHole: init at 0.14 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 994898a0e62..f7cc39fac97 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17106,6 +17106,7 @@ let description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; license = licenses.gpl1Plus; }; + propagatedBuildInputs = [ PadWalker SafeHole ]; }; StringMkPasswd = buildPerlPackage { @@ -17409,6 +17410,20 @@ let propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; }; + SafeHole = buildPerlModule { + pname = "Safe-Hole"; + version = "0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz; + sha256 = "01gc2lfli282dj6a2pkpxb0vmpyavs323cbdw15gxi06pn5nxxgl"; + }; + meta = { + description = "lib/Safe/Hole.pm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://github.com/toddr/Safe-Hole"; + }; + }; + Swim = buildPerlPackage { pname = "Swim"; version = "0.1.48"; From a37658308ca1d990faf83a91dbe06c137e35e4c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:30 +0000 Subject: [PATCH 073/400] [cpan2nix] perlPackages.AnyEventHTTP: 2.24 -> 2.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 f7cc39fac97..efc53e38402 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -316,10 +316,10 @@ let AnyEventHTTP = buildPerlPackage { pname = "AnyEvent-HTTP"; - version = "2.24"; + version = "2.25"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz"; - sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.25.tar.gz; + sha256 = "5cfa53416124176f6f4cd32b00ea8ca79a2d5df51258683989cd04fe86e25013"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; }; From 3346fc59ef38c303263f65d77f2a3faf978eda3e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:32 +0000 Subject: [PATCH 074/400] [cpan2nix] perlPackages.CryptJWT: 0.025 -> 0.028 --- 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 efc53e38402..7e020964e67 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3628,12 +3628,12 @@ let CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.025"; + version = "0.028"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz"; - sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d"; + url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.028.tar.gz; + sha256 = "af819a620fa9b2d0432f718fecc3e4d8458d04b932f27fcb6217e0f39027e633"; }; - propagatedBuildInputs = [ CryptX JSONMaybeXS ]; + propagatedBuildInputs = [ CryptX JSON ]; meta = { description = "JSON Web Token"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d822d84ba9c8dee32ac2e5de64111fecddc272d7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:32 +0000 Subject: [PATCH 075/400] [cpan2nix] perlPackages.DevelCheckOS: 1.81 -> 1.83 --- 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 7e020964e67..f128810f4d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4947,12 +4947,12 @@ let DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.81"; + version = "1.83"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz"; - sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz; + sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972"; }; - propagatedBuildInputs = [ DataCompare ]; + propagatedBuildInputs = [ FileFindRule ]; }; DevelLeak = buildPerlPackage rec { From 5dc560f49886ca1956c112143d4264bf50fe6489 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:32 +0000 Subject: [PATCH 076/400] [cpan2nix] perlPackages.DevelPatchPerl: 1.84 -> 2.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 f128810f4d2..5353a9585cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4971,10 +4971,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "1.84"; + version = "2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz"; - sha256 = "1nlil7mq8vc3lbsr5p3zr7jqaclkr0blhmb8sgkyc7mbvhml9jzp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz; + sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { From 2897321f8fef22b14185e815bc869c5df772ed33 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:36 +0000 Subject: [PATCH 077/400] [cpan2nix] perlPackages.POE: 1.367 -> 1.368 --- 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 5353a9585cf..a84b1765d85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15335,14 +15335,14 @@ let POE = buildPerlPackage { pname = "POE"; - version = "1.367"; + version = "1.368"; patches = [ ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch ../development/perl-modules/perl-POE-1.367-pod_no404s.patch ]; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz"; - sha256 = "0b9s7yxaa2lgzyi56brgygycfjk7lz33d1ddvc1wvwwvm45p4wmp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz; + sha256 = "08g1vzxamqg0gmkirdcx7fycq3pwv9vbajc30qwqpm1n3rvdrcdp"; }; # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is From bb3405705d29aa2f8009f36f793e4b9f0c61aadd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:37 +0000 Subject: [PATCH 078/400] [cpan2nix] perlPackages.TestWarnings: 0.028 -> 0.030 --- 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 a84b1765d85..5cf9ce1c95f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19371,10 +19371,10 @@ let TestWarnings = buildPerlPackage { pname = "Test-Warnings"; - version = "0.028"; + version = "0.030"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz"; - sha256 = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz; + sha256 = "89a4947ddf1564ae01122275584433d7f6c4370370bcf3768922d796956ae24f"; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { From 698ed1500099e193f65cb29c8c9fef3d53ce96ac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:39 +0000 Subject: [PATCH 079/400] [cpan2nix] perlPackages.YAMLPP: 0.018 -> 0.022 --- 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 5cf9ce1c95f..29d5bffa9a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21583,10 +21583,10 @@ let YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.018"; + version = "0.022"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz"; - sha256 = "1s957svv1z4sz62s53n5ym3c0liafs2gl8r0m7xq9qgcb9dyvblx"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.022.tar.gz; + sha256 = "1hf7kpnzais4inhvh3azr0r9886lsqr8xjb81nik0idlgpl8rzh2"; }; buildInputs = [ TestDeep TestWarn ]; meta = { From e3f4b8d60399a1d707b086344d0e555f8186b6d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:40 +0000 Subject: [PATCH 080/400] [cpan2nix] perlPackages.CGISimple: 1.22 -> 1.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 29d5bffa9a7..0c583b0edbb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2248,10 +2248,10 @@ let CGISimple = buildPerlModule { pname = "CGI-Simple"; - version = "1.22"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz"; - sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn"; + url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz; + sha256 = "0zpl7sa8jvv3zba2vcxf3qsrjk7kk2vcznfdpmxydw06x8vczrp5"; }; propagatedBuildInputs = [ IOStringy ]; meta = { From 6794f223d550762e1eb54dad4df64faa531ea629 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:42 +0000 Subject: [PATCH 081/400] [cpan2nix] perlPackages.MailAuthenticationResults: 1.20200108 -> 1.20200331.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 0c583b0edbb..31c98cd588f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11046,10 +11046,10 @@ let MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; - version = "1.20200108"; + version = "1.20200331.1"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz"; - sha256 = "1j003bzqh7nax604f93k1s70b1im97986p6g58a6ynv92fbnhjq5"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200331.1.tar.gz; + sha256 = "0qpairi9gmwinws4ay46pjnckib6217k0ig604ppkmjzilwjvf2c"; }; buildInputs = [ TestException ]; meta = { From 46402dfa8af91c331eb5dcd9e7812d107223db8b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:43 +0000 Subject: [PATCH 082/400] [cpan2nix] perlPackages.NetDNSResolverMock: 1.20171219 -> 1.20200215 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 31c98cd588f..202105193ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13736,16 +13736,17 @@ let NetDNSResolverMock = buildPerlPackage { pname = "Net-DNS-Resolver-Mock"; - version = "1.20171219"; + version = "1.20200215"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz"; - sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz; + sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy"; }; propagatedBuildInputs = [ NetDNS ]; meta = { description = "Mock a DNS Resolver object for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException ]; }; NetDomainTLD = buildPerlPackage { From a6dcfd81ce081923e0f2ccd0d1395aa3739f376e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:45 +0000 Subject: [PATCH 083/400] [cpan2nix] perlPackages.TypeTiny: 1.008005 -> 1.010002 --- 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 202105193ee..4db8654ed28 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20518,10 +20518,10 @@ let TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.008005"; + version = "1.010002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz"; - sha256 = "cc25eb6bd204b586b71e1f6408922b88be3c8183a1e4f99282d885904c776226"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010002.tar.gz; + sha256 = "2ea6ea2d8b2b3bb1b94f0309fa5064d57e7734c8bb14e99218e655dc1647073a"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { From 2c54af9ef171ffdd2e005ff18a544f6ee1f949a3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:49 +0000 Subject: [PATCH 084/400] [cpan2nix] perlPackages.StructDumb: 0.09 -> 0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4db8654ed28..fccd098c87d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17237,10 +17237,10 @@ let StructDumb = buildPerlModule { pname = "Struct-Dumb"; - version = "0.09"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz"; - sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz; + sha256 = "0wvzcpil9xc2wkibq3sj8i5bgq4iadx2k7hfqb8jm5p66g271kjj"; }; buildInputs = [ TestFatal ]; meta = { From 8174c3e18ede7c692a467122dd253da52a8a0488 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:50 +0000 Subject: [PATCH 085/400] [cpan2nix] perlPackages.TestTrailingSpace: 0.0302 -> 0.0600 --- 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 fccd098c87d..542658e3c9b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19331,10 +19331,10 @@ let TestTrailingSpace = buildPerlModule { pname = "Test-TrailingSpace"; - version = "0.0302"; + version = "0.0600"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz"; - sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz; + sha256 = "f09d263adec06700a43a24e29f5484cf6d2939914c607dec51590f4bb8fa5a11"; }; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { From 0c0259767b1bfcd9bd2789988dad88e8c7bb1c88 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:50 +0000 Subject: [PATCH 086/400] [cpan2nix] perlPackages.CGI: 4.45 -> 4.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 542658e3c9b..7311c3c1649 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2117,10 +2117,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.45"; + version = "4.49"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz"; - sha256 = "f6c1513740ee502e947d30131da18a5595dbcd19962d3dd0ff5dedf3cd1ed407"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.49.tar.gz; + sha256 = "dd5e9ce69c6e6ed9b42f0a0daeaead1c6caad3fbba2b2a4977b076bc29556b5e"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; From 3c04fe0d26a035335b24c547a30533edd3419894 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:52 +0000 Subject: [PATCH 087/400] [cpan2nix] perlPackages.FileLibMagic: 1.16 -> 1.22 --- 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 7311c3c1649..f0cc84e6f42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7280,12 +7280,12 @@ let FileLibMagic = buildPerlPackage { pname = "File-LibMagic"; - version = "1.16"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"; - sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.22.tar.gz; + sha256 = "93639bd076849e93a020fea1507f0a2b3467b8792eb5c306f2aacbbfb4d080d6"; }; - buildInputs = [ pkgs.file TestFatal ]; + buildInputs = [ pkgs.file ConfigAutoConf TestFatal ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; preCheck = '' substituteInPlace t/oo-api.t \ From c7c875a31f673804655ff406be2ee04336717e11 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:54 +0000 Subject: [PATCH 088/400] [cpan2nix] perlPackages.Gtk3: 0.036 -> 0.037 --- 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 f0cc84e6f42..c022db0585a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8348,10 +8348,10 @@ let Gtk3 = buildPerlPackage { pname = "Gtk3"; - version = "0.036"; + version = "0.037"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz"; - sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz; + sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { From cb66e5e742e839202f68fb797d04de75c91bf4f9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:55 +0000 Subject: [PATCH 089/400] [cpan2nix] perlPackages.TestMockModule: v0.171.0 -> v0.173.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 c022db0585a..92da526bf92 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18702,10 +18702,10 @@ let TestMockModule = buildPerlModule { pname = "Test-MockModule"; - version = "0.171.0"; + version = "0.173.0"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz"; - sha256 = "1arqgb1773zym5dqlwm6kz48bfrccjhb5bjfsif0vkalwq2gvm7b"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz; + sha256 = "0hnv2ziyasrri58ys93j5qyyzgxw3jx5hvjhd72nsp4vqq6lhg6s"; }; propagatedBuildInputs = [ SUPER ]; buildInputs = [ TestWarnings ]; From e0e560b7f3a2bf4ca34f96b145a7dde1a8e38aee Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:56 +0000 Subject: [PATCH 090/400] [cpan2nix] perlPackages.ArchiveZip: 1.67 -> 1.68 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92da526bf92..33bc691ea00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -746,10 +746,10 @@ let ArchiveZip = buildPerlPackage { pname = "Archive-Zip"; - version = "1.67"; + version = "1.68"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz"; - sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz; + sha256 = "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq"; }; buildInputs = [ TestMockModule ]; meta = { From 891bb5425518ad6bb4c3d175a3be3fba48a6924f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:58 +0000 Subject: [PATCH 091/400] [cpan2nix] perlPackages.Future: 0.43 -> 0.45 --- 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 33bc691ea00..ffa92cbf591 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7770,10 +7770,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.43"; + version = "0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz"; - sha256 = "191qvn3jz5pk5zxykwsg1i17s45kc82rfd6kgzsv9nki1c04dzaf"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz; + sha256 = "1h5609wd1m774h8brgm5vinz6pfmdszp2ms6ybxlyhs0p5msp36f"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { From 1a1af24e0f8d4bdc80b3e57b0ce137a3638b50a4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:47:59 +0000 Subject: [PATCH 092/400] [cpan2nix] perlPackages.Gtk3SimpleList: 0.18 -> 0.21 --- 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 ffa92cbf591..3ee069e322f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8362,10 +8362,10 @@ let Gtk3SimpleList = buildPerlPackage { pname = "Gtk3-SimpleList"; - version = "0.18"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz"; - sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; + url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz; + sha256 = "1158mnr2ldq02098hqbkwfv64d83zl3a8scll9s09g7k1c86ai0x"; }; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; From eca2c981de1125e19598755b9e4d3605ebad294b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:00 +0000 Subject: [PATCH 093/400] [cpan2nix] perlPackages.MailMessage: 3.008 -> 3.009 --- 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 3ee069e322f..295a8494406 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11100,10 +11100,10 @@ let MailMessage = buildPerlPackage { pname = "Mail-Message"; - version = "3.008"; + version = "3.009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz"; - sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz; + sha256 = "06ngjxnw0r5s6fnwc6qd2710p5v28ssgjkghkw8nqy2glacczlir"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { From 1828ff0c3e81108b5c9e0059b5e1f0409bc07f39 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:01 +0000 Subject: [PATCH 094/400] [cpan2nix] perlPackages.PDFAPI2: 2.036 -> 2.037 --- 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 295a8494406..da59d907cd6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14905,10 +14905,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.036"; + version = "2.037"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz"; - sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.037.tar.gz; + sha256 = "142803d1886d2a2919d374fb6c25681630aa26740e3f8023337f996fa6c6297e"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; From f815bffb68f1ce255c946dd5a953423e91ff2fac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:02 +0000 Subject: [PATCH 095/400] [cpan2nix] perlPackages.SQLStatement: cleanup --- 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 da59d907cd6..efaa64705a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16817,8 +16817,8 @@ let url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz"; sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8"; }; - buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil TextSoundex MathBaseConvert ]; + buildInputs = [ MathBaseConvert TestDeep TextSoundex ]; + propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil ]; }; SQLTokenizer = buildPerlPackage { From 7043ef5f99eb65962b5aff91b2ecdcedc07aa719 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:03 +0000 Subject: [PATCH 096/400] [cpan2nix] perlPackages.Test2Suite: 0.000128 -> 0.000130 --- 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 efaa64705a3..b3f3764c9c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18073,10 +18073,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000128"; + version = "0.000130"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz"; - sha256 = "f8e4e76900f5fb748d085aa5d18b916e07273e9ca50fb671ab8be1301cfae08c"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000130.tar.gz; + sha256 = "d462cb95024c0735fc0fdb22f92fda4f852bf85d92d89bd95e4fa212730d534a"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From e3ee1aee4895e3ed3e08c48298c96f224bbbb1e3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:03 +0000 Subject: [PATCH 097/400] [cpan2nix] perlPackages.XSObjectMagic: 0.04 -> 0.05 --- 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 b3f3764c9c8..632bc8d0faa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21507,12 +21507,12 @@ let XSObjectMagic = buildPerlPackage { pname = "XS-Object-Magic"; - version = "0.04"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz"; - sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; + url = mirror://cpan/authors/id/E/ET/ETHER/XS-Object-Magic-0.05.tar.gz; + sha256 = "0njyy4y0zax4zz55y82dlm9cly1pld1lcxb281s12bp9rrhf9j9x"; }; - buildInputs = [ ExtUtilsDepends TestFatal ]; + buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ]; meta = { description = "XS pointer backed objects using sv_magic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2fce5ffefae0cb7591d31dc986791041139ef214 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:04 +0000 Subject: [PATCH 098/400] [cpan2nix] perlPackages.CPANPLUS: 0.9906 -> 0.9908 --- 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 632bc8d0faa..1bb7a8cf9d9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3497,10 +3497,10 @@ let CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9906"; + version = "0.9908"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz"; - sha256 = "0w1gi4w7xriqhh44ssgg2abk5dfxchshqfab4cs3j4ab6p8vf9j5"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz; + sha256 = "1m4xas67fax947kahvg4jsnsr2r1i58c5g3f1bixh7krgnsarxjq"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { From fb06379b60dc613fa1e8d5c706cf2d08e9940268 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:07 +0000 Subject: [PATCH 099/400] [cpan2nix] perlPackages.DateManip: 6.79 -> 6.82 --- 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 1bb7a8cf9d9..c61b525afa1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4551,10 +4551,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.79"; + version = "6.82"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz"; - sha256 = "0fllcvsd08wz71wyppyhgb6mingfihhsf5raraildggdwhnc9a3i"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz; + sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' From d245777675dfd68d616dfe3d4af3fba51b05dfad Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:08 +0000 Subject: [PATCH 100/400] [cpan2nix] perlPackages.FFICheckLib: 0.26 -> 0.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 c61b525afa1..ce26a5e6cf7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6997,10 +6997,10 @@ let FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz"; - sha256 = "0rbzm4cisn4vdj1kc0sa6v8m1b3mjkryi5w14hk1d13zh3q3pqq6"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz; + sha256 = "0x1dk4hlhvcbgwivf345phbqz0v5hawxxnby21h8bkagq93jfi4d"; }; buildInputs = [ Test2Suite ]; meta = { From 01d234c77784bc74bd44d1067cdff1df94ef8b53 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:09 +0000 Subject: [PATCH 101/400] [cpan2nix] perlPackages.LocaleCodes: 3.62 -> 3.64 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ce26a5e6cf7..c3ca80d85dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10471,10 +10471,10 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.62"; + version = "3.64"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz"; - sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.64.tar.gz; + sha256 = "4ed9ef810b68cbb3417e28b34606c1b73c205ce2128535e53b4c9bf612c3e861"; }; meta = { description = "A distribution of modules to handle locale codes"; From 17c193eefeda0925c4ec213fc3747d09350b01b1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:10 +0000 Subject: [PATCH 102/400] [cpan2nix] perlPackages.Pegex: 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 c3ca80d85dc..c683488cdf0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14920,10 +14920,10 @@ let Pegex = buildPerlPackage { pname = "Pegex"; - version = "0.74"; + version = "0.75"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz"; - sha256 = "31f0889695d79a3ab79a6315a8a08baeb1268592bc6596c3feffb424d982dfdf"; + url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz; + sha256 = "4dc8d335de80b25247cdb3f946f0d10d9ba0b3c34b0ed7d00316fd068fd05edc"; }; buildInputs = [ TestPod TieIxHash ]; meta = { From 67300b7868a80c81e076eb109fe933b0c16e802f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:12 +0000 Subject: [PATCH 103/400] [cpan2nix] perlPackages.Clipboard: 0.22 -> 0.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c683488cdf0..280c2b53b97 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2775,10 +2775,10 @@ let Clipboard = buildPerlModule { pname = "Clipboard"; - version = "0.22"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz"; - sha256 = "9fdb4dfc2e9bc2f3990b5b71649094dfe83aa12172c5a1809cf7e8b3be295ca7"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz; + sha256 = "886ae43dc8538f9bfc4e07fdbcf09b7fbd6ee59c31f364618c859de14953c58a"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; From eb56685ddbe3e8fc7336f8e404d4f39bb8a77417 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:13 +0000 Subject: [PATCH 104/400] [cpan2nix] perlPackages.IPCRun: 20180523.0 -> 20200505.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 280c2b53b97..2ecf91e28d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9641,10 +9641,10 @@ let IPCRun = buildPerlPackage { pname = "IPC-Run"; - version = "20180523.0"; + version = "20200505.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz"; - sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz; + sha256 = "00f9wjvhn55zbk3n9il76xvsqy7ddk60lg6phg2rkpx0gwhvyvl1"; }; doCheck = false; /* attempts a network connection to localhost */ meta = { From a9e0280cf69519233f32174a08457dd2f8e42452 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:14 +0000 Subject: [PATCH 105/400] [cpan2nix] perlPackages.PerlPrereqScannerNotQuiteLite: 0.9909 -> 0.9911 --- 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 2ecf91e28d1..6a24ee51b4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15644,10 +15644,10 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9909"; + version = "0.9911"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz"; - sha256 = "09sa86maxrqnxf84wa0cgkcs8p6xvpsv0x5dny3hz0300zgrqmq5"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9911.tar.gz; + sha256 = "1h8sv5df7736sr7vasl6hkcvqlsqz9y61wiky6bvqa7fnlfhcyp0"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; From 9ea9e4c618ae6f0a25f58f857363cf7976b88774 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:15 +0000 Subject: [PATCH 106/400] [cpan2nix] perlPackages.SerealDecoder: 4.008 -> 4.014 dependencies: perlPackages.TestMemoryGrowth: init at 0.03 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a24ee51b4f..2867c36ca94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16415,12 +16415,12 @@ let SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz"; - sha256 = "1vxgwlya7sj9mb6y278qblrjl2708d0agy7cryyqj7qf08d056rv"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.014.tar.gz; + sha256 = "0ph5k99ssm5anwsdjal7sw96pjs65lirfanfsw8gh6k40w0w6f44"; }; - buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; + buildInputs = [ TestDeep TestDifferences TestLongString TestMemoryGrowth TestWarn ]; preBuild = ''ls''; meta = { homepage = "https://github.com/Sereal/Sereal"; @@ -18670,6 +18670,19 @@ let }; }; + TestMemoryGrowth = buildPerlModule { + pname = "Test-MemoryGrowth"; + version = "0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-MemoryGrowth-0.03.tar.gz; + sha256 = "0z6lmalhq3k3p303qahs0ijp6sarf3ij88m39yhzizzf9abapvsz"; + }; + meta = { + description = "assert that code does not cause growth in memory usage"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMockClass = buildPerlModule { pname = "Test-Mock-Class"; version = "0.0303"; From 99a5440bdc5cb6ef418d5fb8ca7e1f0c67e7861c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:16 +0000 Subject: [PATCH 107/400] [cpan2nix] perlPackages.DBDCSV: 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 2867c36ca94..652414b0a70 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5064,7 +5064,7 @@ let url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz"; sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be"; }; - propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ]; + propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; }; DBDMock = buildPerlModule { From 757231d201058d8d14fb8ed60973b34e930c601f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:17 +0000 Subject: [PATCH 108/400] [cpan2nix] perlPackages.EmailMIME: 1.946 -> 1.949 --- 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 652414b0a70..be27c273aa7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6247,10 +6247,10 @@ let EmailMIME = buildPerlPackage { pname = "Email-MIME"; - version = "1.946"; + version = "1.949"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz"; - sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz; + sha256 = "3b0adf6bb413cfe51d75f8ba79aca80deafc98dc1179aa7b2d7a79aff5a6ab9c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { From 7945fc63b13c293f883fe884da6f3a091e9051a8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:17 +0000 Subject: [PATCH 109/400] [cpan2nix] perlPackages.FileBOM: 0.16 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index be27c273aa7..bbab7d86bdf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7064,10 +7064,10 @@ let FileBOM = buildPerlModule { pname = "File-BOM"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz"; - sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; + url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.18.tar.gz; + sha256 = "28edc43fcb118e11bc458c9ae889d56d388c1d9bc29997b00b1dffd8573823a3"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; From c9abcd3719f3936443b83dec8994cb2f67934bc1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:17 +0000 Subject: [PATCH 110/400] [cpan2nix] perlPackages.Moo: 2.003006 -> 2.004000 --- 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 bbab7d86bdf..c6602bf34ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12493,10 +12493,10 @@ let Moo = buildPerlPackage { pname = "Moo"; - version = "2.003006"; + version = "2.004000"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz"; - sha256 = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472"; + url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz; + sha256 = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; From 80785bf86732485e68d66bd83956959d95467f11 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:18 +0000 Subject: [PATCH 111/400] [cpan2nix] perlPackages.SerealEncoder: 4.008 -> 4.014 --- 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 c6602bf34ac..5b1300ce727 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16432,10 +16432,10 @@ let SerealEncoder = buildPerlPackage { pname = "Sereal-Encoder"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz"; - sha256 = "0vzk6d2h034qks4lby53xrfljsrx4cvkaqi7gz9frba17lvl01rq"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.014.tar.gz; + sha256 = "0044pkjkdg8y0ljmfj0bx68wf7jpfyy98kxi4z36kxarz2hcf462"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { From 16c2b03b7526412e26c7ab7658311c3a2408ad62 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:18 +0000 Subject: [PATCH 112/400] [cpan2nix] perlPackages.TemplateToolkit: 3.007 -> 3.008 --- pkgs/top-level/perl-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b1300ce727..096196fefe0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17790,16 +17790,18 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.007"; + version = "3.008"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz"; - sha256 = "1jh953f1v4r494mdvzfqs1ay1bh453dmp10z4qmv0makwarjsnfp"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.008.tar.gz; + sha256 = "14m6kl9zrs6ycr440an7zswrmcimv2747qq0r87inwznprl0yh2j"; }; doCheck = !stdenv.isDarwin; meta = { description = "Comprehensive template processing system"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ AppConfig ]; + buildInputs = [ CGI TestLeakTrace ]; }; TemplateGD = buildPerlPackage { From 309a10e264b57daf503ab2deb907d06a7302cab6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:19 +0000 Subject: [PATCH 113/400] [cpan2nix] perlPackages.IOAsync: 0.75 -> 0.77 dependencies: perlPackages.MetricsAny: init at 0.05 perlPackages.TestMetricsAny: init at 0.01 --- pkgs/top-level/perl-packages.nix | 36 ++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 096196fefe0..2f2a6813138 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9354,13 +9354,13 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.75"; + version = "0.77"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz"; - sha256 = "1mi6gfbl11rimvzgzyj8kiqf131cg1w9nwxi47fwm9sbs0x6rkjb"; + url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz; + sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri"; }; propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ TestFatal TestIdentity TestRefcount ]; + buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11653,6 +11653,20 @@ let }; }; + MetricsAny = buildPerlModule { + pname = "Metrics-Any"; + version = "0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.05.tar.gz; + sha256 = "1xg7y8szbfwmh72y8l1w0rz4jrd66hisl6hh3hyq31f52cs6hwvr"; + }; + buildInputs = [ TestFatal ]; + meta = { + description = "abstract collection of monitoring metrics"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + # TODO: use CPAN version MHonArc = buildPerlPackage rec { pname = "MHonArc"; @@ -18685,6 +18699,20 @@ let }; }; + TestMetricsAny = buildPerlModule { + pname = "Test-Metrics-Any"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Metrics-Any-0.01.tar.gz; + sha256 = "0s744lv997g1wr4i4vg1d7zpzjfw334hdy45215jf6xj9s6wh1i5"; + }; + propagatedBuildInputs = [ MetricsAny ]; + meta = { + description = "assert that code produces metrics via L"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMockClass = buildPerlModule { pname = "Test-Mock-Class"; version = "0.0303"; From b90adca0b8592a6739a0fda0e317f3e6cdb9225d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:20 +0000 Subject: [PATCH 114/400] [cpan2nix] perlPackages.ListAllUtils: 0.15 -> 0.16 --- 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 2f2a6813138..2506262e485 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10378,10 +10378,10 @@ let ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz"; - sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.16.tar.gz; + sha256 = "559b3aa911c73003a3a1ebd860d3b16e171137de8203d86be63a2390364c63dd"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { From e474141d5c5fdb1ae7515849a2abe6bbf691c7e9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:21 +0000 Subject: [PATCH 115/400] [cpan2nix] perlPackages.Sereal: 4.008 -> 4.014 --- 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 2506262e485..05530161f0b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16462,10 +16462,10 @@ let Sereal = buildPerlPackage { pname = "Sereal"; - version = "4.008"; + version = "4.014"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz"; - sha256 = "1ima428v8mi509crr3b1rnh67ki8vbcd7iignw68mf2iaw5wmb58"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.014.tar.gz; + sha256 = "02qpl3x6sh0xfby38gr80dndkah9m5r0xhk7d4a24i9hqljjaing"; }; buildInputs = [ TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; From 231257bdbadbc176ed4b990154a7086771d23e63 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:22 +0000 Subject: [PATCH 116/400] [cpan2nix] perlPackages.TestMost: 0.35 -> 0.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05530161f0b..2e1310d96dd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18837,10 +18837,10 @@ let TestMost = buildPerlPackage { pname = "Test-Most"; - version = "0.35"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz"; - sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; + url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz; + sha256 = "1isg8z6by113zn08l044w6k04y5m5bnns3rqmks8rwdr3qa70csk"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { From 985e7f0c4d9630648334c0043463c126207a3f3e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:24 +0000 Subject: [PATCH 117/400] [cpan2nix] perlPackages.MooXStrictConstructor: 0.010 -> 0.011 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2e1310d96dd..c5942486d4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12616,10 +12616,10 @@ let MooXStrictConstructor = buildPerlPackage { pname = "MooX-StrictConstructor"; - version = "0.010"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz"; - sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; + url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz; + sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s"; }; propagatedBuildInputs = [ Moo strictures ]; buildInputs = [ TestFatal ]; From c04fa7103267ed5846a80150db6a23afafe0c4a4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:25 +0000 Subject: [PATCH 118/400] [cpan2nix] perlPackages.PPIxRegexp: 0.068 -> 0.072 --- 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 c5942486d4f..da43929655e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15437,12 +15437,12 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.068"; + version = "0.072"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz"; - sha256 = "b5444b699a3c7ad79506c796559449c6f858dc62deb60e08249f96782636e5f4"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.072.tar.gz; + sha256 = "84a050b3b65c98a4b95f9df94fa0d8db9a931b000bb6e2946f0f8874cc2bac5c"; }; - propagatedBuildInputs = [ ListMoreUtils PPI ]; + propagatedBuildInputs = [ PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3896e17111ec113ecdea1896f5b72fe96fc80484 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:28 +0000 Subject: [PATCH 119/400] [cpan2nix] perlPackages.Specio: 0.45 -> 0.46 --- 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 da43929655e..ed1f6b21fa2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16721,10 +16721,10 @@ let Specio = buildPerlPackage { pname = "Specio"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz"; - sha256 = "1xk1skzvmqjgk7dqfkcmp6g7fc493cyk2hp94fzpdc43cg78ifg4"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz; + sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; From 3ea6c154fcf865d52d1c67507a04aa632643a66a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:29 +0000 Subject: [PATCH 120/400] [cpan2nix] perlPackages.ConfigGitLike: 1.17 -> 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed1f6b21fa2..2df95fdaaec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2984,10 +2984,10 @@ let ConfigGitLike = buildPerlPackage { pname = "Config-GitLike"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz"; - sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.18.tar.gz; + sha256 = "f7ae7440f3adab5b9ff9aa57216d84fd4a681009b9584e32da42f8bb71e332c5"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; From 4e8a420f545e99253b05a85a30551d4cdbbb261a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:30 +0000 Subject: [PATCH 121/400] [cpan2nix] perlPackages.MojoliciousPluginStatus: 1.01 -> 1.12 dependencies: perlPackages.FileMap: init at 0.66 perlPackages.PerlIOLayers: init at 0.012 --- pkgs/top-level/perl-packages.nix | 36 ++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2df95fdaaec..52485f3b848 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7331,6 +7331,21 @@ let }; }; + FileMap = buildPerlModule { + pname = "File-Map"; + version = "0.66"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.66.tar.gz; + sha256 = "12d540v47jscjizcry2ir5vpp5q797vmd3gn9p91brqdbk5swfz7"; + }; + propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; + buildInputs = [ TestFatal TestWarnings ]; + meta = { + description = "Memory mapping made simple and safe."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileModified = buildPerlPackage { pname = "File-Modified"; version = "0.10"; @@ -12348,12 +12363,12 @@ let MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; - version = "1.01"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz"; - sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz; + sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn"; }; - propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; + propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap FileTemp Mojolicious ]; meta = { homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; @@ -14999,6 +15014,19 @@ let }; }; + PerlIOLayers = buildPerlModule { + pname = "PerlIO-Layers"; + version = "0.012"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz; + sha256 = "1psaq3kwlk7g9rxvgsacfjk2mh6cscqf4xl7ggfkzfrnz91aabal"; + }; + meta = { + description = "Querying your filehandle's capabilities"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlIOeol = buildPerlPackage { pname = "PerlIO-eol"; version = "0.17"; From 2a5eaa79a366f3414acd573b2670a4e4de10bcaa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:31 +0000 Subject: [PATCH 122/400] [cpan2nix] perlPackages.AlienBuild: 1.98 -> 2.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 52485f3b848..19675bcab53 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -162,10 +162,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "1.98"; + version = "2.26"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz"; - sha256 = "12w9da57616gmcj69yv7cjv423cj957dm0f84cn2q093g64kjmif"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.26.tar.gz; + sha256 = "0wfgfj6rvscqs3ixpybgrdmmnpxvf194iwbnl89jkqc25ipmc15i"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; From f22b704bd49ba47826cc737285f9924d71413555 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:32 +0000 Subject: [PATCH 123/400] [cpan2nix] perlPackages.DataMessagePack: 1.00 -> 1.01 --- 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 19675bcab53..462653a7df8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4205,14 +4205,14 @@ let }; }; - DataMessagePack = buildPerlPackage { + DataMessagePack = buildPerlModule { pname = "Data-MessagePack"; - version = "1.00"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.00.tar.gz"; - sha256 = "c9f0eeaf56ee4dfd509eccba2dd838921aebdf186ba60de166443ffc4b0ba1a2"; + url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz; + sha256 = "8fa0ed0101d04e661821a7b78e8d62ce3e19b299275bbfed178e2ba8912663ea"; }; - buildInputs = [ FileCopyRecursive TestRequires ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestRequires ]; meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; From effc78ac1d369e2a87126b3427de1738ad8e493f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:32 +0000 Subject: [PATCH 124/400] [cpan2nix] perlPackages.GetoptLongDescriptive: 0.104 -> 0.105 --- 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 462653a7df8..ba098104b3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7920,10 +7920,10 @@ let GetoptLongDescriptive = buildPerlPackage { pname = "Getopt-Long-Descriptive"; - version = "0.104"; + version = "0.105"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz"; - sha256 = "878bc1782c5e196a08a52fa252bbfce1aeb0546d073eac164fc6b80b4cea1e28"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz; + sha256 = "a71cdbcf4043588b26a42a13d151c243f6eccf38e8fc0b18ffb5b53651ab8c15"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; From 8cfd2011b2ccb0eb1219f2833fbdfac7e7abb2eb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:33 +0000 Subject: [PATCH 125/400] [cpan2nix] perlPackages.MailDKIM: 0.58 -> 1.20200513.1 --- 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 ba098104b3e..e73e4690d09 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11129,14 +11129,14 @@ let MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "0.58"; + version = "1.20200513.1"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz"; - sha256 = "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200513.1.tar.gz; + sha256 = "1gbnzxns4gy02lrgfmzdvr7bc0kxgxiq850mdj2y7k75nnv28iak"; }; - propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; + propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system - buildInputs = [ TestRequiresInternet ]; + buildInputs = [ NetDNSResolverMock TestRequiresInternet YAMLLibYAML ]; }; MailIMAPClient = buildPerlPackage { From 347b5ec195014d6bafd4b8ffff1db151eaf40558 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:34 +0000 Subject: [PATCH 126/400] [cpan2nix] perlPackages.HTTPMessage: 6.18 -> 6.24 --- 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 e73e4690d09..23ef4f08a2c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9052,13 +9052,13 @@ let HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.18"; + version = "6.24"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz"; - sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.24.tar.gz; + sha256 = "554a1acf2daa401091f7012f5cb82d04d281db43fbd8f39a1fcbb7ed56dde16d"; }; buildInputs = [ TryTiny ]; - propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + propagatedBuildInputs = [ Clone Encode EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; From c022750c9219d18e32de7aa6c025d908f1b0c533 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:38 +0000 Subject: [PATCH 127/400] [cpan2nix] perlPackages.JSONValidator: 3.23 -> 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 23ef4f08a2c..413117a1a57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9948,10 +9948,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "3.23"; + version = "4.00"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz"; - sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s"; + url = mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.00.tar.gz; + sha256 = "09p6n5ahsa13fmxb01siz9hcmyswgb05ac2njbhzim6cnx9d6cwj"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; From 133d2416e04863098d943579ce2356f8ad3751a3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:38 +0000 Subject: [PATCH 128/400] [cpan2nix] perlPackages.Redis: 1.995 -> 1.996 --- 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 413117a1a57..f7143efd1e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16092,10 +16092,10 @@ let Redis = buildPerlModule { pname = "Redis"; - version = "1.995"; + version = "1.996"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz"; - sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; + url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.996.tar.gz; + sha256 = "5c196d56a4d771abb2042fd52f252096497fc86f35910581e0956b5710ea74b6"; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; From c86487995c511822556af10de43b00b65a2168bf Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:39 +0000 Subject: [PATCH 129/400] [cpan2nix] perlPackages.HTMLForm: 6.05 -> 6.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 f7143efd1e9..03ed02e2c96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8568,10 +8568,10 @@ let HTMLForm = buildPerlPackage { pname = "HTML-Form"; - version = "6.05"; + version = "6.07"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz"; - sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz; + sha256 = "09v29cdzwjm139c67y1np3kvx2ymg3s8n723qc0ma07lmxz8rakx"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { From 726b46bddfd0001c56d6f6aae63d196524d85e55 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:39 +0000 Subject: [PATCH 130/400] [cpan2nix] perlPackages.MojoliciousPluginOpenAPI: 2.21 -> 3.33 --- 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 03ed02e2c96..0050c1c5dc5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12347,10 +12347,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "2.21"; + version = "3.33"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz"; - sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2"; + url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.33.tar.gz; + sha256 = "642f9dc440b7060cb201edc3d3d07e5bb3c6c77ba73b23078a2cb2c1acda8c51"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { From a2d34f1c13fc0a7ff1433abcc31108124f836b24 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:39 +0000 Subject: [PATCH 131/400] [cpan2nix] perlPackages.NetPrometheus: 0.07 -> 0.11 --- 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 0050c1c5dc5..a57129219a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13996,13 +13996,13 @@ let NetPrometheus = buildPerlModule { pname = "Net-Prometheus"; - version = "0.07"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz"; - sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz; + sha256 = "0skjkz6q68y8g9blm7i03k4wprac3djq15akmlv1kmgag3i0ky12"; }; - propagatedBuildInputs = [ RefUtil StructDumb ]; - buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ RefUtil StructDumb URI ]; + buildInputs = [ HTTPMessage TestFatal ]; meta = { description = "export monitoring metrics for F"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 77f7277ab9499cca093008f928b0d885df84cbb9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:39 +0000 Subject: [PATCH 132/400] [cpan2nix] perlPackages.PPIxQuoteLike: 0.008 -> 0.011 --- 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 a57129219a5..0683dc1607f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15451,12 +15451,12 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.008"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz"; - sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.011.tar.gz; + sha256 = "0yi0rx8nf3pz1g5d9z7mi6pzbd4y2kqj61vsgmyllk6rfyjcgmsf"; }; - propagatedBuildInputs = [ PPI ]; + propagatedBuildInputs = [ PPI Readonly ]; meta = { description = "Parse Perl string literals and string-literal-like things."; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 570a52016c27d9a0b1016bf4a5444d5747c777e7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:40 +0000 Subject: [PATCH 133/400] [cpan2nix] perlPackages.AlienLibxml2: 0.12 -> 0.16 --- 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 0683dc1607f..f93ad406f0b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -192,10 +192,10 @@ let AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.12"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz"; - sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz; + sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n"; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; From c662f6189a64550306adbf8228a463ff6cc853b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:40 +0000 Subject: [PATCH 134/400] [cpan2nix] perlPackages.GamesSolitaireVerify: 0.2202 -> 0.2403 --- 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 f93ad406f0b..38d18bd454b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7799,13 +7799,13 @@ let GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; - version = "0.2202"; + version = "0.2403"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz"; - sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2403.tar.gz; + sha256 = "e5ab475c82ba1cb088ad28f423ca514d46944d6ae3c3eb55e9636e9e7f1dc893"; }; buildInputs = [ DirManifest TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils PathTiny ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass PathTiny ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; From 3d1b99ccde9d48432d7240bd462d854a050c0579 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:40 +0000 Subject: [PATCH 135/400] [cpan2nix] perlPackages.MooXlate: 0.016 -> 0.100 dependencies: perlPackages.SubHandlesVia: init at 0.013 --- pkgs/top-level/perl-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38d18bd454b..5eed659b202 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12774,13 +12774,13 @@ let MooXlate = buildPerlPackage { pname = "MooX-late"; - version = "0.016"; + version = "0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz"; - sha256 = "1fb6393e8b77c0ec1e99229bc6f5b9db362eedc172fa940b37defd9bb3415e4e"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz; + sha256 = "2ae5b1e3da5abc0e4006278ecbcfa8fa7c224ea5529a6a688acbb229c09e6a5f"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ Moo TypeTiny ]; + propagatedBuildInputs = [ Moo SubHandlesVia ]; meta = { description = "Easily translate Moose code to Moo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -17350,6 +17350,21 @@ let }; }; + SubHandlesVia = buildPerlPackage { + pname = "Sub-HandlesVia"; + version = "0.013"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.013.tar.gz; + sha256 = "1q5lqjnqw29ywkiv0iqidc88ydqp1cywrgfd8mi7yarksc296a3l"; + }; + propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; + buildInputs = [ TestFatal TestRequires ]; + meta = { + description = "alternative handles_via implementation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SubIdentify = buildPerlPackage { pname = "Sub-Identify"; version = "0.14"; From c9ec3c442b81eb74da4d21112cdb5814b61d8ec2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:40 +0000 Subject: [PATCH 136/400] [cpan2nix] perlPackages.OpenAPIClient: 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 5eed659b202..f1dd25e2dfe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14414,7 +14414,7 @@ let url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz"; sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28"; }; - propagatedBuildInputs = [ JSONValidator MojoliciousPluginOpenAPI ]; + propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { homepage = "https://github.com/jhthorsen/openapi-client"; description = "A client for talking to an Open API powered server"; From b1ed557bbe7958508654aca2e48e33f719659be7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:41 +0000 Subject: [PATCH 137/400] [cpan2nix] perlPackages.SQLAbstract: 1.86 -> 1.87 --- 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 f1dd25e2dfe..779998a6808 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16817,10 +16817,10 @@ let SQLAbstract = buildPerlPackage { pname = "SQL-Abstract"; - version = "1.86"; + version = "1.87"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz"; - sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz; + sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a"; }; buildInputs = [ TestDeep TestException TestWarn ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ]; From ccdc773858b43828332df2c7aa0987ed7f062844 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:42 +0000 Subject: [PATCH 138/400] [cpan2nix] perlPackages.Mouse: v2.5.9 -> v2.5.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 779998a6808..430beb482ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13415,10 +13415,10 @@ let Mouse = buildPerlModule { pname = "Mouse"; - version = "2.5.9"; + version = "2.5.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz"; - sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz; + sha256 = "1vijm8wkyws1jhnqmx104585q3srw9z1crcpy1zlcfhm8qww53ff"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; From 3160b0681dde5229fe697d5b54e3647146cbf59e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:43 +0000 Subject: [PATCH 139/400] [cpan2nix] perlPackages.HTMLMason: 1.58 -> 1.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 430beb482ac..8735124cbbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8672,10 +8672,10 @@ let HTMLMason = buildPerlPackage { pname = "HTML-Mason"; - version = "1.58"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz"; - sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz; + sha256 = "95bed2a6c488370046aa314be4b592bd65a6522f8845da8b36a6aff9a8b439d0"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; From 00c9b27bc74f72fa790f5ba9ab044aa3e6c790cb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:44 +0000 Subject: [PATCH 140/400] [cpan2nix] perlPackages.XMLLibXML: 2.0202 -> 2.0205 --- 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 8735124cbbf..25f48bedfc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21294,13 +21294,13 @@ let XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0202"; + version = "2.0205"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz"; - sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz; + sha256 = "0y12bcpnxzn8vs9zglaaxkw0kgrgmljxrxdf1cnijgxi2hkh099s"; }; SKIP_SAX_INSTALL = 1; - buildInputs = [ AlienLibxml2 ]; + buildInputs = [ AlienBuild AlienLibxml2 ]; propagatedBuildInputs = [ XMLSAX ]; }; From cea645e377af519cf4d89d9292a0dd23b13b4dc5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:44 +0000 Subject: [PATCH 141/400] [cpan2nix] perlPackages.MojoPg: 4.18 -> 4.19 --- 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 25f48bedfc8..21d0a5dc9fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12475,12 +12475,11 @@ let MojoPg = buildPerlPackage { pname = "Mojo-Pg"; - version = "4.18"; + version = "4.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz"; - sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz; + sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992"; }; - buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; meta = { homepage = "https://github.com/mojolicious/mojo-pg"; From d5770788933a89ac91f5f0019ea497572d8a876f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:45 +0000 Subject: [PATCH 142/400] [cpan2nix] perlPackages.LWP: 6.43 -> 6.45 --- 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 21d0a5dc9fd..7e916c5a17e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10895,10 +10895,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.43"; + version = "6.45"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz"; - sha256 = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.45.tar.gz; + sha256 = "4391cec148d83c32482350c8ee1bc88f1b42d33921584b83017eba1591a42954"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) From c76f1ea8003da3152f5594c5e1009482d0558696 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:46 +0000 Subject: [PATCH 143/400] [cpan2nix] perlPackages.SystemCommand: 1.119 -> 1.121 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e916c5a17e..3cb153bba78 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17649,16 +17649,17 @@ let SystemCommand = buildPerlPackage { pname = "System-Command"; - version = "1.119"; + version = "1.121"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz"; - sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; + url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz; + sha256 = "43de5ecd20c1da46e8a6f4fceab29e04697a2890a99bf6a91b3ca004a468a241"; }; propagatedBuildInputs = [ IPCRun ]; meta = { description = "Object for running system commands"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ]; }; SysVirt = buildPerlModule rec { From 4d92184a5687a75eedcfc354b327704f17988f91 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:46 +0000 Subject: [PATCH 144/400] [cpan2nix] perlPackages.AlienGMP: 1.14 -> 1.16 dependencies: perlPackages.Alienm4: init at 0.19 perlPackages.Alienpatch: init at 0.15 --- pkgs/top-level/perl-packages.nix | 38 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3cb153bba78..2d872e5d5a2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -177,13 +177,13 @@ let AlienGMP = buildPerlPackage { pname = "Alien-GMP"; - version = "1.14"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz"; - sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz; + sha256 = "199x24pl6jnqshgnl066lhdf2fkqa6l1fml9g3qn5grmwn7d8309"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.gmp DevelChecklib HTMLParser SortVersions Test2Suite URI ]; + buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Alien package for the GNU Multiple Precision library."; license = with stdenv.lib.licenses; [ lgpl3Plus ]; @@ -273,6 +273,36 @@ let buildInputs = [ LWPProtocolHttps ]; }; + Alienm4 = buildPerlPackage { + pname = "Alien-m4"; + version = "0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz; + sha256 = "1xnh8qa99dcvqcqzbpy0s5jrxvn7wa5ydz3lfd56n358l5jfzns9"; + }; + propagatedBuildInputs = [ AlienBuild ]; + buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; + meta = { + description = "Find or build GNU m4"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Alienpatch = buildPerlPackage { + pname = "Alien-patch"; + version = "0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-patch-0.15.tar.gz; + sha256 = "1l00mq56596wn09nn7fv552j2aa7sgh46bvx5xlncsnrn8jp5mpy"; + }; + propagatedBuildInputs = [ AlienBuild ]; + buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; + meta = { + description = "Find or build patch"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEvent = buildPerlPackage { pname = "AnyEvent"; version = "7.17"; From dc10dc6c4d73da98bfeb5973f34781cb26b4820f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:46 +0000 Subject: [PATCH 145/400] [cpan2nix] perlPackages.DevelDeclare: 0.006019 -> 0.006022 --- 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 2d872e5d5a2..e82cdc274b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5534,10 +5534,10 @@ let DevelDeclare = buildPerlPackage { pname = "Devel-Declare"; - version = "0.006019"; + version = "0.006022"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz"; - sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; + url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz; + sha256 = "72f29ca35646a593be98311ffddb72033ae1e8a9d8254c62aa248bd6260e596e"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; From 82514cb8a21f5bd4688503d5b000ae8db079a3f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:48 +0000 Subject: [PATCH 146/400] [cpan2nix] perlPackages.XMLParser: 2.46 -> 2.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e82cdc274b3..4e07b1d118c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21382,10 +21382,10 @@ let XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.46"; + version = "2.44"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz"; - sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; + sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; }; patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' From 03b8db633236a04bf2ce738a7032fca98e0dcfda Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:51 +0000 Subject: [PATCH 147/400] [cpan2nix] perlPackages.AuthenSCRAM: 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 4e07b1d118c..351a662b37e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -936,7 +936,7 @@ let sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8"; }; buildInputs = [ TestFailWarnings TestFatal ]; - propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ]; + propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TypeTiny namespaceclean ]; meta = { homepage = "https://github.com/dagolden/Authen-SCRAM"; description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; From b18fb5c09ab8e8f9069ea29075d10772236ade69 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:52 +0000 Subject: [PATCH 148/400] [cpan2nix] perlPackages.MIMELiteHTML: 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 351a662b37e..d30434b879e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11798,7 +11798,7 @@ let sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da"; }; doCheck = false; - propagatedBuildInputs = [ HTMLParser LWP MIMELite URI ]; + propagatedBuildInputs = [ LWP MIMELite ]; meta = { description = "Provide routine to transform a HTML page in a MIME-Lite mail"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From e94165ede909d83ae841e8ac3b2f0e508de5f3d0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:53 +0000 Subject: [PATCH 149/400] [cpan2nix] perlPackages.ApacheAuthCookie: 3.28 -> 3.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d30434b879e..7e5c136d93f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -408,10 +408,10 @@ let ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; - version = "3.28"; + version = "3.30"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz"; - sha256 = "bcd795a7f654a94ae0a6bd734ba4d8ba1085371fca486229dba49f1c2d62142b"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz; + sha256 = "1f71b94d3d55a950a4b32dae4e90f6e76c8157508a7e2aee50621b179aadb1fb"; }; buildInputs = [ ApacheTest ]; propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ]; From 35426d5ee37b280efef47ee2c6a5a7a45edaddf1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:54 +0000 Subject: [PATCH 150/400] [cpan2nix] perlPackages.GnuPGInterface: 0.52 -> 1.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e5c136d93f..c2b479fec1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8150,10 +8150,10 @@ let GnuPGInterface = buildPerlPackage { pname = "GnuPG-Interface"; - version = "0.52"; + version = "1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz"; - sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; + url = mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz; + sha256 = "97e9c809491a061b2e99fb4e50c7bf74eb42e1deb11c64b081b21b4dbe6aec2f"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; From 552287819675b3c34f7b4cfdc5cee8be82ed6344 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:48:55 +0000 Subject: [PATCH 151/400] [cpan2nix] perlPackages.SQLTranslator: 1.60 -> 1.61 --- 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 c2b479fec1a..a9bcb5172eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16903,10 +16903,10 @@ let SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "1.60"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz"; - sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz; + sha256 = "840e3c77cd48b47e1343c79ae8ef4fca46d036356d143d33528900740416dfe8"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; From 5c1ab0681c005f27846076e8688732643d516be1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:01 +0000 Subject: [PATCH 152/400] [cpan2nix] perlPackages.DateTimeTimeZone: 2.38 -> 2.39 --- 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 a9bcb5172eb..f8f55928497 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4879,10 +4879,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.38"; + version = "2.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz"; - sha256 = "0e5c99ef22471f4d262ac590ce5ce8177094d7a92f380d8eea6219f5a12dc0cd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz; + sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; From aa582cd5222fe26ac7d00a963b196d5b64ac0418 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:02 +0000 Subject: [PATCH 153/400] [cpan2nix] perlPackages.Mojomysql: 1.18 -> 1.19 --- 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 f8f55928497..caec9e09353 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12458,10 +12458,10 @@ let Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.18"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz"; - sha256 = "cc023f068f1ed158b5788758ea175aabe646b06d2f86049552bd7307457396bd"; + url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.19.tar.gz; + sha256 = "8695494db239e6bbec67cc686e15a60a3424b9f71af5e9936729dfd2be8a3530"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; meta = { From 0bfa1e96f583b34f43ac9c270b53b42c25f31c0f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:02 +0000 Subject: [PATCH 154/400] [cpan2nix] perlPackages.WWWMechanize: 1.95 -> 2.00 --- 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 caec9e09353..0504062a4d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21052,10 +21052,10 @@ let WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "1.95"; + version = "2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz"; - sha256 = "1w121x0xsn1bm699ncanyxqv3njqam3zzjkq8p54bqmzpikn5crs"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz; + sha256 = "0j5bzn9jwb8rclif776gax57jxxn108swmajiqi2cpjbmlwng0ki"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -21064,7 +21064,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 PathTiny TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { From 8e4bb3dd0987e9ece16a9ee577bd883ce3d665fb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:05 +0000 Subject: [PATCH 155/400] [cpan2nix] perlPackages.PerlCritic: 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 0504062a4d2..a2977274356 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15024,7 +15024,7 @@ let sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; From 5cbc0a31c81a9b13ff1e3c6e9d69ec7a72c7fbe1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:08 +0000 Subject: [PATCH 156/400] [cpan2nix] perlPackages.CPANUploader: 0.103013 -> 0.103014 --- 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 a2977274356..ffc61ba5576 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3542,10 +3542,10 @@ let CPANUploader = buildPerlPackage { pname = "CPAN-Uploader"; - version = "0.103013"; + version = "0.103014"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz"; - sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; + url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz; + sha256 = "1pi15yj06yyzx6xzhhclfhnbssrrpj27ncya2bh21mxnjmy52kqy"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { From 4ea70303601457f92b9273646dea18d98924f7e4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:08 +0000 Subject: [PATCH 157/400] [cpan2nix] perlPackages.TestPerlTidy: 20190402 -> 20200412 --- 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 ffc61ba5576..d147539cef7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19008,10 +19008,10 @@ let TestPerlTidy = buildPerlModule { pname = "Test-PerlTidy"; - version = "20190402"; + version = "20200412"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz"; - sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz; + sha256 = "905240447edb1930192000db659556cbf5ad5710f4376bb0a5abcd8716a4592c"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; meta = { From bab27d9ae8788a2f075822431b9d9e7f4cd44f27 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:09 +0000 Subject: [PATCH 158/400] [cpan2nix] perlPackages.DateTime: 1.51 -> 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 d147539cef7..574771183f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4611,10 +4611,10 @@ let DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.51"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz"; - sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz; + sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; From 4bc6bfff413bdebc22f12d7bb4227964f3f5e5bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:10 +0000 Subject: [PATCH 159/400] [cpan2nix] perlPackages.DateTimeFormatStrptime: 1.76 -> 1.77 --- 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 574771183f1..ce5eb2a8a92 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4807,10 +4807,10 @@ let DateTimeFormatStrptime = buildPerlPackage { pname = "DateTime-Format-Strptime"; - version = "1.76"; + version = "1.77"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz"; - sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz; + sha256 = "2fa43c838ecf5356f221a91a41c81dba22e7860c5474b4a61723259898173e4a"; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTime ]; From 5817fc14b60b537e2b45dd6139c858df5aa41f47 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:10 +0000 Subject: [PATCH 160/400] [cpan2nix] perlPackages.CodeTidyAll: 0.75 -> 0.78 --- 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 ce5eb2a8a92..0270e6882e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2865,10 +2865,10 @@ let CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.75"; + version = "0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz"; - sha256 = "0gplkyds3zmiqpvw8x8kg3g81jcm58kcxvwg5yk4dm2fdkl77xqf"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz; + sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij"; }; 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 116c42ea5fc9e6d4d6fb162802229b57c1d35a81 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:11 +0000 Subject: [PATCH 161/400] [cpan2nix] perlPackages.AppClusterSSH: 4.14 -> 4.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 0270e6882e4..ebdb10f5e2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -486,10 +486,10 @@ let AppClusterSSH = buildPerlModule { pname = "App-ClusterSSH"; - version = "4.14"; + version = "4.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz"; - sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi"; + url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.15.tar.gz; + sha256 = "1apk4yi9wfxrvspsfxr74jl1zr5z56ghknnmx8k5648zga1mn9z1"; }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; From 13e7ce64047fd033f44a5c0d436a82a7f1adc894 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:13 +0000 Subject: [PATCH 162/400] [cpan2nix] perlPackages.AnyEventRabbitMQ: 1.19 -> 1.22 --- 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 ebdb10f5e2d..680fbc0d549 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -370,12 +370,12 @@ let AnyEventRabbitMQ = buildPerlPackage { pname = "AnyEvent-RabbitMQ"; - version = "1.19"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz"; - sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; + url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.22.tar.gz; + sha256 = "98c52a1fe700710f3e5bc55a38b25de625e9b2e8341d278dcf9e1b3f3d19acee"; }; - buildInputs = [ TestException ]; + buildInputs = [ FileShareDirInstall TestException ]; propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; From 2572f4d0dae3933712c3bfb488859a49093c7702 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:14 +0000 Subject: [PATCH 163/400] [cpan2nix] perlPackages.DateTimeFormatNatural: 1.08 -> 1.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 680fbc0d549..a49472259c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4763,10 +4763,10 @@ let DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.08"; + version = "1.09"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz"; - sha256 = "0hfk9cqfy0j49vqllhxfikbkqjhf7jrm6zb9i2bxq2ywm8qnz1rj"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.09.tar.gz; + sha256 = "0mxhzib3wq408mqa8wgdlvxxjrmv2fn07ydbpyx6qny1867kczbc"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; From ebc3e172ebef482b8da2f0839d96079433ed6f18 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:32 +0000 Subject: [PATCH 164/400] [cpan2nix] perlPackages.RTClientREST: 0.56 -> 0.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a49472259c9..c6bc7dce32b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16360,10 +16360,10 @@ let RTClientREST = buildPerlModule { pname = "RT-Client-REST"; - version = "0.56"; + version = "0.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz"; - sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; + url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz; + sha256 = "0e6f2da3d96903491b43b19c61221cbeea88414264f907312f277daaf144248b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { From a5c60cd784586ffbfaa1453762ebe18b0b7e4477 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:33 +0000 Subject: [PATCH 165/400] [cpan2nix] perlPackages.DataULID: 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 c6bc7dce32b..7f56fb80824 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4432,7 +4432,7 @@ let url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.0.0.tar.gz"; sha256 = "4d757475893dbad5165f0a65c446d38b47f39019d36f77da9d29c98cbf27206f"; }; - propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure MathBigIntGMP ]; + propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure ]; meta = { homepage = "https://metacpan.org/release/Data-ULID"; description = "Universally Unique Lexicographically Sortable Identifier"; From ef87b2112369292e334e360cb7ef6b01e5c15f11 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:36 +0000 Subject: [PATCH 166/400] [cpan2nix] perlPackages.AppSqitch: v1.0.0 -> v1.1.0 --- 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 7f56fb80824..93034df79fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -615,13 +615,13 @@ let }; AppSqitch = buildPerlModule { - version = "1.0.0"; + version = "1.1.0"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz"; - sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz; + sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab"; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { From b5ccb85cd5dc7320d4f70de7691e23c387ef76dd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:38 +0000 Subject: [PATCH 167/400] [cpan2nix] perlPackages.DBIxClassHelpers: 2.034002 -> 2.036000 --- 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 93034df79fe..4d01640069b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5382,10 +5382,10 @@ let DBIxClassHelpers = buildPerlPackage { pname = "DBIx-Class-Helpers"; - version = "2.034002"; + version = "2.036000"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz"; - sha256 = "08ab0eae514653b7f59444a0a19188ef65351889e9aefb19a2ea5a159fe2574b"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.036000.tar.gz; + sha256 = "b7b8b4891a983c034ef0b45f4112404a0a40550c4e217daeb7a22ca16861efdb"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; From ea858986449d99ac68ff7ebea023fe9081c3a366 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:41 +0000 Subject: [PATCH 168/400] [cpan2nix] perlPackages.PlackMiddlewareDebug: 0.17 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d01640069b..1a5c23d6a29 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15270,10 +15270,10 @@ let PlackMiddlewareDebug = buildPerlModule { pname = "Plack-Middleware-Debug"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz"; - sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.18.tar.gz; + sha256 = "192ef79e521c90c6eff6f4149ad2e4bfc911d2c95df78935855e90d659e9ac9a"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; From 10887514370fc997ff84d48dfe6845cf5917e1c7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:42 +0000 Subject: [PATCH 169/400] [cpan2nix] perlPackages.TestLWPUserAgent: 0.033 -> 0.034 --- 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 1a5c23d6a29..8fdc2ebbda4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18683,10 +18683,10 @@ let TestLWPUserAgent = buildPerlPackage { pname = "Test-LWP-UserAgent"; - version = "0.033"; + version = "0.034"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz"; - sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz; + sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp"; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; From af7d3e9acaeeaa3c2969ccee951c302f3c270f66 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:47 +0000 Subject: [PATCH 170/400] [cpan2nix] perlPackages.DistZilla: 6.012 -> 6.015 --- 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 8fdc2ebbda4..8821590085f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5824,13 +5824,13 @@ let DistZilla = buildPerlPackage { pname = "Dist-Zilla"; - version = "6.012"; + version = "6.015"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz"; - sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz; + sha256 = "06w9mdk46y4n2dshkx6laphkqk08wfw6bqpsa5q2yb4lky0yb212"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; - propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; + propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; From 51cdbdf8fd5f6b6da4c4106fcb4ff725267d8dc1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:47 +0000 Subject: [PATCH 171/400] [cpan2nix] perlPackages.TaskFreecellSolverTesting: 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 8821590085f..409c86b71b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17742,7 +17742,7 @@ let sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC ListMoreUtils MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; license = stdenv.lib.licenses.mit; From 80a7ab3ef4554c8c05b8ea91d63199014916a281 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:49:52 +0000 Subject: [PATCH 172/400] [cpan2nix] perlPackages.NetAmazonS3: 0.87 -> 0.89 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 409c86b71b5..5c156b6f8e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13659,10 +13659,10 @@ let NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.87"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz"; - sha256 = "77d803477a0c635f311f538e163c5f10e471882c5153398012c93f4284376b8f"; + url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.89.tar.gz; + sha256 = "466b4d02b5b17790f1df22df92b22a3879423b3b33317388f0975a13e74b4eea"; }; buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; From f906d4364898769161f35055d6a45cf343dd79e2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:50:01 +0000 Subject: [PATCH 173/400] [cpan2nix] perlPackages.CatalystDevel: 1.39 -> 1.40 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5c156b6f8e8..32cf37b315c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1648,10 +1648,10 @@ let CatalystDevel = buildPerlPackage { pname = "Catalyst-Devel"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz"; - sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Devel-1.40.tar.gz; + sha256 = "8c5f064b01fa58dce395ae46f33a0d37c4cb03472dde7c5076b6df1f99e116bb"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; From e0af42b5986eab08a00e070a279bd7aba959aaef Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 15:50:02 +0000 Subject: [PATCH 174/400] [cpan2nix] perlPackages.Catmandu: 1.2011 -> 1.2012 --- 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 32cf37b315c..d26c596f267 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2117,10 +2117,10 @@ let Catmandu = buildPerlModule { pname = "Catmandu"; - version = "1.2011"; + version = "1.2012"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz"; - sha256 = "0awl5qhciphnr1ihq66ssd2hzxvh1ddbr016sxb0qhxbzqv77sb9"; + url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2012.tar.gz; + sha256 = "1dn5bqfg9vswwmvpgfziirqbjlm3gzswhknnmvg07igv1jcrk3d0"; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; From efc70eb6d7c3755ca7b6e6293439463f2c80b032 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 17:42:56 +0000 Subject: [PATCH 175/400] perlPackages.XMLParser: update patch --- ...01-HACK-Assumes-Expat-paths-are-good.patch | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch index add6d9df3b7..f66ed0dfe01 100644 --- a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -16,28 +16,30 @@ diff --git a/Makefile.PL b/Makefile.PL index 505d1df..fc38b76 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -29,12 +29,17 @@ foreach (@ARGV) { +@@ -28,12 +28,18 @@ foreach (@ARGV) { @ARGV = @replacement_args; unless ( -- check_lib( # fill in what you prompted the user for here -- lib => [qw(expat)], -- header => ['expat.h'], -- incpath => $expat_incpath, -- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), -- ) -+ #check_lib( # fill in what you prompted the user for here -+ # lib => [qw(expat)], -+ # header => ['expat.h'], -+ # incpath => $expat_incpath, -+ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), -+ #) -+ # The check_lib implementation fails horribly with cross-compilation. -+ # We are giving known good paths to expat. -+ # And in all cases, the previous behaviour of not actually failing -+ # seemed to work just fine :/. -+ false - ) { +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ($expat_libpath? +- (libpath => $expat_libpath):()), +- )) { ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ($expat_libpath? ++ # (libpath => $expat_libpath):()), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false ++ ) { warn <<'Expat_Not_Installed;'; -- From 7fe0a5c2b227709a8165d996b9dc0ba1c4aba89e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:09:09 +0000 Subject: [PATCH 176/400] perlPackages.MojoPg: fix check phase --- 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 d26c596f267..64b2b62800d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12511,6 +12511,7 @@ let sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992"; }; propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; + buildInputs = [ TestDeep ]; meta = { homepage = "https://github.com/mojolicious/mojo-pg"; description = "Mojolicious <3 PostgreSQL"; From da70544b7d5249ef87dda5f4d047eaa8d513cb7c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:13:15 +0000 Subject: [PATCH 177/400] [cpan2nix] perlPackages.CPAN: 2.27 -> 2.28 --- pkgs/top-level/perl-packages.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64b2b62800d..4a85bbd54c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3410,18 +3410,11 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.27"; + version = "2.28"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz"; - sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz"; + sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974"; }; - patches = [ - (fetchpatch { - url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff"; - name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false"; - sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp"; - }) - ]; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; From 76f9b7e839cdb406baca978a8144662b4e0c9ac3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:22:33 +0000 Subject: [PATCH 178/400] perlPackages.IOAsync: fix check phase --- 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 4a85bbd54c6..92adf5fe3fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9397,6 +9397,7 @@ let url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz; sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri"; }; + preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { From 4ba0fe9c288de8663fbea378cf0392c6fe4499ab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:28:27 +0000 Subject: [PATCH 179/400] perlPackages.Mojomysql: fix check phase --- 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 92adf5fe3fb..3634d788941 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12458,6 +12458,7 @@ let sha256 = "8695494db239e6bbec67cc686e15a60a3424b9f71af5e9936729dfd2be8a3530"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; + buildInputs = [ TestDeep ]; meta = { homepage = "https://github.com/jhthorsen/mojo-mysql"; description = "Mojolicious and Async MySQL/MariaDB"; From 959b31d98e12807f362f9d99d222a62b8dfb1388 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:31:24 +0000 Subject: [PATCH 180/400] perlPackages: 5.28.3 is the oldest supported perl --- 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 3634d788941..d816ef146d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,8 +11,8 @@ , perl, overrides, buildPerl, shortenPerlShebang }: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above -assert stdenv.lib.versionAtLeast perl.version "5.28.2"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.3 or above +assert stdenv.lib.versionAtLeast perl.version "5.28.3"; let inherit (stdenv.lib) maintainers; self = _self // (overrides pkgs); From c6a57aa80c77c12dc51a77d0e22661f79d66780c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:34:18 +0000 Subject: [PATCH 181/400] perlPackages.Alienm4: fix build --- 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 d816ef146d3..e4f9a5184ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -281,7 +281,7 @@ let sha256 = "1xnh8qa99dcvqcqzbpy0s5jrxvn7wa5ydz3lfd56n358l5jfzns9"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; + buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI pkgs.gnum4 ]; meta = { description = "Find or build GNU m4"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 50f34add91fa2b21b02b1e14b10856af5d38ec3d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:38:50 +0000 Subject: [PATCH 182/400] perlPackages.EmailOutlookMessage: fix check phase --- 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 e4f9a5184ca..84c3f908f8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6353,6 +6353,7 @@ let sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; + preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) meta = with stdenv.lib; { homepage = "https://www.matijs.net/software/msgconv/"; description = "A .MSG to mbox converter"; From 2020e90cc84968b8eedae4a3188fe2db801648ed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:48:54 +0000 Subject: [PATCH 183/400] perlPackages.POE: patches included upstream --- .../perl-POE-1.367-pod_linkcheck.patch | 40 ---------------- .../perl-POE-1.367-pod_no404s.patch | 46 ------------------- pkgs/top-level/perl-packages.nix | 6 +-- 3 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch delete mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch deleted file mode 100644 index e2f604985be..00000000000 --- a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 6d985026 -Author: Michael Brantley -Date: Tue Feb 20 07:12:06 2018 -0500 - - Update broken Pod links in lib/POE/Filter/HTTPD.pm - - Update Pod links to refer only to the utf8 module and not its methods, - fix a mis-capitalized internal reference, and convert the dangling - "MaxContent" link into a code reference. - - Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496 - -diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm -index 9d4898e3..517be691 100644 ---- a/lib/POE/Filter/HTTPD.pm -+++ b/lib/POE/Filter/HTTPD.pm -@@ -621,10 +621,10 @@ how to use these objects. - - HTTP headers are not allowed to have UTF-8 characters; they must be - ISO-8859-1. POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded --equivalent. It uses L for detection-8 and -+equivalent. It uses C for detection-8 and - L for convertion. If L is not - installed, no conversion happens. If L is --not installed, L is used instead. In this last case, you will -+not installed, C is used instead. In this last case, you will - see a warning if you try to send UTF-8 headers. - - -@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a - block of content. The HTTP::Request object's content will return empty. - The blocks of content will be parts of the request's body, up to - Content-Length in size. You distinguish between request objects and content --blocks using C (See L below). This --option supersedes L. -+blocks using C (See L below). This -+option supersedes C. - - =head1 CAVEATS - diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch deleted file mode 100644 index 097a7677e51..00000000000 --- a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 32571a21 -Author: Michael Brantley -Date: Tue Feb 20 07:07:22 2018 -0500 - - Update old URLs referenced in Pod - - Remove mention of old URLs, replace mention of canonical SVN repo with - the new git-based one at github.com. - - Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495 - -diff --git a/lib/POE.pm b/lib/POE.pm -index 80e7feac..0554ff70 100644 ---- a/lib/POE.pm -+++ b/lib/POE.pm -@@ -465,7 +465,7 @@ code snippets there as well. - The following command will fetch the most current version of POE into - the "poe" subdirectory: - -- svn co https://poe.svn.sourceforge.net/svnroot/poe poe -+ git clone https://github.com/rcaputo/poe.git - - =head2 SourceForge - -@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE - - =head2 Repositories and Changes - --Thanks to the magic of distributed version control, POE is hosted at --three locations for redundancy. You can browse the source at any one --of: -- --https://github.com/rcaputo/poe -- --https://gitorious.org/poe -- --http://poe.git.sourceforge.net/git/gitweb-index.cgi -- --Complete change logs can also be browsed at those sites. They all --provide RSS news feeds for those who want to follow development in -+You can browse the POE source and complete change logs at -+https://github.com/rcaputo/poe. It also provides an RSS -+news feed for those who want to follow development in - near-realtime. - - =head2 Other Resources diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 84c3f908f8b..32eab561a21 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15405,10 +15405,6 @@ let POE = buildPerlPackage { pname = "POE"; version = "1.368"; - patches = [ - ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch - ../development/perl-modules/perl-POE-1.367-pod_no404s.patch - ]; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz; sha256 = "08g1vzxamqg0gmkirdcx7fycq3pwv9vbajc30qwqpm1n3rvdrcdp"; @@ -16521,7 +16517,7 @@ let url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.014.tar.gz; sha256 = "02qpl3x6sh0xfby38gr80dndkah9m5r0xhk7d4a24i9hqljjaing"; }; - buildInputs = [ TestLongString TestWarn ]; + buildInputs = [ TestDeep TestLongString TestMemoryGrowth TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; meta = { homepage = "https://github.com/Sereal/Sereal"; From c26923795990e38ba99e444f97924858abd4349f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 20 Jun 2020 19:52:40 +0000 Subject: [PATCH 184/400] perlPackages.NetIPLite: fix check phase --- 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 32eab561a21..b7a9f666863 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13923,6 +13923,7 @@ let url = "mirror://cpan/authors/id/A/AL/ALEXKOM/Net-IP-Lite-0.03.tar.gz"; sha256 = "c9916e6cfaa53be275379ce4b2a550ae176ddfab50dad43b43ed43e8267802a9"; }; + buildInputs = [ TestException ]; meta = { homepage = "https://metacpan.org/pod/Net::IP::Lite"; description = "Perl extension for manipulating IPv4/IPv6 addresses"; From 6767a2c0345107689aa69aaeb62ea9f5a2d33660 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 21 Jun 2020 13:18:10 +0200 Subject: [PATCH 185/400] libpcap: don't remove static library --- pkgs/development/libraries/libpcap/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index d9cb91e4fb3..882ec992580 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -28,10 +28,6 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace " -arch i386" "" ''; - postInstall = '' - rm -f $out/lib/libpcap.a - ''; - meta = { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; From ec84e89e58477833824ab022bb9d389bd56c590c Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 21 Jun 2020 15:06:55 +0200 Subject: [PATCH 186/400] libpcap: remove static library unless dontDisableStatic is set --- pkgs/development/libraries/libpcap/default.nix | 6 ++++++ pkgs/tools/networking/dsniff/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 882ec992580..fcb599e00f5 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace " -arch i386" "" ''; + postInstall = '' + if [ "$dontDisableStatic" -ne "1" ]; then + rm -f $out/lib/libpcap.a + fi + ''; + meta = { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 4fe381cdd7a..50de41b921c 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -14,7 +14,7 @@ let }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ libpcap ]; + paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ]; postBuild = '' cp -rs $out/include/pcap $out/include/net # prevent references to libpcap From f03734efa06c6ca65be597589d68f773aa0d398c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Jun 2020 11:56:50 +0200 Subject: [PATCH 187/400] python3: improve cross-compilation of extension modules, fixes #91171 --- ...tems-not-just-Darwin-set-LDSHARED-if.patch | 33 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch diff --git a/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch new file mode 100644 index 00000000000..0c26300d9c0 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch @@ -0,0 +1,33 @@ +From 1911995b1a1252d80bf2b9651840e185a1a6baf5 Mon Sep 17 00:00:00 2001 +From: Hong Xu +Date: Thu, 25 Jul 2019 10:25:55 -0700 +Subject: [PATCH] On all posix systems, not just Darwin, set LDSHARED (if not + set) according to CC + +This patch is slightly different from https://bugs.python.org/issue24935 +, except that we now handle LDSHARED according to CC on all posix +systems, not just Darwin or Linux. +--- + Lib/distutils/sysconfig.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 37feae5df7..9fdce6896d 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -199,10 +199,10 @@ def customize_compiler(compiler): + + if 'CC' in os.environ: + newcc = os.environ['CC'] +- if (sys.platform == 'darwin' ++ if (os.name == 'posix' + and 'LDSHARED' not in os.environ + and ldshared.startswith(cc)): +- # On OS X, if CC is overridden, use that as the default ++ # On POSIX systems, if CC is overridden, use that as the default + # command for LDSHARED as well + ldshared = newcc + ldshared[len(cc):] + cc = newcc +-- +2.25.1 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 694f661a966..e6c8b301c0b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -140,6 +140,9 @@ in with passthru; stdenv.mkDerivation { sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; } ) + ] ++ [ + # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. + ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch ]; postPatch = '' From 82f170436d355d82c7e4bbef25fa7b1747b46330 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Jun 2020 16:29:10 +0200 Subject: [PATCH 188/400] btrfs-progs: remove LDSHARED This should no longer be needed with python3 because it's now set correctly in the interpreter. Note that the build currently fails with and without this change. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 5a6dafae298..f79dc239665 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; - # The i686 case is a quick hack; I don't know what's wrong. - postConfigure = stdenv.lib.optionalString (!stdenv.isi686) '' - export LDSHARED="$LD -shared" - ''; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally From e00d4d60214e04ba75d19870000e55b8ac4ed4dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 22 Jun 2020 00:16:32 -0400 Subject: [PATCH 189/400] emscripten: Don't always clain to have a GCC --- .../compilers/emscripten/fastcomp/emscripten-fastcomp.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 520a34afe58..b74c5c7e9e4 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -2,6 +2,7 @@ let rev = emscriptenVersion; + haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" "-DLLVM_BUILD_TESTS=ON" "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux + ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc) # necessary for clang to find crtend.o "-DGCC_INSTALL_PREFIX=${gcc}" ); @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { passthru = { isClang = true; + } // stdenv.lib.optionalAttrs haveGcc { inherit gcc; }; From f3f7612a409e4ebbec634ab7f20e094f206d396a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 13 Apr 2020 20:44:43 -0400 Subject: [PATCH 190/400] C++ Compilers: Systematize handling of standard libraries --- .../networking/browsers/firefox/common.nix | 2 +- .../mailreaders/thunderbird/default.nix | 2 +- pkgs/build-support/cc-wrapper/add-flags.sh | 8 +++ pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/default.nix | 61 +++++++++++++---- .../compilers/gcc/libstdc++-hook.sh | 4 -- .../development/compilers/llvm/10/default.nix | 17 +---- .../compilers/llvm/10/libc++/default.nix | 9 +-- .../compilers/llvm/10/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/5/default.nix | 14 +--- .../compilers/llvm/5/libc++/default.nix | 9 +-- .../compilers/llvm/5/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/6/default.nix | 14 +--- .../compilers/llvm/6/libc++/default.nix | 9 +-- .../compilers/llvm/6/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/7/default.nix | 68 +++++++++++++------ .../compilers/llvm/7/libc++/default.nix | 9 +-- .../compilers/llvm/7/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/8/default.nix | 19 +----- .../compilers/llvm/8/libc++/default.nix | 9 +-- .../compilers/llvm/8/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/9/default.nix | 19 +----- .../compilers/llvm/9/libc++/default.nix | 9 +-- .../compilers/llvm/9/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/swift/default.nix | 2 +- pkgs/misc/vim-plugins/overrides.nix | 2 - pkgs/stdenv/darwin/default.nix | 9 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 15 ++-- 29 files changed, 150 insertions(+), 199 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/libstdc++-hook.sh delete mode 100644 pkgs/development/compilers/llvm/10/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/5/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/6/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/8/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/9/libc++/setup-hook.sh diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8060895a2e0..a8628306bf1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation ({ BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 73536ae5fc1..09e72dd8e32 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${ diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 3398f11e8c2..04be3f408ee 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -37,6 +37,14 @@ if [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi +if [ -e @out@/nix-support/libcxx-cxxflags ]; then + NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)" +fi + +if [ -e @out@/nix-support/libcxx-ldflags ]; then + NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)" +fi + if [ -e @out@/nix-support/cc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index cf00202221e..3f9f099f3bc 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -129,7 +129,7 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" ${NIX_CXXSTDLIB_COMPILE_@suffixSalt@:-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" fi NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index da16a23f9df..e23d1c6dd4e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -48,12 +48,6 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" - else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then - "-isystem ${libcxx}/include/c++/v1" - else ""; - # The "suffix salt" is a arbitrary string added in the end of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used # without interfering. For the moment, it is defined as the target triple, @@ -68,7 +62,7 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: - if cc.isGNU or false then + if isGNU then { skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; @@ -76,7 +70,7 @@ let icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; }.${arch} or true - else if cc.isClang or false then + else if isClang then { cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; @@ -116,7 +110,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -173,8 +167,6 @@ stdenv.mkDerivation { export named_cc=${targetPrefix}cc export named_cxx=${targetPrefix}c++ - export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/${targetPrefix}gcc ]; then wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc @@ -226,7 +218,7 @@ stdenv.mkDerivation { strictDeps = true; propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; - depsTargetTargetPropagated = extraPackages; + depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; wrapperName = "CC_WRAPPER"; @@ -250,6 +242,24 @@ stdenv.mkDerivation { fi '' + + optionalString isClang '' + ## + ## General Clang support + ## + + echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + '' + + + optionalString (isClang && libcxx == null && cc ? gcc) '' + ## + ## GCC libs for non-GCC support + ## + + echo "-B${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${cc.gcc.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags + '' + + optionalString (libc != null) ('' ## ## General libc support @@ -279,6 +289,27 @@ stdenv.mkDerivation { echo "${libc_dev}" > $out/nix-support/orig-libc-dev '') + + '' + ## + ## General libc++ support + ## + + '' + + optionalString (libcxx == null && cc ? gcc) '' + for dir in ${cc.gcc}/include/c++/*; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + for dir in ${cc.gcc}/include/c++/*/${targetPlatform.config}; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + '' + + optionalString (libcxx.isLLVM or false) ('' + echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "-lc++abi" >> $out/nix-support/libcxx-ldflags + '') + + optionalString (!nativeTools) '' ## ## Initial CFLAGS @@ -389,9 +420,9 @@ stdenv.mkDerivation { # There are a few tools (to name one libstdcxx5) which do not work # well with multi line flags, so make the flags single line again + '' - if [ -e "$out/nix-support/libc-cflags" ]; then - substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' ' - fi + for flags in "$out/nix-support"/*flags; do + substituteInPlace "$flags" --replace $'\n' ' ' + done substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh deleted file mode 100644 index f5b4123b64d..00000000000 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@" diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 4181ab29bd7..870d5110d14 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -57,23 +57,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ - libstdcxxHook targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -100,14 +94,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -127,7 +119,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -145,7 +136,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -161,7 +151,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index ed76ce77a8b..872865ec474 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index e7083a6ed13..5a992f4a350 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 88ad3c29c3e..f8185fc3ff4 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index b544a4f6ba6..2316fbfc3fb 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 57f1431f471..a922bcfaf0e 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 0b71c3a28d2..b83c0d2ceed 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -87,48 +79,77 @@ let lldb = callPackage ./lldb.nix {}; + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + bintools = callPackage ./bintools.nix {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; bintools = wrapBintoolsWith { inherit (tools) bintools; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoLibc = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ ]; extraBuildCommands = '' - echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-nostartfiles" >> $out/nix-support/cc-cflags ''; }; @@ -148,9 +169,16 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ {}; + libcxx = callPackage ./libc++ ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); - libcxxabi = callPackage ./libc++abi.nix {}; + libcxxabi = callPackage ./libc++abi.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); openmp = callPackage ./openmp.nix {}; }); diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 96cb671fa43..83c05cf0e63 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index d9383d042bb..34b1f5e641b 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 24bca6aafcd..9c0c7951c79 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -43,12 +43,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 3b6db967b6a..5d93ca8709f 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index f3081d1f269..cec6de61ca9 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23..00000000000 --- a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0cd1f704421..1ebef9a9ba5 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation { buildPhase = '' # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d9a68b90041..11ffbfed9ad 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -98,8 +98,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b69de041fd2..9de6ef63bfe 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -90,11 +90,11 @@ in rec { inherit shell; inherit (last) stdenvNoCC; - extraPackages = lib.optional (libcxx != null) libcxx; + extraPackages = []; nativeTools = false; nativeLibc = false; - inherit buildPackages coreutils gnugrep bintools; + inherit buildPackages coreutils gnugrep bintools libcxx; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "${name}-clang"; outPath = bootstrapTools; }; @@ -168,8 +168,9 @@ in rec { ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; + passthru = { + isLLVM = true; + }; }; libcxxabi = stdenv.mkDerivation { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64392f49a52..e9e83584846 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -264,6 +264,7 @@ mapAliases ({ libudev = udev; # added 2018-04-25 libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a494a164f..462d67269a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8188,7 +8188,6 @@ in computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ - libstdcxxHook llvmPackages.compiler-rt ]; extraBuildCommands = '' @@ -8330,14 +8329,6 @@ in stripped = false; })); - libstdcxxHook = makeSetupHook - { substitutions = { - gcc = gcc-unwrapped; - targetConfig = stdenv.targetPlatform.config; - }; - } - ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc @@ -9394,6 +9385,10 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , # libc++ from the default LLVM version is bound at the top level, but we + # want the C++ library to be explicitly chosen by the caller, and null by + # default. + libcxx ? null , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: @@ -9406,7 +9401,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages zlib; + inherit cc bintools libc libcxx extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { From c8c09b7dda6061bb11c6f893c0be04db83461765 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 20 May 2020 02:33:41 +0000 Subject: [PATCH 191/400] add autoPatchelfIgnoreMissingDeps to auto-patchelf.sh --- doc/stdenv/stdenv.xml | 3 +++ pkgs/build-support/setup-hooks/auto-patchelf.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index ee93f39318b..818e6c5da00 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -2018,6 +2018,9 @@ addEnvHooks "$hostOffset" myBashFunction In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value. + + By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value. + The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories. diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 72970623ed7..4f7c0c14304 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -141,7 +141,7 @@ autoPatchelfFile() { # This makes sure the builder fails if we didn't find a dependency, because # the stdenv setup script is run with set -e. The actual error is emitted # earlier in the previous loop. - [ $depNotFound -eq 0 ] + [ $depNotFound -eq 0 -o -n "$autoPatchelfIgnoreMissingDeps" ] if [ -n "$rpath" ]; then echo "setting RPATH to: $rpath" >&2 From 96f72f94adb24b7fdb65c9666fb00c415c21205d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:31:40 -0400 Subject: [PATCH 192/400] retroarch: use prefixed pkg-config retroarch knows how to use the correct pkg-config, so this is no longer needed. --- pkgs/misc/emulators/retroarch/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a9950a14b4d..bfc2c338769 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; - # we use prefix-less pkg-config - PKG_CONF_PATH = "pkg-config"; - enableParallelBuilding = true; configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; From 7a8b3b8b642e88d9af35096524f509b0fb574785 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:34:31 -0400 Subject: [PATCH 193/400] perl-NetDBus: use prefixed pkg-config needed for c71ab32a678 --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3e44398f6a..45dd55f488a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13717,6 +13717,10 @@ let sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb"; }); + postPatch = '' + substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG + ''; + meta = { homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; From da8e9918364f2b63f689254d95d7c4b286baedf6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:36:24 -0400 Subject: [PATCH 194/400] crda: use prefixed pkg-config --- pkgs/os-specific/linux/crda/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 5811e9358b0..137e88cd6e8 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs utils/ - substituteInPlace Makefile --replace ldconfig true + substituteInPlace Makefile \ + --replace ldconfig true \ + --replace pkg-config $PKG_CONFIG sed -i crda.c \ -e "/\/usr\/.*\/regulatory.bin/d" \ -e "s|/lib/crda|${wireless-regdb}/lib/crda|g" From 8f0c1adda237839178e7801c64173c3b64388429 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:37:22 -0400 Subject: [PATCH 195/400] pulseaudio: use prefixed pkg-config --- pkgs/servers/pulseaudio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e15efd4b47d..513249cb7ad 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -61,6 +61,11 @@ stdenv.mkDerivation rec { ++ lib.optional zeroconfSupport avahi ); + prePatch = '' + substituteInPlace bootstrap.sh \ + --replace pkg-config $PKG_CONFIG + ''; + autoreconfPhase = '' # Performs an autoreconf patchShebangs bootstrap.sh From 95930fe8573cd024179d934b0d8d59251ce66b7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:38:06 -0400 Subject: [PATCH 196/400] openldap: set CC for cross compilation --- pkgs/development/libraries/openldap/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a4274f064e5..d4e2e0aefd6 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "STRIP=" "prefix=$(out)" "moduledir=$(out)/lib/modules" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + "CC=${stdenv.cc.targetPrefix}cc" + ]; configureFlags = [ "--enable-overlays" From 34e4d0fd98aa66a0f46a6eb96dabadbbd44294b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:39:29 -0400 Subject: [PATCH 197/400] avahi: use prefixed pkg-config --- pkgs/development/libraries/avahi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 4c7e5321f55..c401408406a 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; + prePatch = '' + substituteInPlace configure \ + --replace pkg-config "$PKG_CONFIG" + ''; + patches = [ ./no-mkdir-localstatedir.patch (fetchpatch { From 1a835f911b309c3a44a86ff6652cbc9502bfd772 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:40:00 -0400 Subject: [PATCH 198/400] SDL2: get native wayland-scanner --- pkgs/development/libraries/SDL2/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 5f3d42b4da3..40fe1c42d7a 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -42,9 +42,14 @@ stdenv.mkDerivation rec { substituteInPlace include/SDL_opengl_glext.h \ --replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \ --replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;" + + substituteInPlace configure \ + --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - nativeBuildInputs = [ pkgconfig ]; + depsBuildBuild = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; From 3f41da9b38af0324aa66a8c443373a308b0f8552 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:53:07 -0400 Subject: [PATCH 199/400] strace: use host perl perl needs to be in buildInputs for patchShebangs to work properly --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 23700a2ddc2..cbae92dd6d1 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - postPatch = "patchShebangs strace-graph"; + postPatch = "patchShebangs --host strace-graph"; configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; From 5efbf76d616bbf27cdb2fbe9992afdf299329f93 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 26 Jun 2020 14:35:36 +0200 Subject: [PATCH 200/400] libva: 2.7.1 -> 2.8.0 --- pkgs/development/libraries/libva/default.nix | 17 ++--------------- .../default.nix => libva/utils.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) rename pkgs/development/libraries/{libva-utils/default.nix => libva/utils.nix} (93%) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index d0bd2ecc009..7f690f0997b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,29 +7,16 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.7.1"; # Also update the hash for libva-utils! + version = "2.8.0"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; + sha256 = "190cq173jzp5rkrczi8gzbwa0y3xk253v4wd205a5ilfngm7srns"; }; - patches = [ - (fetchpatch { # meson: Allow for libdir and includedir to be absolute paths - url = "https://github.com/intel/libva/commit/de902e2905abff635f3bb151718cc52caa3f669c.patch"; - sha256 = "1lpc8qzvsxnlsh9g0ab5lja204zxz8rr2p973pfihcw7dcxc3gia"; - }) - ]; - - postPatch = '' - # Remove the execute bit from all source code files - # https://github.com/intel/libva/commit/dbd2cd635f33af1422cbc2079af0a7e68671c102 - chmod -x va/va{,_dec_av1,_trace,_vpp}.h - ''; - outputs = [ "dev" "out" ]; nativeBuildInputs = [ meson pkg-config ninja wayland ]; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva/utils.nix similarity index 93% rename from pkgs/development/libraries/libva-utils/default.nix rename to pkgs/development/libraries/libva/utils.nix index 90f1849aee0..5b9f4cdd8aa 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; + sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 306602b3785..c5b03826a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13604,7 +13604,7 @@ in libva = callPackage ../development/libraries/libva { }; libva-minimal = libva.override { minimal = true; }; - libva-utils = callPackage ../development/libraries/libva-utils { }; + libva-utils = callPackage ../development/libraries/libva/utils.nix { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; libva1-minimal = libva1.override { minimal = true; }; From 82daa41e293caf9d88ae158f261bf7d8f523c4c1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 27 Jun 2020 00:56:11 +0200 Subject: [PATCH 201/400] cargo: install bash and zsh completion scripts --- pkgs/development/compilers/rust/cargo.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index dfea7f6c8ef..e820b982620 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -38,6 +38,11 @@ rustPlatform.buildRustPackage { --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" installManPage src/tools/cargo/src/etc/man/* + + installShellCompletion --bash --name cargo \ + src/tools/cargo/src/etc/cargo.bashcomp.sh + + installShellCompletion --zsh src/tools/cargo/src/etc/_cargo ''; checkPhase = '' From 81a8b76b3aadd1c73122cc076d44796fbf9a112f Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Tue, 23 Jun 2020 12:52:33 +0200 Subject: [PATCH 202/400] go: only set CC when cross-compiling This avoids he default CC for cgo being hardcoded, when we only want to overwrite it during compilation. --- pkgs/development/compilers/go/1.13.nix | 3 +++ pkgs/development/compilers/go/1.14.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 48e4d9bdc6c..a158e1d4d3b 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -186,8 +186,11 @@ stdenv.mkDerivation rec { export PATH=$(pwd)/bin:$PATH + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + ''} ulimit -a ''; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 95a602025d9..6ddd61253a4 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -193,8 +193,11 @@ stdenv.mkDerivation rec { export PATH=$(pwd)/bin:$PATH + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + ''} ulimit -a ''; From 87dbe6d797f98a3e5bf1ac5b868f864acdfbf939 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Jun 2020 11:32:21 +1000 Subject: [PATCH 203/400] buildGoModule: remove trailing whitespace --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 0d8b382167e..a478871bd9a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -127,7 +127,7 @@ let export GOSUMDB=off export GOPROXY=off cd "$modRoot" - if [ -n "${go-modules}" ]; then + if [ -n "${go-modules}" ]; then rm -rf vendor ln -s ${go-modules} vendor fi From cbb288204d1adfd5269cb1e5ee69013546e268a7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 28 Jun 2020 11:12:52 +0200 Subject: [PATCH 204/400] file: backport patch to fix a 5.39 regression This bug is causing diffoscope to fail to build with file 5.39. --- pkgs/tools/misc/file/default.nix | 6 ++++++ pkgs/tools/misc/file/webassembly-format-fix.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/misc/file/webassembly-format-fix.patch diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 730234998ed..8e284b25c08 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; }; + patches = [ + # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3 + # Without the RCS id change to avoid conflicts. Remove on next bump. + ./webassembly-format-fix.patch + ]; + nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/pkgs/tools/misc/file/webassembly-format-fix.patch b/pkgs/tools/misc/file/webassembly-format-fix.patch new file mode 100644 index 00000000000..5eca833e4d7 --- /dev/null +++ b/pkgs/tools/misc/file/webassembly-format-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/funcs.c b/src/funcs.c +index 299b8f022..ecbfa28c5 100644 +--- a/src/funcs.c ++++ b/src/funcs.c +@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) + if (*++p == '%') + continue; + // Skip uninteresting. +- while (strchr("0.'+- ", *p) != NULL) ++ while (strchr("#0.'+- ", *p) != NULL) + p++; + if (*p == '*') { + if (msg) From 277dd15bebe9081c170baddc9cf033e52cc35dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 24 Jun 2020 11:01:40 +0200 Subject: [PATCH 205/400] curl: 7.70.0 -> 7.71.0 Changelog: https://daniel.haxx.se/blog/2020/06/24/curl-7-71-0-blobs-and-retries/ --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 11a928a3ef1..68de0661072 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -29,14 +29,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.70.0"; + version = "7.71.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1l19b2xmzwjl2fqlbv46kwlz1823miaxczyx2a5lz8k7mmigw2x5"; + sha256 = "0hfkbp51vj51s28sq2wnw5jn2f6r7ycdy78lli49ba414jn003v0"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 4a78b2b04f3f63eaf1c29dca12d44d820bb9374a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 4 Feb 2020 22:36:42 +0100 Subject: [PATCH 206/400] glibc: 2.30 -> 2.31 https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00001.html --- .../libraries/glibc/2.27-CVE-2019-19126.patch | 18 ------------------ pkgs/development/libraries/glibc/common.nix | 6 ++---- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch diff --git a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch deleted file mode 100644 index 2c558f53b73..00000000000 --- a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch +++ /dev/null @@ -1,18 +0,0 @@ -Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS -diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -index 1943691..ac694c0 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -@@ -31,7 +31,8 @@ - environment variable, LD_PREFER_MAP_32BIT_EXEC. */ - #define EXTRA_LD_ENVVARS \ - case 21: \ -- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ -+ if (!__libc_enable_secure \ -+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ - GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \ - |= bit_arch_Prefer_MAP_32BIT_EXEC; \ - break; --- -2.9.3 - diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 36b6bea61cd..0cd61de4548 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -36,9 +36,9 @@ } @ args: let - version = "2.30"; + version = "2.31"; patchSuffix = ""; - sha256 = "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72"; + sha256 = "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"; in assert withLinuxHeaders -> linuxHeaders != null; @@ -108,8 +108,6 @@ stdenv.mkDerivation ({ }) ./fix-x64-abi.patch - ./2.27-CVE-2019-19126.patch - ./2.30-cve-2020-1752.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; From 4847222db128d2d257dd60304d946a5272d5e912 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 19 Feb 2020 22:33:48 +0100 Subject: [PATCH 207/400] busybox: fix build w/glibc-2.31 --- .../0001-Fix-build-with-glibc-2.31.patch | 71 +++++++++++++++++++ pkgs/os-specific/linux/busybox/default.nix | 1 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch diff --git a/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch b/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch new file mode 100644 index 00000000000..029333b57e4 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch @@ -0,0 +1,71 @@ +From c29b637b55c93214993f40b1a223233d40b8a7d6 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 19 Feb 2020 22:32:28 +0100 +Subject: [PATCH] Fix build with glibc 2.31 + +This is derived from the corresponding upstream patch[1], however this +one doesn't apply cleanly on busybox-1.31.1, so I rebased the patch +locally and added it directly to nixpkgs. + +[1] https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9 +--- + coreutils/date.c | 2 +- + libbb/missing_syscalls.c | 8 -------- + util-linux/rdate.c | 8 ++++++-- + 3 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/coreutils/date.c b/coreutils/date.c +index 3414d38..931b7f9 100644 +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -303,7 +303,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) + ts.tv_sec = validate_tm_time(date_str, &tm_time); + + /* if setting time, set it */ +- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { ++ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { + bb_perror_msg("can't set date"); + } + } +diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c +index 87cf59b..dc40d91 100644 +--- a/libbb/missing_syscalls.c ++++ b/libbb/missing_syscalls.c +@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) + return syscall(__NR_getsid, pid); + } + +-int stime(const time_t *t) +-{ +- struct timeval tv; +- tv.tv_sec = *t; +- tv.tv_usec = 0; +- return settimeofday(&tv, NULL); +-} +- + int sethostname(const char *name, size_t len) + { + return syscall(__NR_sethostname, name, len); +diff --git a/util-linux/rdate.c b/util-linux/rdate.c +index 70f829e..878375d 100644 +--- a/util-linux/rdate.c ++++ b/util-linux/rdate.c +@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) + if (!(flags & 2)) { /* no -p (-s may be present) */ + if (time(NULL) == remote_time) + bb_error_msg("current time matches remote time"); +- else +- if (stime(&remote_time) < 0) ++ else { ++ struct timespec ts; ++ ts.tv_sec = remote_time; ++ ts.tv_nsec = 0; ++ if (clock_settime(CLOCK_REALTIME, &ts) < 0) + bb_perror_msg_and_die("can't set time of day"); ++ } + } + + if (flags != 1) /* not lone -s */ +-- +2.25.0 + diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 430066831b8..cbdedaa62a7 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch + ./0001-Fix-build-with-glibc-2.31.patch ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; From cff1a1eefca8af3c13a94a0b9257a3f9ff721c37 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Feb 2020 02:06:23 +0100 Subject: [PATCH 208/400] gcc7: fix build w/glibc-2.31 Applied a patch from the `gcc9` branch for `gcc7` to fix `libsanitizer` for glibc-2.31. --- .../gcc/7/0001-Fix-build-for-glibc-2.31.patch | 62 +++++++++++++++++++ pkgs/development/compilers/gcc/7/default.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch diff --git a/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch b/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch new file mode 100644 index 00000000000..d8aad14942b --- /dev/null +++ b/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch @@ -0,0 +1,62 @@ +From 2d03b6eaf823fc2db6a32b4a95e18f8a7474b47f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Thu, 20 Feb 2020 01:56:42 +0100 +Subject: [PATCH] Fix build for glibc 2.31 + +--- + .../sanitizer_platform_limits_posix.cc | 5 +++-- + .../sanitizer_platform_limits_posix.h | 15 +-------------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 97eae3fc7..4089d4695 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1145,8 +1145,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index c13932283..3456fb2db 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -204,27 +204,14 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.25.0 + diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 89933c22edd..dcd129ff25a 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -53,6 +53,8 @@ let majorVersion = "7"; ./riscv-pthread-reentrant.patch # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html ./riscv-no-relax.patch + + ./0001-Fix-build-for-glibc-2.31.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ From d348694fb680bc134ea893cc031439a21576a485 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Feb 2020 15:09:22 +0100 Subject: [PATCH 209/400] gcc6: fix build w/glibc-2.31 --- .../gcc/6/0001-Fix-build-for-glibc-2.31.patch | 62 +++++++++++++++++++ pkgs/development/compilers/gcc/6/default.nix | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch diff --git a/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch b/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch new file mode 100644 index 00000000000..0cd04e218ca --- /dev/null +++ b/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch @@ -0,0 +1,62 @@ +From 8b55f1047cf3491429c1af607e5dac08a81db6e1 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Thu, 20 Feb 2020 15:08:36 +0100 +Subject: [PATCH] Fix build for glibc 2.31 + +--- + .../sanitizer_platform_limits_posix.cc | 5 +++-- + .../sanitizer_platform_limits_posix.h | 15 +-------------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 069d8d557..c49c28c6e 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 + #endif +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 304d04e39..568081a79 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -200,27 +200,14 @@ namespace __sanitizer { + unsigned __seq; + u64 __unused1; + u64 __unused2; +-#elif defined(__mips__) || defined(__aarch64__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #elif defined(__sparc__) +-# if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-# endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.25.0 + diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index f3b15eac55d..f1bc490bd77 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -65,7 +65,7 @@ let majorVersion = "6"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = - [ ../use-source-date-epoch.patch ] + [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch From f95acb5cc602b95c87e2da54c6dc10235ebac9fe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 18 Jun 2020 00:38:32 +0200 Subject: [PATCH 210/400] imagemagick7: 7.0.10-17 -> 7.0.10-19, fix build w/glibc-2.31 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9bcf517e1d9..2216fe9199d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-17"; - sha256 = "15cj9qkikx13j6gfqaawi4nh09lnzg3asf5mdcswx6z6yhbf90zx"; + version = "7.0.10-19"; + sha256 = "12ilfdbxllkaa3bs9z86d2nkklqz5c0l57kqj91l2ixjlvra64w0"; patches = []; }; in From 7193603c5f91395f936a6522486aac2b7badc227 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 14:38:19 +0200 Subject: [PATCH 211/400] datefudge: fix build w/glibc-2.31 https://hydra.nixos.org/build/122874972 --- pkgs/tools/system/datefudge/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 839e14a20d8..fd0cc5f582a 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation { pname = "datefudge"; @@ -10,15 +10,20 @@ stdenv.mkDerivation { sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/datefudge/raw/master/f/datefudge_1.23-tz.patch"; + sha256 = "19c2fvhm06wnp3059b0rnd7dqdchkan8iycjh8jk8y25j870zkvn"; + }) + ]; + + postPatch = '' substituteInPlace Makefile \ --replace "/usr" "/" \ --replace "-o root -g root" "" substituteInPlace datefudge.sh \ --replace "@LIBDIR@" "$out/lib/" - ''; - - preInstallPhase = "mkdir -P $out/lib/datefudge"; + ''; installFlags = [ "DESTDIR=$(out)" ]; From 44fb6cc037c9702430a5a1e77a848a2f6f6a0efa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 14:49:13 +0200 Subject: [PATCH 212/400] vdr: fix build w/glibc-2.31 https://hydra.nixos.org/build/122891193 --- pkgs/applications/video/vdr/default.nix | 7 ++++++- .../applications/video/vdr/glibc2.31-compat.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/vdr/glibc2.31-compat.patch diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index d025554835e..14ca503f2e9 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, systemd, perl, lib +, gettext, systemd, perl, lib, fetchpatch , enableSystemd ? true , enableBidi ? true }: stdenv.mkDerivation rec { @@ -12,6 +12,11 @@ sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; }; + patches = [ + # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6 + ./glibc2.31-compat.patch + ]; + enableParallelBuilding = true; postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; diff --git a/pkgs/applications/video/vdr/glibc2.31-compat.patch b/pkgs/applications/video/vdr/glibc2.31-compat.patch new file mode 100644 index 00000000000..9a52d4b290b --- /dev/null +++ b/pkgs/applications/video/vdr/glibc2.31-compat.patch @@ -0,0 +1,15 @@ +diff --git a/eit.c b/eit.c +index 50d8229..373dbca 100644 +--- a/eit.c ++++ b/eit.c +@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- if (stime(&dvbtim) == 0) ++ timespec ts = { 0 }; ++ ts.tv_sec = dvbtim; ++ if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + else + esyslog("ERROR while setting system time: %m"); From 2c60e7c2d090a0b5934b50316660bd9d463789a7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 16:36:00 +0200 Subject: [PATCH 213/400] llvm*: compiler-rt: fix build w/glibc-2.31 https://hydra.nixos.org/build/122885657 and more. Original upstream fix (available in llvm_10): https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce --- .../compilers/llvm/5/compiler-rt.nix | 1 + .../compilers/llvm/6/compiler-rt.nix | 1 + .../compilers/llvm/7/compiler-rt-glibc.patch | 48 +++++++++++++++++++ .../compilers/llvm/7/compiler-rt.nix | 3 ++ .../compilers/llvm/8/compiler-rt.nix | 1 + .../compilers/llvm/9/compiler-rt.nix | 1 + 6 files changed, 55 insertions(+) create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 624034b5228..32d6dd3d479 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ../7/compiler-rt-glibc.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 13abf6d9561..89f25cad2c5 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ../7/compiler-rt-glibc.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch b/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch new file mode 100644 index 00000000000..2d211795fc8 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch @@ -0,0 +1,48 @@ +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 54da635..c5dc1cd 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1158,8 +1158,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index f89a113..f6f986f 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -213,26 +213,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 84ca6af3b36..97a5d73f304 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = [ + # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce + ./compiler-rt-glibc.patch + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 15e55800dc8..a907d408655 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = [ + ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 0183754a2fd..394f66ff7f1 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; patches = [ + ../7/compiler-rt-glibc.patch ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; From 872f65db46f2e11f7f287d77d2bae3158d349a6a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 27 Jun 2020 13:13:28 +0200 Subject: [PATCH 214/400] llvm/clang: remove deprecated attrs for 4, 3.5 and 3.9 --- pkgs/top-level/aliases.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 959bfd90d2f..8240bb15731 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -703,23 +703,6 @@ mapAliases ({ # added 2020-02-09 dina-font-pcf = dina-font; - /* Cleanup before 20.09 */ - llvm_4 = throw '' - The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03 - due to a lack of compatibility with glibc 2.30! - ''; - llvm_39 = llvm_4; - llvm_35 = llvm_4; - lld_4 = llvm_4; - - llvmPackages_4 = llvm_4; - llvmPackages_39 = llvm_4; - llvmPackages_35 = llvm_4; - - clang_39 = llvm_4; - clang_35 = llvm_4; - clang_4 = llvm_4; - # added 2019-04-13 # *-polly pointed to llvmPackages_latest llvm-polly = throw "clang is now built with polly-plugin by default"; From 22b69ed143809b64e2179b244d958336379d15e7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 27 Jun 2020 13:39:00 +0200 Subject: [PATCH 215/400] python3Packages.supervisor: fix build w/glibc-2.31 https://hydra.nixos.org/build/122877074 --- .../python-modules/supervisor/default.nix | 7 +++++++ .../python-modules/supervisor/glibc-2.31.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/supervisor/glibc-2.31.patch diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 343aaddfbb5..cee258dbd3a 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -14,6 +14,13 @@ buildPythonPackage rec { sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8"; }; + patches = [ + # SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096: + # * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44 + # * https://github.com/Supervisor/supervisor/issues/1346 + ./glibc-2.31.patch + ]; + # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/supervisor/glibc-2.31.patch b/pkgs/development/python-modules/supervisor/glibc-2.31.patch new file mode 100644 index 00000000000..b2d9564eea1 --- /dev/null +++ b/pkgs/development/python-modules/supervisor/glibc-2.31.patch @@ -0,0 +1,13 @@ +diff --git a/supervisor/tests/base.py b/supervisor/tests/base.py +index 643e609..8aa45e7 100644 +--- a/supervisor/tests/base.py ++++ b/supervisor/tests/base.py +@@ -358,7 +358,7 @@ class DummySocketConfig: + return not self.__eq__(other) + + def get_backlog(self): +- return 128 ++ return 4096 + + def create_and_bind(self): + return DummySocket(self.fd) From 923b6bff55837bcda35eb136a5bee69f8b9801cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 27 Jun 2020 13:45:20 +0200 Subject: [PATCH 216/400] cups-bjnp: fix build w/glibc-2.31 https://hydra.nixos.org/build/122883083 --- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index e9fac1c73e2..9dbfdd8b803 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = [ + "-include stdio.h" + "-Wno-error=stringop-truncation" + "-Wno-error=deprecated-declarations" + ]; meta = { description = "CUPS back-end for Canon printers"; From 114f97e77e0f9bba09edf2251963495a41baeb64 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 28 Jun 2020 17:40:26 +0200 Subject: [PATCH 217/400] gcc49: fix build w/glibc-2.31 The same `libsanitizer` problem as in llvm<10 and newer GCCs. https://hydra.nixos.org/build/122902814 https://hydra.nixos.org/build/122903349 --- .../development/compilers/gcc/4.9/default.nix | 1 + .../compilers/gcc/4.9/libsanitizer.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/compilers/gcc/4.9/libsanitizer.patch diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 0a35ed023c6..6f4fd415fc0 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -63,6 +63,7 @@ let majorVersion = "4"; patches = [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch + ./libsanitizer.patch (fetchpatch { name = "avoid-ustat-glibc-2.28.patch"; url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; diff --git a/pkgs/development/compilers/gcc/4.9/libsanitizer.patch b/pkgs/development/compilers/gcc/4.9/libsanitizer.patch new file mode 100644 index 00000000000..f1a438a4e5f --- /dev/null +++ b/pkgs/development/compilers/gcc/4.9/libsanitizer.patch @@ -0,0 +1,24 @@ +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index aec950454..5bda9b3a3 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -156,18 +156,13 @@ namespace __sanitizer { + #elif defined(__sparc__) + # if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-# else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; + # endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) From 116f39ff8264b2084c613c088b6876e7eeba43f9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 28 Jun 2020 23:15:25 +0200 Subject: [PATCH 218/400] swift: fix build w/glibc-2.31 https://hydra.nixos.org/build/123279517 Internally used `compiler-rt` had to be fixed for `glibc-2.31`, basically the same approach as in the LLVM fix (7137183bbe05738246be2be0e704c1be9bf19947). As soon as a newer `compiler-rt` is used for `swift`, this patch can be removed again. --- pkgs/development/compilers/swift/default.nix | 3 ++ .../compilers/swift/patches/swift-llvm.patch | 48 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/compilers/swift/patches/swift-llvm.patch diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 1ebef9a9ba5..b838aa59177 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -182,6 +182,9 @@ stdenv.mkDerivation { ''; patchPhase = '' + # Glibc 2.31 fix + patch -p1 -i ${./patches/swift-llvm.patch} + # Just patch all the things for now, we can focus this later patchShebangs $SWIFT_SOURCE_ROOT diff --git a/pkgs/development/compilers/swift/patches/swift-llvm.patch b/pkgs/development/compilers/swift/patches/swift-llvm.patch new file mode 100644 index 00000000000..fcd9533fd72 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/swift-llvm.patch @@ -0,0 +1,48 @@ +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index bc6675bf4..2f3514b64 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1129,8 +1129,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +index de69852d3..652d5cb3b 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -204,26 +204,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) From 1421404d425ec3af31f9d3f53a69fd94b1b88657 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 22 Jun 2020 09:32:57 +0000 Subject: [PATCH 219/400] stdenv: fix backward multiple outputs conditional This is supposed to shareDocName to a fallback value if it can't be determined from looking at the configure script. But the conditional checked whether shareDocName was set, rather than if it wasn't. This meant that if shareDocName had been detected from a configure script, it would be immediately overridden by the package name, and if it couldn't be detected, shareDocName would remain unset. This resulted in QEMU installing files like $out/share/doc/index.html, which should of course have been in $out/share/doc/qemu/index.html. An interesting side effect of this is that, since 9f8751528cd89d343258dd718afa56f8590917bb when this code was added, the detected package name has never actually been used for installing documentation, because it would always be overridden. So this patch will actually enable that for the first time, four years later. Fixes: https://github.com/NixOS/nixpkgs/issues/90486 --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 2e95495c96f..bfa47e3b20e 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -61,7 +61,7 @@ _multioutConfig() { local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")" fi # PACKAGE_TARNAME sometimes contains garbage. - if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then + if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')" fi fi From be1b22538a60e52987d238bb11f93043682b6e9a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Jun 2020 17:58:30 +0000 Subject: [PATCH 220/400] cmake: only set output paths with multiple outputs This brings cmake inline with the behaviour used for configure scripts, defined in multiple-outputs.sh. It's important because that setup hook will only set shareDocName if multiple outputs are in use (and setOutputFlags hasn't been disabled). So previously, CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output derivations, instead of $out/share/doc/$shareDocName, which would result in collisions. Since this hook now uses the setOutputFlags variable, I had to remove the empty assignment of it added in a714284d8b7d2dac3ed2c76670f290fe332da00c. Fixes: https://github.com/NixOS/nixpkgs/issues/82304 --- .../tools/build-managers/cmake/setup-hook.sh | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 87bbefa6bbf..b343e1f91fc 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -68,19 +68,24 @@ cmakeConfigurePhase() { # nix/store directory. cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" - # This ensures correct paths with multiple output derivations - # It requires the project to use variables from GNUInstallDirs module - # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html - cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags" + if [ "$outputs" != "out" -a -n "${setOutputFlags-1}" ]; then + # This ensures correct paths with multiple output derivations + # It requires the project to use variables from GNUInstallDirs module + # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html + cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags" + fi + + # This output flag must always be set, unlike the others, because + # otherwise we end up with lib64. cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags" # Don’t build tests when doCheck = false if [ -z "${doCheck-}" ]; then @@ -115,7 +120,6 @@ cmakeConfigurePhase() { } if [ -z "${dontUseCmakeConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= configurePhase=cmakeConfigurePhase fi From 39fef703bf23a05677d94bcf3384f6f293350947 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 23 Jun 2020 21:25:23 +0000 Subject: [PATCH 221/400] ghostscript: fix build This hack is no longer necessary, since multiple-outputs.sh has been fixed to install docs in the right location. --- pkgs/misc/ghostscript/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a1059559187..eca15faf1ad 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -99,9 +99,6 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - mkdir -p "$doc/share/doc/ghostscript" - mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/" - ln -s "${fonts}" "$out/share/ghostscript/fonts" '' + stdenv.lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do From 10bb0637e43ec7d6fab3dfe9c955d21f32364852 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Jun 2020 10:17:53 +0000 Subject: [PATCH 222/400] Revert "darktable: Remove doc directory from output" This reverts commit 730133e130a03f074b489b13ee2a3f3df8197b2f. multiple-outputs.sh has been fixed, so documentation is now corrrrectly installed under $out/share/doc/darktable. Fixes: https://github.com/NixOS/nixpkgs/pull/72160 Fixes: https://github.com/NixOS/nixpkgs/pull/83248 --- pkgs/applications/graphics/darktable/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b021c186b5c..948b4ddd54d 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; - # Reduce the risk of collisions - postInstall = "rm -r $out/share/doc"; # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the From 3abe43e22d4c546504b59424e2327d869304e6bd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Jun 2020 21:32:28 +0000 Subject: [PATCH 223/400] transmission: install documentation The risk of collisions is gone now because documentation is correctly installed into $out/share/doc/transmission instead of $out/share/doc as before. --- pkgs/applications/networking/p2p/transmission/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d59cdff34fd..ab4fc0908ba 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -72,9 +72,6 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - # Reduce the risk of collisions - postInstall = "rm -r $out/share/doc"; - meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' From ecb560bf473b89136e48fce1bfea596e3a76fc38 Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Mon, 29 Jun 2020 19:45:06 +0200 Subject: [PATCH 224/400] platformio: Put udev rules into package output --- pkgs/development/arduino/platformio/chrootenv.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 01a2fb873aa..62a1d190a00 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSUserEnv }: +{ lib, buildFHSUserEnv, fetchFromGitHub }: let pio-pkgs = pkgs: @@ -19,6 +19,14 @@ let platformio ]); + src = fetchFromGitHub { + owner = "platformio"; + repo = "platformio-core"; + rev = "v4.3.4"; + sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; + }; + + in buildFHSUserEnv { name = "platformio"; @@ -34,7 +42,10 @@ in buildFHSUserEnv { }; extraInstallCommands = '' + mkdir -p $out/lib/udev/rules.d + ln -s $out/bin/platformio $out/bin/pio + ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules ''; runScript = "platformio"; From 5ed47f34e429a6d6f62867729b9f033e8fca12f2 Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Mon, 29 Jun 2020 19:45:27 +0200 Subject: [PATCH 225/400] platformio: Patch warning about missing udev rules This adds the sentence "On NixOS add the platformio package to services.udev.packages" to the warning. --- pkgs/development/arduino/platformio/core.nix | 1 + .../platformio/missing-udev-rules-nixos.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index d83013dbbde..891d613da51 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -82,6 +82,7 @@ in buildPythonApplication rec { patches = [ ./fix-searchpath.patch ./use-local-spdx-license-list.patch + ./missing-udev-rules-nixos.patch ]; postPatch = '' diff --git a/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch new file mode 100644 index 00000000000..f29b93cef4d --- /dev/null +++ b/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch @@ -0,0 +1,14 @@ +diff --git a/platformio/exception.py b/platformio/exception.py +index d291ad7f..4761a35b 100644 +--- a/platformio/exception.py ++++ b/platformio/exception.py +@@ -195,7 +195,8 @@ class MissedUdevRules(InvalidUdevRules): + + MESSAGE = ( + "Warning! Please install `99-platformio-udev.rules`. \nMode details: " +- "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules" ++ "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules\n" ++ "On NixOS add the platformio package to services.udev.packages" + ) + + From eb1ce34d3d7dd7ecdd1fc17347bc12755313f050 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Tue, 30 Jun 2020 10:03:01 +0100 Subject: [PATCH 226/400] gperftools: fix build on ARM The use of libunwind by tcmalloc segfaults on ARM, so don't use that. See eg https://www.dcddcc.com/blog/2018-06-09-building-mongodb-for-32-bit-ARM-on-debian-ubuntu.html#problem-6-tcmalloc-and-libunwind --- pkgs/development/libraries/gperftools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 039231c0142..410e790255f 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y"; }; - buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; + # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux + buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ From 9cd98386a38891d1074fc18036b842dc4416f562 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 30 Jun 2020 13:18:22 +0200 Subject: [PATCH 227/400] glibc: build with patches for CVE-2020-1752 & CVE-2020-10029 /cc roundup #88306 --- .../libraries/glibc/2.31-cve-2020-10029.patch | 79 +++++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch diff --git a/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch b/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch new file mode 100644 index 00000000000..8334398e891 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch @@ -0,0 +1,79 @@ +diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile +index 995e90d6da..318628aed6 100644 +--- a/sysdeps/ieee754/ldbl-96/Makefile ++++ b/sysdeps/ieee754/ldbl-96/Makefile +@@ -17,5 +17,6 @@ + # . + + ifeq ($(subdir),math) +-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 ++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo ++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all + endif +diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +index 5f742321ae..bcdf20179f 100644 +--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) + return 0; + } + ++ if ((i0 & 0x80000000) == 0) ++ { ++ /* Pseudo-zero and unnormal representations are not valid ++ representations of long double. We need to avoid stack ++ corruption in __kernel_rem_pio2, which expects input in a ++ particular normal form, but those representations do not need ++ to be consistently handled like any particular floating-point ++ value. */ ++ y[1] = y[0] = __builtin_nanl (""); ++ return 0; ++ } ++ + /* Split the 64 bits of the mantissa into three 24-bit integers + stored in a double array. */ + exp = j0 - 23; +--- /dev/null ++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +@@ -0,0 +1,41 @@ ++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ for (int i = 0; i < 64; i++) ++ { ++ uint64_t sig = i == 63 ? 0 : 1ULL << i; ++ long double ld; ++ SET_LDOUBLE_WORDS (ld, 0x4141, ++ sig >> 32, sig & 0xffffffffULL); ++ /* The requirement is that no stack overflow occurs when the ++ pseudo-zero or unnormal goes through range reduction. */ ++ volatile long double ldr; ++ ldr = sinl (ld); ++ (void) ldr; ++ } ++ return 0; ++} ++ ++#include diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 0cd61de4548..8afea21729a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -108,6 +108,8 @@ stdenv.mkDerivation ({ }) ./fix-x64-abi.patch + ./2.30-cve-2020-1752.patch + ./2.31-cve-2020-10029.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; From 1085403acdbaa7337d6074074f69ec6698226474 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 30 Jun 2020 15:04:10 +0000 Subject: [PATCH 228/400] {cc,bintools}-wrapper: Comments no longer spliced This means we can freely keep the comments up to date without the penalty of a mass rebuild. --- .../bintools-wrapper/default.nix | 73 ++++++------ pkgs/build-support/cc-wrapper/default.nix | 110 +++++++++--------- 2 files changed, 91 insertions(+), 92 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 9e31ca6a8a2..31373d6b239 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -132,15 +132,15 @@ stdenv.mkDerivation { ldPath="${bintools_bin}/bin" '' + # Solaris needs an additional ld wrapper. + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' - # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" exec="$ldPath/${targetPrefix}ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + # Create a symlink to as (the assembler). + '' - # Create a symlink to as (the assembler). if [ -e $ldPath/${targetPrefix}as ]; then ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as fi @@ -200,26 +200,28 @@ stdenv.mkDerivation { ]; postFixup = + ## + ## General libc support + ## optionalString (libc != null) ('' - ## - ## General libc support - ## - echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev + '' - ## - ## Dynamic linker support - ## - + ## + ## Dynamic linker support + ## + + '' if [[ -z ''${dynamicLinker+x} ]]; then echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 local dynamicLinker="${libc_lib}/lib/ld*.so.?" fi + '' - # Expand globs to fill array of options + # Expand globs to fill array of options + + '' dynamicLinker=($dynamicLinker) case ''${#dynamicLinker[@]} in @@ -241,45 +243,45 @@ stdenv.mkDerivation { local ldflagsBefore=(-dynamic-linker "$dynamicLinker") '') + '' fi - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). + '' + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to ld + # (the *last* value counts, so ours should come first). + + '' printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') + # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. + optionalString stdenv.targetPlatform.isMacOS '' - # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before '' - + optionalString (!nativeTools) '' - ## - ## User env support - ## + ## + ## User env support + ## - # Propagate the underling unwrapped bintools so that if you - # install the wrapper, you get tools like objdump (same for any - # binaries of libc). + # Propagate the underling unwrapped bintools so that if you + # install the wrapper, you get tools like objdump (same for any + # binaries of libc). + + optionalString (!nativeTools) '' printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' + ## + ## Man page and info support + ## + optionalString propagateDoc ('' - ## - ## Man page and info support - ## - ln -s ${bintools.man} $man '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info '') - + '' - ## - ## Hardening support - ## + ## + ## Hardening support + ## - # some linkers on some platforms don't support specific -z flags + # some linkers on some platforms don't support specific -z flags + + '' export hardening_unsupported_flags="" if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" bindnow" @@ -307,12 +309,11 @@ stdenv.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; inherit dynamicLinker expand-response-params; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e23d1c6dd4e..159324e0205 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -154,16 +154,18 @@ stdenv.mkDerivation { ccPath="${cc}/bin" '') + # Create symlinks to everything in the bintools wrapper. + '' - # Create symlinks to everything in the bintools wrapper. for bbin in $bintools/bin/*; do mkdir -p "$out/bin" ln -s "$bbin" "$out/bin/$(basename $bbin)" done + '' - # We export environment variables pointing to the wrapped nonstandard - # cmds, lest some lousy configure script use those to guess compiler - # version. + # We export environment variables pointing to the wrapped nonstandard + # cmds, lest some lousy configure script use those to guess compiler + # version. + + '' export named_cc=${targetPrefix}cc export named_cxx=${targetPrefix}c++ @@ -228,12 +230,12 @@ stdenv.mkDerivation { ]; postFixup = + # Backwards compatability for packages expecting this file, e.g. with + # `$NIX_CC/nix-support/dynamic-linker`. + # + # TODO(@Ericson2314): Remove this after stable release and force + # everyone to refer to bintools-wrapper directly. '' - # Backwards compatability for packages expecting this file, e.g. with - # `$NIX_CC/nix-support/dynamic-linker`. - # - # TODO(@Ericson2314): Remove this after stable release and force - # everyone to refer to bintools-wrapper directly. if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support" fi @@ -242,40 +244,40 @@ stdenv.mkDerivation { fi '' + ## + ## General Clang support + ## + optionalString isClang '' - ## - ## General Clang support - ## echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags '' + ## + ## GCC libs for non-GCC support + ## + optionalString (isClang && libcxx == null && cc ? gcc) '' - ## - ## GCC libs for non-GCC support - ## echo "-B${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-cflags echo "-L${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-ldflags echo "-L${cc.gcc.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags '' - + optionalString (libc != null) ('' - ## - ## General libc support - ## + ## + ## General libc support + ## - # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link - # against the crt1.o from our own glibc, rather than the one in - # /usr/lib. (This is only an issue when using an `impure' - # compiler/linker, i.e., one that searches /usr/lib and so on.) - # - # Unfortunately, setting -B appears to override the default search - # path. Thus, the gcc-specific "../includes-fixed" directory is - # now longer searched and glibc's header fails to - # compile, because it uses "#include_next " to find the - # limits.h file in ../includes-fixed. To remedy the problem, - # another -idirafter is necessary to add that directory again. + # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + + optionalString (libc != null) ('' echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags @@ -289,12 +291,9 @@ stdenv.mkDerivation { echo "${libc_dev}" > $out/nix-support/orig-libc-dev '') - + '' - ## - ## General libc++ support - ## - - '' + ## + ## General libc++ support + ## + optionalString (libcxx == null && cc ? gcc) '' for dir in ${cc.gcc}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags @@ -310,15 +309,15 @@ stdenv.mkDerivation { echo "-lc++abi" >> $out/nix-support/libcxx-ldflags '') - + optionalString (!nativeTools) '' - ## - ## Initial CFLAGS - ## + ## + ## Initial CFLAGS + ## - # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not - # ${cc_solib}/lib64 (even though it does actually search there...).. - # This confuses libtool. So add it to the compiler tool search - # path explicitly. + # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not + # ${cc_solib}/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + + optionalString (!nativeTools) '' if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then ccLDFlags+=" -L${cc_solib}/lib64" ccCFlags+=" -B${cc_solib}/lib64" @@ -337,22 +336,22 @@ stdenv.mkDerivation { echo "$ccCFlags" > $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags - '' + optionalString propagateDoc '' - ## - ## Man page and info support - ## + '' + ## + ## Man page and info support + ## + + optionalString propagateDoc '' ln -s ${cc.man} $man ln -s ${cc.info} $info '' + optionalString (cc.langD or false) '' echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + ## + ## Hardening support + ## + '' - ## - ## Hardening support - ## - export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' @@ -427,12 +426,11 @@ stdenv.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; inherit expand-response-params; From 234239b57fbdd4eaca572cb2800b37f166ef2849 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Jun 2020 04:20:00 -0500 Subject: [PATCH 229/400] python3Packages.tornado: 5.1 -> 6.0.4 --- pkgs/development/python-modules/tornado/4.nix | 37 +++++++++++++++++++ pkgs/development/python-modules/tornado/5.nix | 37 +++++++++++++++++++ .../python-modules/tornado/default.nix | 31 ++-------------- pkgs/top-level/python-packages.nix | 8 +++- 4 files changed, 84 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/tornado/4.nix create mode 100644 pkgs/development/python-modules/tornado/5.nix diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix new file mode 100644 index 00000000000..6d889a09d25 --- /dev/null +++ b/pkgs/development/python-modules/tornado/4.nix @@ -0,0 +1,37 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +, futures +, isPy27 +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "4.5.3"; + + propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; + }; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = "https://www.tornadoweb.org/"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix new file mode 100644 index 00000000000..da270331978 --- /dev/null +++ b/pkgs/development/python-modules/tornado/5.nix @@ -0,0 +1,37 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +, futures +, isPy27 +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "5.1.1"; + + propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; + }; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = "https://www.tornadoweb.org/"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 102cf0fed57..8d9cadeb3e5 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -2,35 +2,11 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch -, pythonOlder -, futures -, version ? "5.1" }: -let - versionMap = { - "4.5.3" = { - sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; - }; - "5.1" = { - sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582"; - }; - }; -in - -with versionMap.${version}; - buildPythonPackage rec { pname = "tornado"; - inherit version; - - propagatedBuildInputs = [ backports_abc certifi singledispatch ] - ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname - ++ lib.optional (pythonOlder "3.2") futures; + version = "6.0.4"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -39,14 +15,15 @@ buildPythonPackage rec { ''; src = fetchPypi { - inherit pname sha256 version; + inherit pname version; + sha256 = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"; }; __darwinAllowLocalNetworking = true; meta = { description = "A web framework and asynchronous networking library"; - homepage = "http://www.tornadoweb.org/"; + homepage = "https://www.tornadoweb.org/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c75b84e8ede..9a3196b1f2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6641,8 +6641,12 @@ in { cmdtest = callPackage ../development/python-modules/cmdtest { }; - tornado = callPackage ../development/python-modules/tornado { }; - tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; }; + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } + else + callPackage ../development/python-modules/tornado/5.nix { }; + + tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; tokenlib = callPackage ../development/python-modules/tokenlib { }; From 7f190b0ff9bf53c3a1b4c72c84c86e149c026e28 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 230/400] python: llvmlite: 0.32.1 -> 0.33.0 --- pkgs/development/python-modules/llvmlite/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 3a7f381e51c..c96975412b9 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.32.1"; + version = "0.33.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "41262a47b8cbba5a09203b15b65fbdf11192f92aa226c81e99115acdee8f3b8d"; + sha256 = "9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a3196b1f2f..09afb5c020a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4455,7 +4455,9 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_8; }; + llvmlite = callPackage ../development/python-modules/llvmlite { + llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. + }; lockfile = callPackage ../development/python-modules/lockfile { }; From 8ca47eac4f964f1667378cbf17104c19cba5fc70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 231/400] python: nbformat: 5.0.6 -> 5.0.7 --- pkgs/development/python-modules/nbformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 2f8c57e0033..0c75fc4ac5a 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.6"; + version = "5.0.7"; src = fetchPypi { inherit pname version; - sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; + sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340"; }; LC_ALL="en_US.utf8"; From 8bccb80cd01550b2632666e53bb7d74bb6e1ec2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 232/400] python: numba: 0.49.1 -> 0.50.0 --- pkgs/development/python-modules/numba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 909a37c7829..19d25a8e697 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { - version = "0.49.1"; + version = "0.50.0"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "89e1ad8215918036b0ffc53501888d44ed44c1f2cb09a9e047d06af5cd7e7a5a"; + sha256 = "c9e5752821530694294db41ee19a4b00e5826c689821907f6c2ece9a02756b29"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 98f335a87ca6f7637adc968806ba46a28319c11d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 233/400] python: numpy: 1.18.5 -> 1.19.0 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 0c9bac97320..990671f1633 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -35,13 +35,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.5"; + version = "1.19.0"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b"; + sha256 = "76766cc80d6128750075378d3bb7812cf146415bd29b588616f72c943c00d598"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; From 31a34710ca035a63d580af8337c35f727f847200 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 234/400] python: pandas: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/pandas/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 5d7bb4a6d69..a2d16f603f5 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126"; + sha256 = "69c5d920a0b2a9838e677f78f4dde506b95ea8e4d30da25859db6469ded84fa8"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; @@ -95,6 +95,9 @@ in buildPythonPackage rec { "order_without_freq" # tries to import from pandas.tests post install "util_in_top_level" + # Fails with 1.0.5 + "test_constructor_list_frames" + "test_constructor_with_embedded_frames" ] ++ optionals isDarwin [ "test_locale" "test_clipboard" From d0f954e751b7481039f52a9184a2135ec242291c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 235/400] python: pyopencl: 2020.1 -> 2020.2 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index e1b6abb7527..766952ee267 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.1"; + version = "2020.2"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7513f7054f4eeb5361de1f5113883145fc67dbabde73a2148f221ae05af4d22c"; + sha256 = "afd9f22547bcd879b9e54252fc885b45034ebfd1890e630827f1afb408a03d23"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 2b920777467fe7a9f8fcf4fc846564f84e5c60d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 236/400] python: qtconsole: 4.7.4 -> 4.7.5 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 4cadba28a8a..ca6a19220d5 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.4"; + version = "4.7.5"; src = fetchPypi { inherit pname version; - sha256 = "1zgm57011kpbh6388p8cqwkcgqwlmb7rc9cy3zn9rrnna48byj7x"; + sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From a3179602e47c918ea40b32f8f2a3c638d4484083 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:03 +0200 Subject: [PATCH 237/400] python: scipy: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index ace6c248ab2..1a94aa9659b 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -9,11 +9,11 @@ let }); in buildPythonPackage rec { pname = "scipy"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"; + sha256 = "4ff72877d19b295ee7f7727615ea8238f2d59159df0bdd98f91754be4a2767f0"; }; checkInputs = [ nose pytest ]; From e77b705b1838414c845c8a993acf3c4800421646 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 19:07:04 +0200 Subject: [PATCH 238/400] python: twine: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/twine/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index b3dddbbba68..47f9fe1a034 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -8,16 +8,18 @@ , requests_toolbelt , setuptools_scm , tqdm +, colorama +, rfc3986 }: buildPythonPackage rec { pname = "twine"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"; + sha256 = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -29,6 +31,8 @@ buildPythonPackage rec { requests requests_toolbelt tqdm + colorama + rfc3986 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Requires network From 731d3359d79b76c96e332cf3b25f51eb6020d715 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:34:27 +0200 Subject: [PATCH 239/400] python: ipython: 7.15.0 -> 7.16.1 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 692daa7b2f3..9700737f485 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.15.0"; + version = "7.16.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e"; + sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; }; prePatch = lib.optionalString stdenv.isDarwin '' From f96d1547d3e7e7acfb14a80cfdefdb7bc9fb2941 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:34:27 +0200 Subject: [PATCH 240/400] python: jupyter_client: 6.1.3 -> 6.1.5 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 008a74dfb3e..24d7ee4f71c 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.3"; + version = "6.1.5"; src = fetchPypi { inherit pname version; - sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; + sha256 = "5099cda1ac86b27b655a715c51e15bdc8bd9595b2b17adb41a2bd446bbbafc4a"; }; propagatedBuildInputs = [ From 1b78d30af806ef9e4208ebfb15be583dcc80252e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:34:28 +0200 Subject: [PATCH 241/400] python: tqdm: 4.46.1 -> 4.47.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 138c24ebbe3..7d326ea152b 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.46.1"; + version = "4.47.0"; src = fetchPypi { inherit pname version; - sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; + sha256 = "63ef7a6d3eb39f80d6b36e4867566b3d8e5f1fe3d6cb50c5e9ede2b3198ba7b7"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; From a774212723f5263c5113b7a73cc36dc3581343b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:36:58 +0200 Subject: [PATCH 242/400] python: holoviews: 1.13.2 -> 1.13.3 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 7b54d8cd5f1..796ddaace8b 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.13.2"; + version = "1.13.3"; src = fetchPypi { inherit pname version; - sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg"; + sha256 = "e6753651a8598f21fc2c20e8456865ecec276cfea1519182a76d957506727934"; }; propagatedBuildInputs = [ From c0adf5b3677b4f83b4d008c511266a1a4173eb1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:37:04 +0200 Subject: [PATCH 243/400] python: bokeh: 2.0.2 -> 2.1.1 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a3ed2c6b8ae..850070b1c00 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "2.0.2"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d9248bdb0156797abf6d04b5eac581dcb121f5d1db7acbc13282b0609314893a"; + sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad"; }; patches = [ From c9d07d7283fcefd4f251f4378913c3153fabbdae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 30 Jun 2020 09:37:13 +0200 Subject: [PATCH 244/400] python: panel: 0.9.5 -> 0.9.7 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 27c2134f4f3..0fc7bf7ee29 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.9.5"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "53340615f30f67f3182793695ebe52bf25e7bbb0751aba6f29763244350d0f42"; + sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318"; }; propagatedBuildInputs = [ From 704daf7a6e4e5f26c5b0ad67ed8bd1b2090aa8ed Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 30 Jun 2020 18:26:37 +0000 Subject: [PATCH 245/400] {bintools,cc}-wrapper: Ensure nix-support/*-flags files exist This will unbreak firefox and a few other packages which try to grab some of the libcxx flags. --- .../bintools-wrapper/default.nix | 25 +++++++++------- pkgs/build-support/cc-wrapper/default.nix | 29 +++++++++++++++---- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 31373d6b239..786f0f9c598 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -204,7 +204,8 @@ stdenv.mkDerivation { ## General libc support ## optionalString (libc != null) ('' - echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags + touch "$out/nix-support/libc-ldflags" + echo "-L${libc_lib}${libc.libdir or "/lib"}" >> $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev @@ -230,25 +231,23 @@ stdenv.mkDerivation { *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; esac - if [ -n "''${dynamicLinker:-}" ]; then + if [ -n "''${dynamicLinker-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker '' + (if targetPlatform.isDarwin then '' printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' + '' else '' if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + '' + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to ld + # (the *last* value counts, so ours should come first). + + '' + echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before '') + '' fi - '' - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - + '' - printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. @@ -306,6 +305,10 @@ stdenv.mkDerivation { '' + '' + for flags in "$out/nix-support"/*flags*; do + substituteInPlace "$flags" --replace $'\n' ' ' + done + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 159324e0205..1fef3c45908 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -230,12 +230,19 @@ stdenv.mkDerivation { ]; postFixup = + # Ensure flags files exists, as some other programs cat them. (That these + # are considered an exposed interface is a bit dubious, but fine for now.) + '' + touch "$out/nix-support/cc-cflags" + touch "$out/nix-support/cc-ldflags" + '' + # Backwards compatability for packages expecting this file, e.g. with # `$NIX_CC/nix-support/dynamic-linker`. # # TODO(@Ericson2314): Remove this after stable release and force # everyone to refer to bintools-wrapper directly. - '' + + '' if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support" fi @@ -278,6 +285,8 @@ stdenv.mkDerivation { # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. + optionalString (libc != null) ('' + touch "$out/nix-support/libc-cflags" + touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags @@ -294,7 +303,13 @@ stdenv.mkDerivation { ## ## General libc++ support ## - + optionalString (libcxx == null && cc ? gcc) '' + + # We have a libc++ directly, we have one via "smuggled" GCC, or we have one + # bundled with the C compiler because it is GCC + + optionalString (libcxx != null || cc.gcc.langCC or false || (isGNU && cc.langCC or false)) '' + touch "$out/nix-support/libcxx-cxxflags" + touch "$out/nix-support/libcxx-ldflags" + '' + optionalString (libcxx == null && cc ? gcc) '' for dir in ${cc.gcc}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done @@ -326,14 +341,16 @@ stdenv.mkDerivation { ccCFlags+=" -B${cc_solib}/lib" '' + optionalString cc.langAda or false '' + touch "$out/nix-support/gnat-cflags" + touch "$out/nix-support/gnat-ldflags" basePath=$(echo $cc/lib/*/*/*) ccCFlags+=" -B$basePath -I$basePath/adainclude" gnatCFlags="-I$basePath/adainclude -I$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags + echo "$gnatCFlags" >> $out/nix-support/gnat-cflags '' + '' - echo "$ccLDFlags" > $out/nix-support/cc-ldflags - echo "$ccCFlags" > $out/nix-support/cc-cflags + echo "$ccLDFlags" >> $out/nix-support/cc-ldflags + echo "$ccCFlags" >> $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags '' @@ -419,7 +436,7 @@ stdenv.mkDerivation { # There are a few tools (to name one libstdcxx5) which do not work # well with multi line flags, so make the flags single line again + '' - for flags in "$out/nix-support"/*flags; do + for flags in "$out/nix-support"/*flags*; do substituteInPlace "$flags" --replace $'\n' ' ' done From 318fd31ee96aca1b5c67050ca0dd119d398c3d0c Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 1 Jul 2020 09:15:51 +0200 Subject: [PATCH 246/400] vdirsyncerStable: 0.16.7 -> 0.16.8 --- .../python-modules/vdirsyncer/stable.nix | 42 ++++--------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix index cb90bfbc598..6e1dc982567 100644 --- a/pkgs/development/python-modules/vdirsyncer/stable.nix +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -1,9 +1,7 @@ { stdenv -, pythonAtLeast , buildPythonPackage , fetchPypi , isPy27 -, fetchpatch , click , click-log , click-threading @@ -11,25 +9,21 @@ , requests , requests_oauthlib # required for google oauth sync , atomicwrites -, milksnake -, shippai , hypothesis -, pytest +, pytestCheckHook , pytest-localserver , pytest-subtesthack , setuptools_scm }: -# Packaging documentation at: -# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst buildPythonPackage rec { - version = "0.16.7"; + version = "0.16.8"; pname = "vdirsyncer"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; }; propagatedBuildInputs = [ @@ -46,43 +40,25 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytest + pytestCheckHook pytest-localserver pytest-subtesthack ]; - patches = [ - # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 - (fetchpatch { - url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; - sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; - }) - ]; - postPatch = '' - # Invalid argument: 'perform_health_check' is not a valid setting - substituteInPlace tests/conftest.py \ - --replace "perform_health_check=False" "" - substituteInPlace tests/unit/test_repair.py \ - --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" ''; - checkPhase = '' - make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test + preCheck = '' + export DETERMINISTIC_TESTS=true ''; - # Tests started to fail lately, for any python version even as low as 3.5 but - # if you enable the check, you'll see even severer errors with a higher then - # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the - # checks are disabled unconditionally. As a general end user advice, use the - # normal "unstable" `vdirsyncer` derivation, not this one. - doCheck = false; + + disabledTests = [ "test_verbosity" ]; meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; - # vdirsyncer (unstable) works with mainline python versions - broken = (pythonAtLeast "3.6"); maintainers = with maintainers; [ loewenheim ]; }; } From 45b6a97ad613f4ebb972689872eac01a54956573 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 May 2020 19:32:45 +0000 Subject: [PATCH 247/400] utillinux: 2.35.1 -> 2.35.2 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index aa23a162a92..fafa8fe6e83 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.35.1"; + version = "2.35.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr"; + sha256 = "12mm5qvkq1vpllfv99gq93lkxlvysp1yxgh1392dkg7nh8g47dr1"; }; patches = [ From 798c2d8bc1e947eb26e249b326bfaba49a91b735 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 19:53:41 -0700 Subject: [PATCH 248/400] python3Packages.setuptools: 46.1.3 -> 47.3.1 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 69b89a376fc..b618ec6f634 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "46.1.3"; + version = "47.3.1"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673"; + sha256 = "0sy3p4ibgqx67hzn1f254jh8070a8kl9g2la62p3c74k2x7p0r7f"; name = "${pname}-${version}-source"; }; From 65a5313de5d34d73e2930bd132fe476f57f1b60f Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Thu, 2 Jul 2020 02:56:08 -0300 Subject: [PATCH 249/400] avahi: fix cross --- pkgs/development/libraries/avahi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 4c7e5321f55..8568d5dd2ab 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages -, expat, gettext, intltool, glib, libiconv +, expat, gettext, intltool, glib, libiconv, writeShellScriptBin , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false @@ -9,6 +9,11 @@ assert qt4Support -> qt4 != null; +let + # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it + pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; +in + stdenv.mkDerivation rec { name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; version = "0.7"; @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); - nativeBuildInputs = [ pkgconfig gettext intltool glib ]; + nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" From fc2262365f721c7676c4fee426e6db9630b26801 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 1 Jul 2020 15:55:13 +0200 Subject: [PATCH 250/400] adoptopenjdk: 8u242 -> 8u252 and other updates I was mainly interested in the 8u242->8u252 update because this backports a number of features to JDK8, including ALPN negotiation which is relevant for HTTP/2. generate-sources.py also updated the other variants --- .../compilers/adoptopenjdk-bin/sources.json | 318 +++++++++--------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 80a16465af2..41e7a8eac7d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,39 +5,45 @@ "hotspot": { "aarch64": { "build": "10", - "sha256": "04b77f6754aed68528f39750c5cfd6a439190206aff216aa081d62a0e1a794fa", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "3b8b8bba6a0472ec7de5271cbf67f11e6ab525de6dd5d4729300375f1d56b7a1", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "armv6l": { "build": "10", - "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "armv7l": { "build": "10", - "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { + "aarch64": { + "build": "10", + "sha256": "0be01fdcae330e26c489d8d0d0c98c535a2af8cbd0cdcda211776ab9fcd05086", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" + }, "packageType": "jdk", "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "526e89f3014fec473b24c10c2464c1343e23703114983fd171b68b1599bba561", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } }, @@ -45,27 +51,45 @@ "hotspot": { "aarch64": { "build": "10", - "sha256": "7ed04ed9ed7271528e7f03490f1fd7dfbbc2d391414bd6fe4dd80ec3bad76d30", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "cfe504e9e9621b831a5cfd800a2005dafe90a1d11aa14ee35d7b674d68685698", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" + }, + "armv6l": { + "build": "10", + "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" + }, + "armv7l": { + "build": "10", + "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "c5a4e69e2be0e3e5f5bb7c759960b20650967d0f571baad4a7f15b2c03bda352", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "74b493dd8a884dcbee29682ead51b182d9d3e52b40c3d4cbb3167c2fd0063503", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { + "aarch64": { + "build": "10", + "sha256": "37ae26443abb02d2ab041eced9be948f0d20db03183aaf3c159ef682eeeabf9b", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" + }, "packageType": "jre", "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "056e4b5f7166f5daa44f36b06c735913bda52831d2e77fa2ac371505c66d10c1", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "08258a767a6953bde21d15ef3c08e776d83257afa4acc52b55c70e1ac02f0489", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } } @@ -77,9 +101,9 @@ "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "b87102274d983bf6bb0aa6c2c623301d0ff5eb7f61043ffd04abb00f962c2dcd", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "0ab1e15e8bd1916423960e91b932d2b17f4c15b02dbdf9fa30e9423280d9e5cc", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { @@ -87,9 +111,9 @@ "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "9a5c5b3bb51a82e666c46b2d1bbafa8c2bbc3aae50194858c8f96c5d43a96f64", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "a0de749c37802cc233ac58ffde68191a4dc985c71b626e7c0ff53944f743427f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } }, @@ -99,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "10", - "sha256": "ab3c2038a32c62843500109d2efb8f5dacdfa1de3cbb713c8226f26dc603cc33", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.6_10.tar.gz", - "version": "11.0.6" + "sha256": "931a81f4bed38c48b364db57d4ebdd6e4b4ea1466e9bd0eaf8e0f1e47c4569e9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.7_10.tar.gz", + "version": "11.0.7" } }, "openj9": { @@ -109,9 +133,9 @@ "vmType": "openj9", "x86_64": { "build": "10", - "sha256": "130850133d9701393352c2ce13ab541b4f900ff1f5ddf8257cda624968aada9f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz", - "version": "11.0.6" + "sha256": "0941d739e3230d1d83dc1ee54cff6d17d90331e4f275d00739cb78fba41c5b96", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jre_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", + "version": "11.0.7" } } } @@ -122,68 +146,68 @@ "jdk": { "hotspot": { "aarch64": { - "build": "33", - "sha256": "74f4110333ac4239564ed864b1d7d69b7af32af39efcfbde9816e1486cb5ae07", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "armv6l": { - "build": "33", - "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "armv7l": { - "build": "33", - "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "e562caeffa89c834a69a44242d802eae3523875e427f07c05b1902c152638368", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "68ebab0021c719694be8fc868478725a69c5c515cdb62e2933eefe87ba6437df", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } }, "jre": { "hotspot": { "aarch64": { - "build": "33", - "sha256": "2365b7fbba8d9125fb091933aad9f38f8cc1fbb0217cdec9ec75d2000f6d451a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_aarch64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "73800a0d7c4e81df408a8518d282aa2c001ce4ee15541574c639dfc3564f708f", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "2ee59be5062a81daa7be85be161cab6b245f9a2e2cbd4769ae9edefaac41e31d", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } } @@ -194,20 +218,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "f948be96daba250b6695e22cb51372d2ba3060e4d778dd09c89548889783099f", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "583e0defd5c062550896ead7cac383be16f1a81d9b6492dfec26da9af5dcc1c0", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } }, @@ -216,20 +240,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "33", - "sha256": "1c23efba7908de9a611a98e755602f45381a8f7c957adb3fc4012ab1369a352c", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_mac_hotspot_13_33.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "33", - "sha256": "33a60b78138d50cb02325156c7d1fcf588697749a4401f6c11a3cbefa3033127", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz", - "version": "13.0.0" + "build": "8", + "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" } } } @@ -241,51 +265,39 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "35799a2fd4b467115aff1bc3a54853b5131ba9068e53e1ab0fbe5521a3f2ba83", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "536bf397d98174b376da9ed49d2f659d65c7310318d8211444f4b7ba7c15e453", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv6l": { "build": "9", - "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv7l": { "build": "9", - "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" - }, - "armv6l": { - "build": "10", - "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" - }, - "armv7l": { - "build": "10", - "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" + "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "2b59b5282ff32bce7abba8ad6b9fde34c15a98f949ad8ae43e789bbd78fc8862", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ca785af638b24f9d4df896f5a9f557cc9f1e5fa5e2b1174d6b906e3fd5474c2e", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "910ae847109a6dd1b6cf69baa7615ea2cce8cff787e5a9349a5331ce7604f3a5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jdk_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } }, @@ -293,51 +305,39 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "4540db665260fdc84ae2f191e21beec9168a70a4227718bee5edd317707e2fda", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "30bba4425497f5b4aabcba7b45db69d582d278fb17357d64c22c9dc6b2d29ca1", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv6l": { "build": "9", - "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" + "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "armv7l": { "build": "9", - "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz", - "version": "8.0.232" - }, - "armv6l": { - "build": "10", - "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" - }, - "armv7l": { - "build": "10", - "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz", - "version": "8.0.222" + "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "a93be303ed62398dba9acb0376fb3caf8f488fcde80dc62d0a8e46256b3adfb1", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "985d3134b64c6196d4c9ddbc87af0c62b0e643cef71b29f3d25a8c7811811745", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "5c0ab4691ff5f8e69bb14462f2afb8d73d751b01048eacf4b426ed6d6646dc63", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jre_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } } @@ -348,20 +348,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "06675b7d65bce0313ee1f2e888dd44267e8afeced75e0b39b5ad1f5fdff54e0b", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "2caed3ec07d108bda613f9b4614b22a8bdd196ccf2a432a126161cd4077f07a5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x64_mac_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "665dc9c8239b7270b007ab9dd7522570e2686e327d89caf57a6aa6e5c6450078", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "f522061a23290bce3423e49025a95b6e78d6f30e2741817e83c8fdba4c0c4ae7", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jdk_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } }, @@ -370,23 +370,23 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "f8206f0fef194c598de6b206a4773b2e517154913ea0e26c5726091562a034c8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jre_x64_mac_hotspot_8u252b09.tar.gz", + "version": "8.0.252" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "d4a924558ddda0aed671a67f71714b71c25871a7659fd4c505851cf5ee866de5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz", - "version": "8.0.242" + "build": "9", + "sha256": "55cce54a39c5748360e2e3fe8edf04469b75a0783514853a5745463979b43c80", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jre_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", + "version": "8.0.252" } } } } } -} +} \ No newline at end of file From 5fce232e3fe5f2965ecdf9efd3109faf97cca9cb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jun 2020 09:17:01 -0400 Subject: [PATCH 251/400] elfutils: 0.176 -> 0.180 --- pkgs/development/tools/misc/elfutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 56bfe26ec06..9a4ff149609 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,11 +3,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.176"; + version = "0.180"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; + sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq"; }; patches = [ ./debug-info-from-env.patch ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" + "--disable-debuginfod" ]; enableParallelBuilding = true; From 34d121091493933704380ac71896845827bd0fe1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 04:45:23 +0000 Subject: [PATCH 252/400] check: 0.14.0 -> 0.15.0 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 0a51e7e592b..e98fa465e0b 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "check"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx"; + sha256 = "0q5cs6rqbq8a1m9ij3dxnsjcs31mvg0b2i77g0iykqd6iz3f78mf"; }; # Test can randomly fail: https://hydra.nixos.org/build/7243912 From aedbade43e615d7893d268632f5e7f2570fd3233 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 22 Jun 2020 10:58:26 +0300 Subject: [PATCH 253/400] python3Packages.pip: allow setting reproducible temporary directory via NIX_PIP_INSTALL_TMPDIR --- .../interpreters/python/hooks/pip-install-hook.sh | 4 +++- pkgs/development/python-modules/pip/default.nix | 4 ++++ .../python-modules/pip/reproducible.patch | 13 +++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pip/reproducible.patch diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index 4eefe22d3f2..770739b36bd 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -11,7 +11,9 @@ pipInstallPhase() { export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild + mkdir tmpbuild + NIX_PIP_INSTALL_TMPDIR=tmpbuild @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags + rm -rf tmpbuild popd || return 1 runHook postInstall diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index e4ace129d99..fa566c8951a 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { name = "${pname}-${version}-source"; }; + # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 + # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly + patches = [ ./reproducible.patch ]; + nativeBuildInputs = [ bootstrapped-pip ]; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/pkgs/development/python-modules/pip/reproducible.patch b/pkgs/development/python-modules/pip/reproducible.patch new file mode 100644 index 00000000000..528ac2b49b0 --- /dev/null +++ b/pkgs/development/python-modules/pip/reproducible.patch @@ -0,0 +1,13 @@ +diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py +index e7315ee4..4e36b03d 100644 +--- a/src/pip/_internal/operations/install/wheel.py ++++ b/src/pip/_internal/operations/install/wheel.py +@@ -615,6 +615,8 @@ def install_wheel( + direct_url=None, # type: Optional[DirectUrl] + ): + # type: (...) -> None ++ _temp_dir_for_testing = ( ++ _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR")) + with TempDirectory( + path=_temp_dir_for_testing, kind="unpacked-wheel" + ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z: From 1f9cd4cf0a9eb66da7a777d8de2cfdacb795d57d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Jun 2020 07:34:41 +0000 Subject: [PATCH 254/400] rustc: 1.43.0 -> 1.44.1 --- .../compilers/rust/{1_43.nix => 1_44.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 8 +++---- 2 files changed, 15 insertions(+), 15 deletions(-) rename pkgs/development/compilers/rust/{1_43.nix => 1_44.nix} (51%) diff --git a/pkgs/development/compilers/rust/1_43.nix b/pkgs/development/compilers/rust/1_44.nix similarity index 51% rename from pkgs/development/compilers/rust/1_43.nix rename to pkgs/development/compilers/rust/1_44.nix index a1a9d17fcd5..9fc268d152b 100644 --- a/pkgs/development/compilers/rust/1_43.nix +++ b/pkgs/development/compilers/rust/1_44.nix @@ -16,24 +16,24 @@ } @ args: import ./default.nix { - rustcVersion = "1.43.0"; - rustcSha256 = "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm"; + rustcVersion = "1.44.1"; + rustcSha256 = "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"; # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.42.0"; + bootstrapVersion = "1.43.1"; - # fetch hashes by running `print-hashes.sh 1.43.0` + # fetch hashes by running `print-hashes.sh 1.44.1` bootstrapHashes = { - i686-unknown-linux-gnu = "1c89c12c8fc1a45dcbcb9ee2e21cc634b8453f1d4cdd658269263de686aab4e4"; - x86_64-unknown-linux-gnu = "7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052"; - arm-unknown-linux-gnueabihf = "6cf776b910d08fb0d1f88be94464e7b20a50f9d8b2ec6372c3c385aec0b70e7a"; - armv7-unknown-linux-gnueabihf = "a36e7f2bd148e325a7b8e7131b4226266cf522b1a2b12d585dad9c38ef68f4d9"; - aarch64-unknown-linux-gnu = "fdd39f856a062af265012861949ff6654e2b7103be034d046bec84ebe46e8d2d"; - x86_64-apple-darwin = "db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8"; + i686-unknown-linux-gnu = "0626fa8a6a2387021413d740543f7496656d81115e2284e4ef73217128398990"; + x86_64-unknown-linux-gnu = "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505"; + arm-unknown-linux-gnueabihf = "16b9c4861565a195323d144fd0f54c0ae794ee3d2a867682f8aedbdacaad5a6c"; + armv7-unknown-linux-gnueabihf = "0c32a5958a358a031e6ca52074cfd45256688dc334db315199f5dbbf7562e5b1"; + aarch64-unknown-linux-gnu = "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb"; + x86_64-apple-darwin = "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003"; }; - selectRustPackage = pkgs: pkgs.rust_1_43; + selectRustPackage = pkgs: pkgs.rust_1_44; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f136c864955..0a168f16064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9202,14 +9202,14 @@ in rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_43 = callPackage ../development/compilers/rust/1_43.nix { + rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_43; + rust = rust_1_44; rustPackages_1_42 = rust_1_42.packages.stable; - rustPackages_1_43 = rust_1_43.packages.stable; - rustPackages = rustPackages_1_43; + rustPackages_1_44 = rust_1_44.packages.stable; + rustPackages = rustPackages_1_44; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; From 204d5835736664c7718d0e4e1569a6a609b7690d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 6 Jun 2020 00:01:40 +0000 Subject: [PATCH 255/400] rust_1_42: drop Nothing seems to need this to build any more. --- ...-getting-no_std-from-the-config-file.patch | 52 ------------------- pkgs/development/compilers/rust/1_42.nix | 44 ---------------- pkgs/top-level/all-packages.nix | 5 -- 3 files changed, 101 deletions(-) delete mode 100644 pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch delete mode 100644 pkgs/development/compilers/rust/1_42.nix diff --git a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch deleted file mode 100644 index 0b9359221a7..00000000000 --- a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Sat, 22 Feb 2020 14:38:38 -0500 -Subject: [PATCH] Allow getting `no_std` from the config file - -Currently, it is only set correctly in the sanity checking implicit -default fallback code. Having a config file at all will for force -`no_std = false`. ---- - src/bootstrap/config.rs | 3 +++ - src/bootstrap/sanity.rs | 4 +--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 110c8b844d5..83a6934d477 100644 ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -350,6 +350,7 @@ struct TomlTarget { - musl_root: Option, - wasi_root: Option, - qemu_rootfs: Option, -+ no_std: Option, - } - - impl Config { -@@ -610,6 +611,8 @@ impl Config { - target.musl_root = cfg.musl_root.clone().map(PathBuf::from); - target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); - target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); -+ target.no_std -+ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx")); - - config.target_config.insert(INTERNER.intern_string(triple.clone()), target); - } -diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index 8ff7056e628..76e721ed8e3 100644 ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs -@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) { - - if target.contains("-none-") || target.contains("nvptx") { - if build.no_std(*target).is_none() { -- let target = build.config.target_config.entry(target.clone()).or_default(); -- -- target.no_std = true; -+ build.config.target_config.entry(target.clone()).or_default(); - } - - if build.no_std(*target) == Some(false) { --- -2.24.1 - diff --git a/pkgs/development/compilers/rust/1_42.nix b/pkgs/development/compilers/rust/1_42.nix deleted file mode 100644 index 8717aaf76a2..00000000000 --- a/pkgs/development/compilers/rust/1_42.nix +++ /dev/null @@ -1,44 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild -} @ args: - -import ./default.nix { - rustcVersion = "1.42.0"; - rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.41.0"; - - # fetch hashes by running `print-hashes.sh 1.42.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897"; - x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b"; - arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047"; - armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be"; - aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27"; - i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339"; - x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_42; - - rustcPatches = [ - ./0001-Allow-getting-no_std-from-the-config-file.patch - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a168f16064..2e6545c0c5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9199,15 +9199,11 @@ in inherit (darwin) apple_sdk; }; - rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; rust = rust_1_44; - rustPackages_1_42 = rust_1_42.packages.stable; rustPackages_1_44 = rust_1_44.packages.stable; rustPackages = rustPackages_1_44; @@ -22550,7 +22546,6 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages_1_42) rustc; libpng = libpng_apng; gtk3Support = true; }; From 0cfe9f3ae25f5c4627664476bececb31e8b0143e Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 24 Apr 2020 18:35:25 -0700 Subject: [PATCH 256/400] gnumake: 4.2.1 -> 4.3 --- .../gnumake/4.2/glibc-2.27-glob.patch | 32 ---- .../gnumake/4.2/impure-dirs.patch | 34 ---- .../build-managers/gnumake/4.2/pselect.patch | 170 ------------------ .../gnumake/{4.2 => }/default.nix | 10 +- .../build-managers/gnumake/impure-dirs.patch | 25 +++ pkgs/top-level/all-packages.nix | 3 +- 6 files changed, 29 insertions(+), 245 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch rename pkgs/development/tools/build-managers/gnumake/{4.2 => }/default.nix (86%) create mode 100644 pkgs/development/tools/build-managers/gnumake/impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch deleted file mode 100644 index 186212d0d29..00000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur glob/glob.c glob/glob.c ---- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 -+++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 -@@ -208,28 +208,9 @@ - #endif /* __GNU_LIBRARY__ || __DJGPP__ */ - - --#if !defined __alloca && !defined __GNU_LIBRARY__ -- --# ifdef __GNUC__ --# undef alloca --# define alloca(n) __builtin_alloca (n) --# else /* Not GCC. */ --# ifdef HAVE_ALLOCA_H - # include --# else /* Not HAVE_ALLOCA_H. */ --# ifndef _AIX --# ifdef WINDOWS32 --# include --# else --extern char *alloca (); --# endif /* WINDOWS32 */ --# endif /* Not _AIX. */ --# endif /* sparc or HAVE_ALLOCA_H. */ --# endif /* GCC. */ -- - # define __alloca alloca - --#endif - - #ifndef __GNU_LIBRARY__ - # define __stat stat diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch deleted file mode 100644 index f6646f1d012..00000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch deleted file mode 100644 index 5a03acb2f7c..00000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch +++ /dev/null @@ -1,170 +0,0 @@ -From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Sat, 3 Jun 2017 16:20:51 -0400 -Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. - -* posixos.c (set_blocking): Set blocking on a file descriptor. -(jobserver_setup): Set non-blocking on the jobserver read side. -(jobserver_parse_auth): Ditto. -(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. -(jobserver_acquire): If the non-blocking read() returns without -taking a token then try again. ---- - posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 71 insertions(+), 26 deletions(-) - -diff --git posixos.c posixos.c -index e642d7f..dbafa51 100644 ---- posixos.c -+++ posixos.c -@@ -62,6 +62,24 @@ make_job_rfd (void) - #endif - } - -+static void -+set_blocking (int fd, int blocking) -+{ -+ // If we're not using pselect() don't change the blocking -+#ifdef HAVE_PSELECT -+ int flags; -+ EINTRLOOP (flags, fcntl (fd, F_GETFL)); -+ if (flags >= 0) -+ { -+ int r; -+ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); -+ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); -+ if (r < 0) -+ pfatal_with_name ("fcntl(O_NONBLOCK)"); -+ } -+#endif -+} -+ - unsigned int - jobserver_setup (int slots) - { -@@ -86,6 +104,9 @@ jobserver_setup (int slots) - pfatal_with_name (_("init jobserver pipe")); - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) - return 0; - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -169,7 +193,10 @@ jobserver_acquire_all (void) - { - unsigned int tokens = 0; - -- /* Close the write side, so the read() won't hang. */ -+ /* Use blocking reads to wait for all outstanding jobs. */ -+ set_blocking (job_fds[0], 1); -+ -+ /* Close the write side, so the read() won't hang forever. */ - close (job_fds[1]); - job_fds[1] = -1; - -@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) - unsigned int - jobserver_acquire (int timeout) - { -- sigset_t empty; -- fd_set readfds; - struct timespec spec; - struct timespec *specp = NULL; -- int r; -- char intake; -+ sigset_t empty; - - sigemptyset (&empty); - -- FD_ZERO (&readfds); -- FD_SET (job_fds[0], &readfds); -- - if (timeout) - { - /* Alarm after one second (is this too granular?) */ -@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) - specp = &spec; - } - -- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -- -- if (r == -1) -+ while (1) - { -- /* Better be SIGCHLD. */ -- if (errno != EINTR) -- pfatal_with_name (_("pselect jobs pipe")); -- return 0; -- } -+ fd_set readfds; -+ int r; -+ char intake; - -- if (r == 0) -- /* Timeout. */ -- return 0; -+ FD_ZERO (&readfds); -+ FD_SET (job_fds[0], &readfds); - -- /* The read FD is ready: read it! */ -- EINTRLOOP (r, read (job_fds[0], &intake, 1)); -- if (r < 0) -- pfatal_with_name (_("read jobs pipe")); -+ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -+ if (r < 0) -+ switch (errno) -+ { -+ case EINTR: -+ /* SIGCHLD will show up as an EINTR. */ -+ return 0; -+ -+ case EBADF: -+ /* Someone closed the jobs pipe. -+ That shouldn't happen but if it does we're done. */ -+ O (fatal, NILF, _("job server shut down")); - -- /* What does it mean if read() returns 0? It shouldn't happen because only -- the master make can reap all the tokens and close the write side...?? */ -- return r > 0; -+ default: -+ pfatal_with_name (_("pselect jobs pipe")); -+ } -+ -+ if (r == 0) -+ /* Timeout. */ -+ return 0; -+ -+ /* The read FD is ready: read it! This is non-blocking. */ -+ EINTRLOOP (r, read (job_fds[0], &intake, 1)); -+ -+ if (r < 0) -+ { -+ /* Someone sniped our token! Try again. */ -+ if (errno == EAGAIN) -+ continue; -+ -+ pfatal_with_name (_("read jobs pipe")); -+ } -+ -+ /* read() should never return 0: only the master make can reap all the -+ tokens and close the write side...?? */ -+ return r > 0; -+ } - } - - #else --- -cgit v1.0-41-gc330 - diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix similarity index 86% rename from pkgs/development/tools/build-managers/gnumake/4.2/default.nix rename to pkgs/development/tools/build-managers/gnumake/default.nix index a83281c4e96..f01f38ecd23 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -3,26 +3,22 @@ assert guileSupport -> ( pkgconfig != null && guile != null ); let - version = "4.2.1"; + version = "4.3"; in stdenv.mkDerivation { pname = "gnumake"; inherit version; src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; + url = "mirror://gnu/make/make-${version}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; }; - patchFlags = [ "-p0" ]; patches = [ # Purity: don't look for library dependencies (of the form `-lfoo') in /lib # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch - ./pselect.patch - # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html - ./glibc-2.27-glob.patch ]; nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch new file mode 100644 index 00000000000..6c7d9d2463c --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch @@ -0,0 +1,25 @@ +diff -Naur a/src/read.c b/src/read.c +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff -Naur a/src/remake.c b/src/remake.c +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e6545c0c5b..9f47cf2e04e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10553,8 +10553,7 @@ in gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; - gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = gnumake42; + gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); From 7db2ad2a6f4ba4a5e4a98335151ee9e764b05850 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 10:09:41 +0000 Subject: [PATCH 257/400] opencl-headers: 2020.03.13 -> 2020.06.16 --- pkgs/development/libraries/opencl-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 682a547d8f3..aaf6390d00a 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencl-headers-${version}"; - version = "2020.03.13"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${version}"; - sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw"; + sha256 = "0viiwhfqccw90r3mr45ab3wyhabpdrihplj5842brn5ny0ayh73z"; }; installPhase = '' From 9bf58894f104822b107e8f2a0ac3615917531043 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 10:59:12 +0000 Subject: [PATCH 258/400] c-blosc: 1.18.1 -> 1.19.0 --- pkgs/development/libraries/c-blosc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 85905778e80..e6a25ea6d7c 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"; + sha256 = "03z0wybw7w5yvakn1dzfmn8vz586hbqy2mq1vz1zg15md4x6zvbx"; }; buildInputs = [ cmake ]; From deb78151a9438fb202842d9dbe348365cfd767e0 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 27 Jun 2020 11:50:42 +0200 Subject: [PATCH 259/400] buildRustPackage: fix cargoBuildFlags When features were supplied in cargoBuildFlags, the binaries were built with these features enabled. Unless checking was disabled, `cargo test` was executed without these build flags, meaning the binaries were rebuilt and overwritten without the specified features. Fix this bug by running tests after the installation phase. --- pkgs/build-support/rust/default.nix | 2 +- pkgs/development/tools/rust/rustup/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 8d3a7ba6929..9e9f2cb4e3b 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (args // { -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \)) ''; - checkPhase = args.checkPhase or (let + installCheckPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 688159445d5..e4f15a44308 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -39,7 +39,9 @@ rustPlatform.buildRustPackage rec { ) ]; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + # Disable tests until they can be run with --features no-self-update + doCheck = false; + #doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin From 2a9765e26522900f5c2e0a97a93d7284b9a38c52 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 3 Jul 2020 22:28:55 +0200 Subject: [PATCH 260/400] unifiStable: 5.13.29 -> 5.13.32 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index a6e055dd063..29975ef5ba8 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.13.29"; - sha256 = "0j1spid9q41l57gyphg8smn92iy52z4x4wy236a2a15p731gllh8"; + version = "5.13.32"; + sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8"; }; } From 3e7d650bcca2fb18cc05468878cbccfb06096f7b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 15 May 2020 13:41:19 +0200 Subject: [PATCH 261/400] nixos/unifi: restart service on package update Currently the service doesn't detect if on of the packages is updated and doesn't restart. By manually adding a trigger we make sure the service restarts if any of the involved packages update. --- nixos/modules/services/networking/unifi.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 4bdfa8143dc..62bcf7a1497 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -162,6 +162,8 @@ in unitConfig.RequiresMountsFor = stateDir; # This a HACK to fix missing dependencies of dynamic libs extracted from jars environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; + # Make sure package upgrades trigger a service restart + restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ]; serviceConfig = { Type = "simple"; From d034a0039d8937aca2f64d1d3911e8b71f416137 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Jul 2020 13:30:43 +0200 Subject: [PATCH 262/400] gst-plugins-base: mark as broken This will disable many reverse dependencies. If you need your program to work you will need to migrate it to the newer gstreamer package. https://github.com/NixOS/nixpkgs/issues/39975 --- .../libraries/gstreamer/legacy/gst-plugins-base/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index ad978e903f8..a19e8ca6a5b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -56,5 +56,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + # https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497 + broken = true; }; } From 704e9e9b24f4de2db08ff6499ae4c3b4c08fcd98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Jul 2020 14:24:05 +0200 Subject: [PATCH 263/400] qt4: remove multimedia support It depends on ancient gstreamer which is broken and likely insecure. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 1c972e5440c..8512806e455 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,8 +3,9 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base -, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) +, buildMultimedia ? false # ancient gstreamer is broken +, alsaLib, gstreamer, gst-plugins-base +, buildWebkit ? false , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 From 721d0c43af9d72362f0a95fad7060098ee84ff17 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Jul 2020 20:23:36 -0400 Subject: [PATCH 264/400] numpy: fix distutils patch for 1.19.0 --- .../python-modules/numpy/numpy-distutils-C++.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch index 771da8cf3ff..6c75f34ce07 100644 --- a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch +++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch @@ -1,8 +1,7 @@ diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py -index 6ed5eec..82a88b5 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py -@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts +@@ -37,8 +37,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts if opt not in llink_s: self.linker_so = llink_s.split() + opt.split() @@ -11,7 +10,7 @@ index 6ed5eec..82a88b5 100644 # gcc style automatic dependencies, outputs a makefile (-MF) that lists # all headers needed by a c file as a side effect of compilation (-MMD) if getattr(self, '_auto_depends', False): -@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts +@@ -47,8 +45,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts deps = [] try: @@ -26,6 +25,6 @@ index 6ed5eec..82a88b5 100644 + self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + + extra_postargs, display = display) + - except DistutilsExecError: - msg = str(get_exception()) + except DistutilsExecError as e: + msg = str(e) raise CompileError(msg) From 92b7ce99f76f55d832e6eebc6ae561a781892226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Jul 2020 17:31:18 +0200 Subject: [PATCH 265/400] wxGTK3*: switch to gstreamer 1.x Configure log still prints `checking for GST... yes` and the new GST libs appear in RPATH. wxGTK28 does't seem able to configure with non-legacy GST, but it's almost unused... so I didn't touch it. --- pkgs/development/libraries/wxwidgets/3.0/default.nix | 4 ++-- pkgs/development/libraries/wxwidgets/3.1/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index da29eacdc0e..f125ac9dca0 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm , gtk2, GConf ? null, gtk3 -, xorgproto, gstreamer, gst-plugins-base, setfile +, xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null, libGL ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ optionals withGtk2 [ gtk2 GConf ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 790968a88f7..c62a11f91bd 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm , gtk2, GConf ? null, gtk3 -, xorgproto, gstreamer, gst-plugins-base, setfile +, xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ optionals withGtk2 [ gtk2 GConf ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU From 4fba844a0f1dba424b3b6f46e84864ec5cbe6222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Jul 2020 19:08:49 +0200 Subject: [PATCH 266/400] xapian: skip time-sensitive tests I think I've seen this break builds on Hydra repeatedly, e.g: https://hydra.nixos.org/build/123513191 --- pkgs/development/libraries/xapian/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index ef50bf31a36..a6500f97aac 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; + AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; From ca2b95ba8755a90bd5656365c25b03714c07ad57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Jul 2020 19:11:31 +0200 Subject: [PATCH 267/400] xapian: 1.4.15 -> 1.4.16 https://trac.xapian.org/wiki/ReleaseOverview/1.4.16 It seems quite minor and the parent commit rebuilds it anyway. --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index a6500f97aac..33a4fb93cba 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i"; + xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70"; } From dee73775088d8a81a9bbe970049385c5063c2b80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Jul 2020 23:52:38 +0200 Subject: [PATCH 268/400] qt5.qtwebkit: Fix paths in pc files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a, CMake setup-hook started to respect setOutputFlags. Since qtModule disables it by default, cmake no longer received the multiple-output adjusted installation directory flags when building the qtwebkit package. This resulted in incorrect paths in generated pkg-config files and CMake config files. Let’s temporarily enable setOutputFlags in the qtwebkit expression, until the commit is reverted. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 1133623483a..12e19af75f0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -34,6 +34,9 @@ qtModule { bison flex gdb gperf perl pkgconfig python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; + # Temporary fix for https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a + setOutputFlags = true; + cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] ++ optionals stdenv.isDarwin [ "-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia" From 4742da08661b09b9c95777451ec9f9486c396eaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 14:32:55 +0000 Subject: [PATCH 269/400] lyx: 2.3.5.1 -> 2.3.5.2 --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 4f6b73d592c..34e7e145e74 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.5.1"; + version = "2.3.5.2"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157"; + sha256 = "1pwdh0ljd7lm5a83vsqmp4695irhig07wxa90jc23ng5gap589na"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs From cfe7e12d389bafca6bf0fbee4b4c814f9d6aef32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Jul 2020 00:02:41 +0200 Subject: [PATCH 270/400] Revert "cmake: only set output paths with multiple outputs" This reverts commit be1b22538a60e52987d238bb11f93043682b6e9a. The commit broke Qt modules using CMake because they disable setOutputFlags. There is no need to have these flags limited to multiple output derivations since it should just work. If it does not, it is a bug that should be fixed as per https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path Likewise, having a variable to disable passing the flags is also unnecessary, since CMake, unlike some configure scripts, ignores unknown flags. And if a person does not like the values, they can just override them by passing the offending flag with a different value to cmakeFlags. --- .../tools/build-managers/cmake/setup-hook.sh | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index b343e1f91fc..87bbefa6bbf 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -68,24 +68,19 @@ cmakeConfigurePhase() { # nix/store directory. cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" - if [ "$outputs" != "out" -a -n "${setOutputFlags-1}" ]; then - # This ensures correct paths with multiple output derivations - # It requires the project to use variables from GNUInstallDirs module - # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html - cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags" - fi - - # This output flag must always be set, unlike the others, because - # otherwise we end up with lib64. + # This ensures correct paths with multiple output derivations + # It requires the project to use variables from GNUInstallDirs module + # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html + cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags" # Don’t build tests when doCheck = false if [ -z "${doCheck-}" ]; then @@ -120,6 +115,7 @@ cmakeConfigurePhase() { } if [ -z "${dontUseCmakeConfigure-}" -a -z "${configurePhase-}" ]; then + setOutputFlags= configurePhase=cmakeConfigurePhase fi From f38d3df11c5b7f7253e12649afaa0e47145dab7b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Jul 2020 00:18:46 +0200 Subject: [PATCH 271/400] Revert "qt5.qtwebkit: Fix paths in pc files" This reverts commit dee73775088d8a81a9bbe970049385c5063c2b80. --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 12e19af75f0..1133623483a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -34,9 +34,6 @@ qtModule { bison flex gdb gperf perl pkgconfig python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; - # Temporary fix for https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a - setOutputFlags = true; - cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] ++ optionals stdenv.isDarwin [ "-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia" From 56191821ea755a7e1cdd3985a89298d6ddfb8559 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:06 -0400 Subject: [PATCH 272/400] restic: Wrap binary with rclone --- pkgs/tools/backup/restic/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index f366533f9bf..33cac4ad229 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper +, nixosTests, rclone }: buildGoPackage rec { pname = "restic"; @@ -15,11 +16,13 @@ buildGoPackage rec { subPackages = [ "cmd/restic" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; passthru.tests.restic = nixosTests.restic; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = '' + wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ From d30ac2e50caee73bee60570e276747726f2940df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Jul 2020 10:15:14 +0200 Subject: [PATCH 273/400] farstream: upstream patch to fix build with new gnumake --- pkgs/development/libraries/farstream/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 763caa811e3..0ce0f56d710 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch"; sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn"; }) + # Fix build with newer gnumake. + (fetchpatch { + url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff"; + sha256 = "02pka68p2j1wg7768rq7afa5wl9xv82wp86q7izrmwwnxdmz4zyg"; + }) ]; buildInputs = [ From e978eb5986c7dc573974134d35c11e4cc12d66e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Jul 2020 10:55:32 +0200 Subject: [PATCH 274/400] gnumake42: bring this version back This is almost a revert of commit 0cfe9f3a (PR #86293). Version 4.3 https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html brought some incompatibilities, so this will be useful for shorter-term workarounds. --- .../build-managers/gnumake/4.2/default.nix | 63 +++++++ .../gnumake/4.2/glibc-2.27-glob.patch | 32 ++++ .../gnumake/4.2/impure-dirs.patch | 34 ++++ .../build-managers/gnumake/4.2/pselect.patch | 170 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 300 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/default.nix create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix new file mode 100644 index 00000000000..a83281c4e96 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: + +assert guileSupport -> ( pkgconfig != null && guile != null ); + +let + version = "4.2.1"; +in +stdenv.mkDerivation { + pname = "gnumake"; + inherit version; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.bz2"; + sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; + }; + + patchFlags = [ "-p0" ]; + patches = [ + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./impure-dirs.patch + ./pselect.patch + # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html + ./glibc-2.27-glob.patch + ]; + + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile ]; + + configureFlags = stdenv.lib.optional guileSupport "--with-guile" + + # Make uses this test to decide whether it should keep track of + # subseconds. Apple made this possible with APFS and macOS 10.13. + # However, we still support macOS 10.11 and 10.12. Binaries built + # in Nixpkgs will be unable to use futimens to set mtime less than + # a second. So, tell Make to ignore nanoseconds in mtime here by + # overriding the autoconf test for the struct. + # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. + ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + + outputs = [ "out" "man" "info" ]; + + meta = with stdenv.lib; { + homepage = "https://www.gnu.org/software/make/"; + description = "A tool to control the generation of non-source files from sources"; + license = licenses.gpl3Plus; + + longDescription = '' + Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch new file mode 100644 index 00000000000..186212d0d29 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch @@ -0,0 +1,32 @@ +diff -Naur glob/glob.c glob/glob.c +--- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 ++++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 +@@ -208,28 +208,9 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H + # include +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif + + #ifndef __GNU_LIBRARY__ + # define __stat stat diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch new file mode 100644 index 00000000000..f6646f1d012 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- read.c 2007-05-24 17:16:31.000000000 +0200 +*************** +*** 99,107 **** +--- 99,109 ---- + #endif + INCLUDEDIR, + #ifndef _AMIGA ++ #if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", ++ #endif + #endif + 0 + }; +diff -rc reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- remake.c 2007-05-24 17:06:54.000000000 +0200 +*************** +*** 1452,1460 **** +--- 1452,1462 ---- + static char *dirs[] = + { + #ifndef _AMIGA ++ #if 0 + "/lib", + "/usr/lib", + #endif ++ #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch new file mode 100644 index 00000000000..5a03acb2f7c --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch @@ -0,0 +1,170 @@ +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git posixos.c posixos.c +index e642d7f..dbafa51 100644 +--- posixos.c ++++ posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 723f7075d2d..c86fd302d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10566,6 +10566,7 @@ in m4 = gnum4; gnumake = callPackage ../development/tools/build-managers/gnumake { }; + gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); From bb9f138f00f4b77218e50ecf905074c238c2b4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Jul 2020 11:00:00 +0200 Subject: [PATCH 275/400] mono5: fixup build by using older gnumake Of course, feel free to find a better fix. For simplicity, I switched all mono versions, even though 4 and 6 built fine on Hydra. --- pkgs/development/compilers/mono/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e4d99dcec95..c510f372666 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +, gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" , extraPatches ? [] @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; + nativeBuildInputs = [ gnumake42 ]; buildInputs = [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which ] From 384586db9503f3e6e88eda8a3805941b07aecc2f Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 6 Jul 2020 14:47:18 +0200 Subject: [PATCH 276/400] mixxx: 2.2.3 -> 2.2.4 https://github.com/mixxxdj/mixxx/releases/tag/release-2.2.4 --- pkgs/applications/audio/mixxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f889d9e1e8d..e1d1585cacc 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -19,13 +19,13 @@ let in mkDerivation rec { pname = "mixxx"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; + sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; }; nativeBuildInputs = [ scons.py2 ]; From 7dd656a037fa7f9581cab66764034edcca3de6f9 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:33 -0400 Subject: [PATCH 277/400] nixos/restic: Add options for rclone repositories --- nixos/modules/services/backup/restic.nix | 66 +++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 2388f1d6ca1..c38fd361d35 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -31,6 +31,59 @@ in ''; }; + rcloneOptions = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Options to pass to rclone to control its behavior. + See for + available options. When specifying option names, strip the + leading --. To set a flag such as + --drive-use-trash, which does not take a value, + set the value to the Boolean true. + ''; + example = { + bwlimit = "10M"; + drive-use-trash = "true"; + }; + }; + + rcloneConfig = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Configuration for the rclone remote being used for backup. + See the remote's specific options under rclone's docs at + . When specifying + option names, use the "config" name specified in the docs. + For example, to set --b2-hard-delete for a B2 + remote, use hard_delete = true in the + attribute set. + Warning: Secrets set in here will be world-readable in the Nix + store! Consider using the rcloneConfigFile + option instead to specify secret values separately. Note that + options set here will override those set in the config file. + ''; + example = { + type = "b2"; + account = "xxx"; + key = "xxx"; + hard_delete = true; + }; + }; + + rcloneConfigFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to the file containing rclone configuration. This file + must contain configuration for the remote specified in this backup + set and also must be readable by root. Options set in + rcloneConfig will override those set in this + file. + ''; + }; + repository = mkOption { type = types.str; description = '' @@ -170,11 +223,22 @@ in ( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) ) ( resticCmd + " check" ) ]; + # Helper functions for rclone remotes + rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; + rcloneAttrToOpt = v: "RCLONE_" + toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v); + rcloneAttrToConf = v: "RCLONE_CONFIG_" + toUpper (rcloneRemoteName + "_" + v); + toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in nameValuePair "restic-backups-${name}" ({ environment = { RESTIC_PASSWORD_FILE = backup.passwordFile; RESTIC_REPOSITORY = backup.repository; - }; + } // optionalAttrs (backup.rcloneOptions != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToOpt name) (toRcloneVal value) + ) backup.rcloneOptions) // optionalAttrs (backup.rcloneConfigFile != null) { + RCLONE_CONFIG = backup.rcloneConfigFile; + } // optionalAttrs (backup.rcloneConfig != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToConf name) (toRcloneVal value) + ) backup.rcloneConfig); path = [ pkgs.openssh ]; restartIfChanged = false; serviceConfig = { From 9b80955720a9a3aec891f4de058631f80d8e31b5 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:57 -0400 Subject: [PATCH 278/400] nixos/tests: Add rclone repository to restic test --- nixos/tests/restic.nix | 55 +++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 67bb7f1933d..dad5bdfff27 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -4,33 +4,50 @@ import ./make-test-python.nix ( let password = "some_password"; repository = "/tmp/restic-backup"; - passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; + + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; + initialize = true; + paths = [ "/opt" ]; + pruneOpts = [ + "--keep-daily 2" + "--keep-weekly 1" + "--keep-monthly 1" + "--keep-yearly 99" + ]; in { name = "restic"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bbigras ]; + maintainers = [ bbigras i077 ]; }; nodes = { server = - { ... }: + { pkgs, ... }: { services.restic.backups = { remotebackup = { - inherit repository; - passwordFile = "${passwordFile}"; - initialize = true; - paths = [ "/opt" ]; - pruneOpts = [ - "--keep-daily 2" - "--keep-weekly 1" - "--keep-monthly 1" - "--keep-yearly 99" - ]; + inherit repository passwordFile initialize paths pruneOpts; + }; + rclonebackup = { + repository = rcloneRepository; + rcloneConfig = { + type = "local"; + one_file_system = true; + }; + + # This gets overridden by rcloneConfig.type + rcloneConfigFile = pkgs.writeText "rclone.conf" '' + [local] + type=ftp + ''; + inherit passwordFile initialize paths pruneOpts; }; }; + + environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; }; }; @@ -38,25 +55,35 @@ import ./make-test-python.nix ( server.start() server.wait_for_unit("dbus.socket") server.fail( - "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots" + "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", + "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", ) server.succeed( "mkdir -p /opt", "touch /opt/some_file", + "mkdir -p /tmp/restic-rclone-backup", "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', ) ''; } From 918d5cfb33b99874cf5849ee1e9b226c43ec5b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 07:23:02 +0200 Subject: [PATCH 279/400] python3Packages.tokenizers: 0.8.0 -> 0.8.1.rc1 Changelog: https://github.com/huggingface/tokenizers/releases/tag/python-v0.8.1.rc1 --- pkgs/development/python-modules/tokenizers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 348df4ae95e..e3578cbf8d2 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -32,16 +32,16 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.8.0"; + version = "0.8.1.rc1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3"; + sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv"; }; - cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m"; + cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b"; sourceRoot = "source/bindings/python"; From f491313ff103bc9dbdb8393402aefb41b0177cb4 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 7 Jul 2020 12:12:53 +0300 Subject: [PATCH 280/400] b3sum: 0.1.3 -> 0.3.4 --- .../tools/security/b3sum/add-cargo-lock.patch | 540 ++++++++---------- pkgs/tools/security/b3sum/default.nix | 6 +- 2 files changed, 231 insertions(+), 315 deletions(-) diff --git a/pkgs/tools/security/b3sum/add-cargo-lock.patch b/pkgs/tools/security/b3sum/add-cargo-lock.patch index 309e0f147e7..ecbb2b0bab9 100644 --- a/pkgs/tools/security/b3sum/add-cargo-lock.patch +++ b/pkgs/tools/security/b3sum/add-cargo-lock.patch @@ -1,585 +1,501 @@ ---- /dev/null 2020-01-18 15:11:39.204798767 +0100 -+++ b3sum/Cargo.lock 2020-01-24 14:27:29.593356345 +0100 -@@ -0,0 +1,582 @@ +diff --git a/b3sum/Cargo.lock b/b3sum/Cargo.lock +new file mode 100644 +index 0000000..1ce7abc +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,495 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] -+name = "anyhow" -+version = "1.0.26" ++name = "ansi_term" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "arrayref" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] -+name = "assert_cmd" -+version = "0.12.0" ++name = "atty" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" -+version = "0.1.7" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "b3sum" -+version = "0.1.3" ++version = "0.3.4" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake3 0.1.3", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "blake3", ++ "clap", ++ "duct", ++ "hex", ++ "memmap", ++ "rayon", ++ "tempfile", ++ "wild", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "blake3" -+version = "0.1.3" ++version = "0.3.4" +dependencies = [ -+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "cc", ++ "cfg-if", ++ "constant_time_eq", ++ "crypto-mac", ++ "digest", ++ "rayon", +] + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crossbeam-deque" -+version = "0.7.2" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ -+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-queue" -+version = "0.2.1" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.7.0" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cfg-if", ++ "lazy_static", +] + +[[package]] -+name = "difference" -+version = "2.0.0" ++name = "crypto-mac" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] + +[[package]] -+name = "doc-comment" -+version = "0.3.1" ++name = "digest" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++dependencies = [ ++ "generic-array", ++] + +[[package]] +name = "duct" -+version = "0.13.3" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f90a9c3a25aafbd538c7d40a53f83c4487ee8216c12d1c8ef2c01eb2f6ea1553" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "once_cell", ++ "os_pipe", ++ "shared_child", +] + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] -+name = "escargot" -+version = "0.5.0" ++name = "generic-array" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typenum", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] -+name = "hermit-abi" -+version = "0.1.6" ++name = "glob" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "hex" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "itoa" -+version = "0.4.4" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] -+name = "log" -+version = "0.4.8" ++name = "maybe-uninit" ++version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "memoffset" -+version = "0.5.3" ++version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", +] + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "once_cell" -+version = "1.3.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" + +[[package]] +name = "os_pipe" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "ppv-lite86" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "predicates" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "predicates-core" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "predicates-tree" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", +] + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core", +] + +[[package]] +name = "rayon" -+version = "1.3.0" ++version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] +name = "rayon-core" -+version = "1.7.0" ++version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "crossbeam-queue", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "remove_dir_all" -+version = "0.5.2" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "scopeguard" -+version = "1.0.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "shared_child" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] -+name = "syn" -+version = "1.0.14" ++name = "strsim" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "subtle" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] -+name = "treeline" -+version = "0.1.0" ++name = "typenum" ++version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" + +[[package]] +name = "unicode-width" -+version = "0.1.7" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] -+name = "unicode-xid" -+version = "0.2.0" ++name = "vec_map" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wild" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020" ++dependencies = [ ++ "glob", ++] + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" -+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" -+"checksum duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1607fa68d55be208e83bcfbcfffbc1ec65c9fbcf9eb1a5d548dc3ac0100743b0" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" -+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -+"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" -+"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" -+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" -+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b" -+"checksum shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" -+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 6f783d07ced..dd6a538d11d 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "0.1.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; rev = version; - sha256 = "1aigwwv576ybb3x3fppq46kbvd3k4fc4w1hh2hkzyyic6fibwbpy"; + sha256 = "02yyv91wvy5w7i05z6f3kzxm5x34a4xgkgmcqxnb0ivsxnnld73h"; }; sourceRoot = "source/b3sum"; - cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i"; + cargoSha256 = "0ycn5788dc925wx28sgfs121w4x7yggm4mnmwij829ka8859bymk"; cargoPatches = [ ./add-cargo-lock.patch ]; From 8734a5e362aad7668e528de0d1defa5b6bcd1529 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 6 Jul 2020 23:21:03 -0700 Subject: [PATCH 281/400] firefox: wrapper: gdkWayland->forceWayland --- .../networking/browsers/firefox/wrapper.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9e7e4bc5efa..6e6c1f75b75 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -26,11 +26,11 @@ let , nameSuffix ? "" , icon ? browserName , extraNativeMessagingHosts ? [] - , gdkWayland ? false + , forceWayland ? false , cfg ? config.${browserName} or {} }: - assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used + assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let enableAdobeFlash = cfg.enableAdobeFlash or false; @@ -83,7 +83,7 @@ let exec = "${browserName}${nameSuffix} %U"; inherit icon; comment = ""; - desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}"; + desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; categories = "Network;WebBrowser;"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -124,8 +124,8 @@ let --set SNAP_NAME "firefox" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ - ${lib.optionalString gdkWayland '' - --set GDK_BACKEND "wayland" \ + ${lib.optionalString forceWayland '' + --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d86b5839667..702afba2bf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19889,7 +19889,7 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; firefox = wrapFirefox firefox-unwrapped { }; - firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; + firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr = firefox-esr-68; From 68c68ff3c38760dbfa34c27fdcf5e59825d98f44 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 6 Jul 2020 23:21:23 -0700 Subject: [PATCH 282/400] firefox: wrapper: include libglvnd by default (WR) --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6e6c1f75b75..518bac3106e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -27,6 +27,7 @@ let , icon ? browserName , extraNativeMessagingHosts ? [] , forceWayland ? false + , useGlvnd ? true , cfg ? config.${browserName} or {} }: @@ -68,7 +69,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos - ++ lib.optional gdkWayland libglvnd + ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash From 80a7a4295a72ac2b0a1752b32464036da7b06b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Tue, 30 Jun 2020 23:25:48 +0200 Subject: [PATCH 283/400] nixos/jupyter: add package and command options --- .../services/development/jupyter/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index e598b018645..6a5fd6b2940 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -6,10 +6,7 @@ let cfg = config.services.jupyter; - # NOTE: We don't use top-level jupyter because we don't - # want to pass in JUPYTER_PATH but use .environment instead, - # saving a rebuild. - package = pkgs.python3.pkgs.notebook; + package = cfg.package; kernels = (pkgs.jupyter-kernel.create { definitions = if cfg.kernels != null @@ -37,6 +34,27 @@ in { ''; }; + package = mkOption { + type = types.package; + # NOTE: We don't use top-level jupyter because we don't + # want to pass in JUPYTER_PATH but use .environment instead, + # saving a rebuild. + default = pkgs.python3.pkgs.notebook; + description = '' + Jupyter package to use. + ''; + }; + + command = mkOption { + type = types.str; + default = "jupyter-notebook"; + example = "jupyter-lab"; + description = '' + Which command the service runs. Note that not all jupyter packages + have all commands, e.g. jupyter-lab isn't present in the default package. + ''; + }; + port = mkOption { type = types.int; default = 8888; @@ -157,7 +175,7 @@ in { serviceConfig = { Restart = "always"; - ExecStart = ''${package}/bin/jupyter-notebook \ + ExecStart = ''${package}/bin/${cfg.command} \ --no-browser \ --ip=${cfg.ip} \ --port=${toString cfg.port} --port-retries 0 \ From a8b68fc49f4edeacad1919bd14443dead792fccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Tue, 30 Jun 2020 23:26:49 +0200 Subject: [PATCH 284/400] evcxr: wrap evcxr_jupyter binary evcxr_jupyter needs the same wrapper as the main binary to work. --- pkgs/development/interpreters/evcxr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 4430298beb5..5d3d3de85dd 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime ''; From 5a56be781f4709b5c52d3525cb9f8e1fe75a1809 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Jul 2020 16:31:08 +0000 Subject: [PATCH 285/400] syncthing-discovery: 1.6.1 -> 1.7.0 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9d5ce848e33..5f23fa0e022 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.6.1"; + version = "1.7.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j"; + sha256 = "0jz1xfbs5ql9z7zdldyxc6wr0y5b0pf3vg8vzva5ml9aiqjcs9fg"; }; - vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k"; + vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b"; patches = [ ./add-stcli-target.patch From f9ea9c7299b9e5a181a7a99990d14ae069609eb1 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 8 Jul 2020 21:43:12 -0400 Subject: [PATCH 286/400] nixos/systemd: add options for hardware watchdog management --- nixos/modules/system/boot/systemd.nix | 52 +++++++++++++++++++++++++++ nixos/tests/systemd.nix | 22 ++++++++++++ 2 files changed, 74 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a8e51fc0901..020cf38ea3f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -818,6 +818,45 @@ in ''; }; + systemd.watchdog.device = mkOption { + type = types.path; + example = "/dev/watchdog"; + description = '' + The path to a hardware watchdog device which will be managed by systemd. + If not specified, systemd will default to /dev/watchdog. + ''; + }; + + systemd.watchdog.runtimeTime = mkOption { + type = types.str; + example = "30s"; + description = '' + The amount of time which can elapse before a watchdog hardware device + will automatically reboot the system. Valid time units include "ms", + "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.rebootTime = mkOption { + type = types.str; + example = "10m"; + description = '' + The amount of time which can elapse after a reboot has been triggered + before a watchdog hardware device will automatically reboot the system. + Valid time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.kexecTime = mkOption { + type = types.str; + example = "10m"; + description = '' + The amount of time which can elapse when kexec is being executed before + a watchdog hardware device will automatically reboot the system. This + option should only be enabled if reloadTime is also enabled. Valid + time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; }; @@ -889,6 +928,19 @@ in DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity + ${optionalString (config.systemd.watchdog.device != "") '' + WatchdogDevice=${config.systemd.watchdog.device} + ''} + ${optionalString (config.systemd.watchdog.runtimeTime != "") '' + RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime} + ''} + ${optionalString (config.systemd.watchdog.rebootTime != "") '' + RebootWatchdogSec=${config.systemd.watchdog.rebootTime} + ''} + ${optionalString (config.systemd.watchdog.kexecTime != "") '' + KExecWatchdogSec=${config.systemd.watchdog.kexecTime} + ''} + ${config.systemd.extraConfig} ''; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index ca2e36a443e..ce950be4846 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -50,6 +50,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { fi ''; }; + + systemd.watchdog = { + device = "/dev/watchdog"; + runtimeTime = "30s"; + rebootTime = "10min"; + kexecTime = "5min"; + }; }; testScript = '' @@ -117,5 +124,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { retcode, output = machine.execute("systemctl status testservice1.service") assert retcode in [0, 3] # https://bugs.freedesktop.org/show_bug.cgi?id=77507 assert "CPU:" in output + + # Test systemd is configured to manage a watchdog + with subtest("systemd manages hardware watchdog"): + machine.wait_for_unit("multi-user.target") + + # It seems that the device's path doesn't appear in 'systemctl show' so + # check it separately. + assert "WatchdogDevice=/dev/watchdog" in machine.succeed( + "cat /etc/systemd/system.conf" + ) + + output = machine.succeed("systemctl show | grep Watchdog") + assert "RuntimeWatchdogUSec=30s" in output + assert "RebootWatchdogUSec=10m" in output + assert "KExecWatchdogUSec=5m" in output ''; }) From 6e3fd6892c91bbf846af80baf6460b98d2715e05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 10:06:28 +0000 Subject: [PATCH 287/400] gtkwave: 3.3.104 -> 3.3.105 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 3d75780936e..448d6d0535a 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.104"; + version = "3.3.105"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "1qvldbnlp3wkqr5ff93f6pdvv9yzij7lxfhpqlizakz08l1xb391"; + sha256 = "1vifgyhwqhpipnzmsivncawqjqihcm5kyg3yyygmd0lmgljy9rs4"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From 98ba751a359a750892006283fc5cb2983711ecae Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 9 Jul 2020 14:38:43 +0200 Subject: [PATCH 288/400] colorlogs: 10.0 -> 14.0 --- pkgs/development/python-modules/coloredlogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 219e48ad664..6ef440da0ac 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "coloredlogs"; - version = "10.0"; + version = "14.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-coloredlogs"; rev = version; - sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a"; + sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; }; # patch by risicle From fe381b3cf480764c7e82a451dde2dfbdce07c7c5 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 7 Jul 2020 15:04:03 -0700 Subject: [PATCH 289/400] python3Packages.nmigen: from unstable-2020-02-08 to unstable-2020-04-02 Fixes nmigen build due to pyvcd being bumped to v0.2. --- pkgs/development/python-modules/nmigen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 3cb2056c7cf..98d95afa992 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2019-02-08"; + version = "unstable-2020-04-02"; # python setup.py --version realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "66f4510c4465be5d0763d7835770553434e4ee91"; - sha256 = "19y39c4ywckm4yzrpjzcdl9pqy9d1sf1zsb4zpzajpmnfqccc3b0"; + rev = "c79caead33fff14e2dec42b7e21d571a02526876"; + sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; }; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; - homepage = "https://github.com/nmigen/nmigen"; + homepage = "https://nmigen.info/nmigen"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; From 36d622b7c7579c29581be367b337e80ae4343a5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 20:48:14 +0000 Subject: [PATCH 290/400] masterpdfeditor: 5.4.38 -> 5.6.09 --- pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 5df4a1b8d93..d541c5e1289 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.4.38"; + version = "5.6.09"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz"; - sha256 = "0fidy8gd4mqvyfgmrwdiz8z53dyzihqqhgfrffj0z0idm2zi4mcq"; + sha256 = "0v9j6fwr0xl03kr77vf4wdb06zlplmn4mr3jyzxhvs8a77scmfzb"; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; From 30a2f403367b8acf3b50d42127cc91d229170fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 10 Jul 2020 00:18:53 +0200 Subject: [PATCH 291/400] redo-c: Initial 0.2 --- .../tools/build-managers/redo-c/Makefile | 10 ++++++++ .../tools/build-managers/redo-c/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/build-managers/redo-c/Makefile create mode 100644 pkgs/development/tools/build-managers/redo-c/default.nix diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile new file mode 100644 index 00000000000..f2c43cc5003 --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-c/Makefile @@ -0,0 +1,10 @@ +CFLAGS=-Os + +all: redo links + +links: + sh links.do + +install: + mkdir -p "$(out)/bin" + cp --no-dereference redo redo-* "$(out)/bin" diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix new file mode 100644 index 00000000000..1480f32a50f --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "redo-c"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + }; + + postPatch = '' + cp '${./Makefile}' Makefile + ''; + + meta = with stdenv.lib; { + description = "An implementation of the redo build system in portable C with zero dependencies"; + homepage = "https://github.com/leahneukirchen/redo-c"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ ck3d ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb8d0c45ed..be55e801220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11020,6 +11020,8 @@ in redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-c = callPackage ../development/tools/build-managers/redo-c { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; From 8437596bebb1e7660b3a5783657ff6ac5e98afff Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 9 Jul 2020 19:56:06 -0700 Subject: [PATCH 292/400] firefox{,-bin}: add 'mesa', for wayland/drm --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index cb442f67359..8f060128561 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -47,6 +47,7 @@ , gnupg , ffmpeg_3 , runtimeShell +, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" }: @@ -106,6 +107,7 @@ stdenv.mkDerivation { gtk2 gtk3 kerberos + mesa libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9e7e4bc5efa..23635dcc300 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,6 +10,7 @@ , udev , kerberos , libva +, mesa # firefox wants gbm for drm+dmabuf }: ## configurability of the wrapper itself @@ -65,7 +66,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd From d15d77abd314041155810a99f5898d90265bfc9b Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 05:18:52 -0700 Subject: [PATCH 293/400] python3Packages.zigpy: 0.11.0 -> 0.22.0 --- pkgs/development/python-modules/zigpy/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dfe1a5c547d..8c9a41cdb34 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,25 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pycryptodome, pycrypto +, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous , pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { - pname = "zigpy-homeassistant"; - version = "0.19.0"; + pname = "zigpy"; + version = "0.22.0"; - nativeBuildInputs = [ pytest pytest-asyncio asynctest ]; - buildInputs = [ aiohttp pycryptodome ]; - propagatedBuildInputs = [ crccheck pycrypto ]; + propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc"; + sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc"; }; meta = with stdenv.lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } From 63e59c6d1001852356e9b6652442028419bfd98b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 Mar 2020 21:43:25 +0100 Subject: [PATCH 294/400] python3Packages.pure-pcapy3: init at 1.0.1 --- .../python-modules/pure-pcapy3/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pure-pcapy3/default.nix diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix new file mode 100644 index 00000000000..71673da7abe --- /dev/null +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pure-pcapy3"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr"; + }; + + meta = with stdenv.lib; { + description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; + homepage = "http://bitbucket.org/viraptor/pure-pcapy"; + license = licenses.bsd2; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4340f6a30ee..e9eaacfcf09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7446,6 +7446,8 @@ in { pulp = callPackage ../development/python-modules/pulp { }; + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + behave = callPackage ../development/python-modules/behave { }; pyhamcrest = if isPy3k then From 2c004e0c536b0119244fd915a0fb5c7ed4bd20c4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 Mar 2020 22:13:54 +0100 Subject: [PATCH 295/400] python3Packages.bellows: init at 0.17.0 --- .../python-modules/bellows/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/bellows/default.nix diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix new file mode 100644 index 00000000000..32ac3e8bd19 --- /dev/null +++ b/pkgs/development/python-modules/bellows/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildPythonPackage, fetchPypi +, click, click-log, pure-pcapy3 +, pyserial, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytest, pytest-asyncio }: + +let + pname = "bellows"; + version = "0.17.0"; + +in buildPythonPackage rec { + inherit pname version; + + src = fetchPypi { + inherit pname version; + sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6"; + }; + + propagatedBuildInputs = [ + click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + ]; + + checkInputs = [ + asynctest pytest pytest-asyncio + ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace "click-log==0.2.0" "click-log>=0.2.0" + ''; + + meta = with stdenv.lib; { + description = "A Python 3 project to implement EZSP for EmberZNet devices"; + homepage = "https://github.com/zigpy/bellows"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9eaacfcf09..c9059be64c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7450,6 +7450,8 @@ in { behave = callPackage ../development/python-modules/behave { }; + bellows = callPackage ../development/python-modules/bellows { }; + pyhamcrest = if isPy3k then callPackage ../development/python-modules/pyhamcrest { } else From 29b377db2714e138621cbcd69e82d166ce9e9438 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 21:53:09 +0200 Subject: [PATCH 296/400] python3Packages.zigpy-cc: init at 0.4.4 --- .../python-modules/zigpy-cc/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-cc/default.nix diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix new file mode 100644 index 00000000000..7223800caa9 --- /dev/null +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, asynctest, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "zigpy-cc"; + version = "0.4.4"; + + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ asynctest pytest pytest-asyncio ]; + + src = fetchPypi { + inherit pname version; + sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; + homepage = "http://github.com/sanyatuning/zigpy-cc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9059be64c6..acfcf3ef36a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2689,6 +2689,8 @@ in { zigpy = callPackage ../development/python-modules/zigpy { }; + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; digital-ocean = callPackage ../development/python-modules/digitalocean { }; From f10f300f01c62b7a7fd8146d9a0a94b43a5f6074 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 22:13:54 +0200 Subject: [PATCH 297/400] python3Packages.zigpy-xbee: init at 0.12.1 --- .../python-modules/zigpy-xbee/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-xbee/default.nix diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix new file mode 100644 index 00000000000..70266644801 --- /dev/null +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-xbee"; + version = "0.12.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with XBee radios for zigpy"; + homepage = "http://github.com/zigpy/zigpy-xbee"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acfcf3ef36a..66b5c09173e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2693,6 +2693,8 @@ in { zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; From 2b04280575124322b0e7262e21670e8ca8ce155c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 22:24:21 +0200 Subject: [PATCH 298/400] python3Packages.zigpy-zigate: init at 0.6.1 --- .../python-modules/zigpy-zigate/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-zigate/default.nix diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix new file mode 100644 index 00000000000..43f291841ff --- /dev/null +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-zigate"; + version = "0.6.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with ZiGate radios for zigpy"; + homepage = "http://github.com/doudz/zigpy-zigate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66b5c09173e..3115c41e162 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2695,6 +2695,8 @@ in { zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; From 97805ff98999d876632a4fc37cee8db1d6bec02a Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 08:05:37 -0700 Subject: [PATCH 299/400] python3Packages.zigpy-deconz: fix dependencies --- pkgs/development/python-modules/zigpy-deconz/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 80667cf6ec5..af52e942530 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -1,14 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy -, pytest }: +, pyserial, pyserial-asyncio, zigpy +, pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { pname = "zigpy-deconz"; version = "0.9.2"; - nativeBuildInputs = [ pytest ]; - buildInputs = [ aiohttp crccheck pycryptodome ]; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; @@ -19,7 +18,7 @@ buildPythonPackage rec { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } From 9fb7c8e5d90d5b0e0462710f93ef547685b4d929 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 07:42:46 -0700 Subject: [PATCH 300/400] home-assistant: Update component packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 02bada50023..44aba8299a5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -934,7 +934,7 @@ "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; From 14414670153913edfbb8ed041dc357265c983a78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 05:59:20 +0000 Subject: [PATCH 301/400] postgresql11Packages.pgrouting: 3.0.0 -> 3.0.1 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 76aa4c4ffec..7a50c45ae69 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.0.0"; + version = "3.0.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "101lyhhfcv3chrp2h5q04l155hr6wvx427cv1kgd4ryzk88wxx5i"; + sha256 = "13dis8yy559lkq54bdn34mllwr2yxwayqh6ff9lyd4f8hpj2ra7c"; }; installPhase = '' From c2e1c9175ff646bf15e27598816c0633c73d03e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 07:23:29 +0200 Subject: [PATCH 302/400] python3Packages.transformers: 3.0.1 -> 3.0.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v3.0.2 --- pkgs/development/python-modules/transformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 33cb5e04959..1f1451c5f0c 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z"; + sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9" + --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" ''; preCheck = '' From 33873dab2262559955f6505528b97513c3fee7c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Jul 2020 04:20:00 -0500 Subject: [PATCH 303/400] python27Packages.pillow: fix build on darwin --- pkgs/development/python-modules/pillow/6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index ad69f4f2345..64f162c24eb 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - python -m pytest -v -x -W always + python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} runHook postCheck ''; From 1e338c42bfbb707c67df281fb33ac65cfa9dfbf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 09:21:44 +0000 Subject: [PATCH 304/400] python27Packages.bitarray: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 2036d4dba4b..68c44da8197 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0m29k3lq37v53pczyr2d5mr3xdh2kv31g2yfnfx8m1ivxvy9z9i7"; + sha256 = "1pz3yd9rhz3cb0yf7dbjhd1awm0w7vsbj73k4v95484j2kdxk3d4"; }; meta = with lib; { From 9deee366491368dc2f3c5e5ae901ac0e8ba38d39 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 8 Jul 2020 13:09:29 +0200 Subject: [PATCH 305/400] matrix-synapse: 1.15.2 -> 1.16.1 https://github.com/matrix-org/synapse/releases/tag/v1.16.0 https://github.com/matrix-org/synapse/releases/tag/v1.16.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4af80e27711..3b7c1655ea8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.15.2"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb"; + sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa"; }; patches = [ From 50019ed16da33878cb4b86c500042095e5c7c53d Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 10 Jul 2020 13:54:25 +0000 Subject: [PATCH 306/400] go-ethereum: 1.9.16 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index d29292439c0..9daccfaaaf9 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.15"; + version = "1.9.16"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1c69rfnx9130b87pw9lnaxyrbzwfhqb2dxyl7qyiscq85hqs16f9"; + sha256 = "0vycnyz6v39cfrck70h3dbn7jkkh67q0fli240ksw2cp4pqwpwcn"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "1pjgcx6sydfipsx8s0kl7n6r3lk61klsfrkd7cg4l934k590q2n7"; + vendorSha256 = "0w2214fllw93xbrlxayhl014aqbjsc8zz7mpik7w5b26m60hn5kr"; overrideModAttrs = (_: { postBuild = '' From 75ee18766ac52a97df1dc55a11a2d44cb0e68d0e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 10 Jul 2020 18:24:03 +0200 Subject: [PATCH 307/400] yarn2nix: Don't pass yarnNix to mkDerivation (#92856) The generated yarnNix file doesn't need to be part of the mkDerivation. And doing so prevents other platforms from reproducibly instantiating it. With this change you can e.g. do darwinPkgs.yarn2nix.mkYarnPackage { # ... yarnNix = pkgs.yarn2nix.mkYarnNix { yarnLock = ./yarn.lock; }; } Which is a darwin derivation, but can still be instantiated reproducibly on Linux. --- pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 22032e145d3..89bc169d503 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -284,7 +284,7 @@ in rec { '') workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { + in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // { inherit src pname; name = baseName; @@ -389,7 +389,7 @@ in rec { # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. yarnNix = ./yarn.nix; - + # Using the filter above and importing package.json from the filtered # source results in an error in restricted mode. To circumvent this, # we import package.json from the unfiltered source From a100503b083b603bf0e2d44fd825e88325aeca1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Jul 2020 19:42:13 +0200 Subject: [PATCH 308/400] gnome3.mutter: export libdir It is needed for finding clutter & co. typelibs by extenstions. --- pkgs/desktops/gnome-3/core/mutter/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 42697911bd4..9e67b5e835d 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,6 +1,7 @@ { fetchurl , fetchpatch , substituteAll +, runCommand , stdenv , pkgconfig , gnome3 @@ -42,7 +43,7 @@ , wayland-protocols }: -stdenv.mkDerivation rec { +let self = stdenv.mkDerivation rec { pname = "mutter"; version = "3.36.3"; @@ -132,6 +133,18 @@ stdenv.mkDerivation rec { ''; passthru = { + libdir = "${self}/lib/mutter-6"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" {} '' + if [[ ! -d ${self.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; @@ -145,4 +158,5 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}; +in self From c3bbbb75a9fea9fdea0dc95c19c7547e683850aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 15:07:15 +0000 Subject: [PATCH 309/400] python27Packages.pytest-isort: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 96f78426dba..869466c6500 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "758156cb4dc1db72adc1b7e253011f5eea117fab32af03cedb4cbfc6058b5f8f"; + sha256 = "01j0sx8yxd7sbmvwky68mvnwrxxs5bjkvi61043jzff1ga92kg9h"; }; propagatedBuildInputs = [ isort ]; From 3a32232cbfd29daf1a2ac28acb353e8316099a40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 17:46:43 +0000 Subject: [PATCH 310/400] python27Packages.wasabi: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 1865b5792b1..7f37b8def75 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0qv0zpr6kwjwygx9k8jgafiil5wh2zsyryvbxghzv4yn7jb3xpdq"; + sha256 = "136c5qwmvpkdy4njpcwhppnhah7jjlhhjzzzk5lpk8i6f4fz2xg8"; }; checkInputs = [ From c960abf50f309badb8f554e2aff8aac1f363d737 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 10 Jul 2020 23:38:11 +0530 Subject: [PATCH 311/400] trojita: 0.7.20190618 -> 0.7.20200706 Fix #92869 --- .../applications/networking/mailreaders/trojita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index f383018e253..6f885dd18be 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -19,12 +19,12 @@ mkDerivation rec { pname = "trojita"; - version = "0.7.20190618"; + version = "0.7.20200706"; src = fetchgit { url = "https://anongit.kde.org/trojita.git"; - rev = "90b417b131853553c94ff93aef62abaf301aa8f1"; - sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql"; + rev = "e973a5169f18ca862ceb8ad749c93cd621d86e14"; + sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; buildInputs = [ From e96bf89d1e36c89998afc63f74a9dce07ce99c18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Jul 2020 20:12:34 +0200 Subject: [PATCH 312/400] gnomeExtensions.system-monitor: unbreak with newer GNOME Shell Had to switch to master and include Clutter typelib to path since recent versions of GNOME Shell open preferences out of Shell context. --- .../extensions/system-monitor/default.nix | 12 +++++----- .../paths_and_nonexisting_dirs.patch | 22 ++++++++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 489a4c5587f..1bc35312593 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,14 +1,14 @@ -{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; - version = "38"; + version = "2020-04-27-unstable"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "v${version}"; - sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv"; + rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0"; + sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks="; }; buildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./paths_and_nonexisting_dirs.patch; + clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️ gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) @@ -41,8 +42,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ tiramiseb ]; homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - # 3.36 support not yet ready - # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564 - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch index 82e3d7c541b..280af965af3 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch @@ -1,5 +1,5 @@ diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index b4b7f15..d139135 100644 +index de5e3d7..2d7824d 100644 --- a/system-monitor@paradoxxx.zero.gmail.com/extension.js +++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js @@ -18,6 +18,9 @@ @@ -11,13 +11,23 @@ index b4b7f15..d139135 100644 + /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily * by loading the new libnm.so. Should go away eventually */ - const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0"); -@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({ - connected: false, - _init: function () { + +@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { + this.connected = false; + this._volumeMonitor = Gio.VolumeMonitor.get(); - let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; + let sys_mounts = ['/home', '/tmp', '/boot']; this.base_mounts = ['/']; - sys_mounts.forEach(Lang.bind(this, function (sMount) { + sys_mounts.forEach((sMount) => { if (this.is_sys_mount(sMount + '/')) { +diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +index 81d667c..0da4809 100644 +--- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js ++++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js +@@ -1,3 +1,5 @@ ++imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); ++ + const Gtk = imports.gi.Gtk; + const Gio = imports.gi.Gio; + const Gdk = imports.gi.Gdk; From 97a2dbdce5d7293e8c50e2b74435dd8f08d2d5fc Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Fri, 10 Jul 2020 14:14:23 -0400 Subject: [PATCH 313/400] caps2esc: 0.1.0 -> 0.1.3 --- .../interception-tools/caps2esc.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index 994e9da3e43..7e6206eb1f3 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitLab, cmake }: -let - version = "0.1.0"; - pname = "interception-tools-caps2esc"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + pname = "caps2esc"; + version = "0.1.3"; - src = fetchurl { - url = "https://gitlab.com/interception/linux/plugins/caps2esc/repository/v${version}/archive.tar.gz"; - sha256 = "1fdxqp54gwsrm2c63168l256nfwdk4mvgr7nlwdv62wd3l7zzrg8"; + src = fetchFromGitLab { + owner = "interception/linux/plugins"; + repo = pname; + rev = "v${version}"; + sha256 = "10xv56vh5h3lxyii3ni166ddv1sz2pylrjmdwxhb4gd2p5zgl1ji"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/interception/linux/plugins/caps2esc"; From 12cf86fd196f22ffc8a17961c42f60e4617d6626 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 20:10:47 +0000 Subject: [PATCH 314/400] python37Packages.voluptuous-serialize: 2.3.0 -> 2.4.0 --- .../python-modules/voluptuous-serialize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index f310148d75d..383eed03a4e 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.3.0"; + version = "2.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l"; + sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; }; propagatedBuildInputs = [ From 57a53677b457e11c91c7ade1edab40fb82fc934d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 10 Jul 2020 16:53:28 -0500 Subject: [PATCH 315/400] liburing: 0.6pre600 -> 0.7 Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 519023bb27e..e0297812209 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.6pre600_${builtins.substring 0 8 src.rev}"; + version = "0.7"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; - rev = "f2e1f3590f7bed3040bd1691676b50839f7d5c39"; - sha256 = "0wg0pgcbilbb2wg08hsvd18q1m8vdk46b3piz7qb1pvgyq01idj2"; + rev = "liburing-${version}"; + sha256 = "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"; }; separateDebugInfo = true; From 017f120e5042b7303b86d31110f242080856f9ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 22:22:42 +0000 Subject: [PATCH 316/400] randomx: 1.1.7 -> 1.1.8 --- pkgs/development/libraries/randomx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 5b0c2b8a657..6de7ecdfef3 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.7"; + version = "1.1.8"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "1d42dw4zrd7mzfqs6gwk27jj6lsh6pwv85p1ckx9dxy8mw3m52ah"; + sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; }; meta = with stdenv.lib; { From 0d685127497c918db079f9f651aa9462051fbb2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 01:11:05 +0000 Subject: [PATCH 317/400] rustup: 1.21.1 -> 1.22.1 --- pkgs/development/tools/rust/rustup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 688159445d5..bdd916ccdda 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.21.1"; + version = "1.22.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg"; + sha256 = "0nf42pkyn87y0n93vd63bihx74h4bpisv74aqldg3vcav2iv35s1"; }; - cargoSha256 = "1y13kfski36rfvqkp3mxxn12aidp339j7rigv49msyr004ac5y8s"; + cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi"; nativeBuildInputs = [ pkgconfig ]; From 123ee325557baae78bdf722ac1e44937fc3ea21e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 01:46:31 +0000 Subject: [PATCH 318/400] smemstat: 0.02.07 -> 0.02.08 --- pkgs/os-specific/linux/smemstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 6693b379948..64525052af2 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.07"; + version = "0.02.08"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "09i5n1zjw45qrfbc2vglh1xk1jwqnc91bgsq7bkp29d9dpfpzhdc"; + sha256 = "1agigvkv1868cskivzrwyiixl658x5bv7xpz4xjc8mlii4maivpp"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From 3b0608d679824636d5f143e3294b198541e5d54b Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 10 Jul 2020 21:47:26 -0400 Subject: [PATCH 319/400] nixos/networkd: correct DHCPv6 UseDNS field --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3ca43a75c26..721080949e0 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -302,7 +302,7 @@ let checkDhcpV6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ - "UseDns" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + "UseDNS" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" ]) (assertValueOneOf "UseDNS" boolValues) From a7c3c39bf36074f08d90cffc48b4efc29501b8cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 03:22:42 +0000 Subject: [PATCH 320/400] stig: 0.11.0a -> 0.11.2a0 --- pkgs/applications/networking/p2p/stig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 98fd41e8bcd..276cabfa2aa 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.11.0a"; + version = "0.11.2a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "192v8f80jfly12bqzsslpxlvm72kdqm3jl40x1az5czpg4ab3lb7"; + sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8"; }; # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged From 40f4cbbd7c07444938517243da426d59b32e9b22 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 11 Jul 2020 02:10:54 -0600 Subject: [PATCH 321/400] lazygit: 0.20.4 -> 0.20.5 new version released with a small improvement https://github.com/jesseduffield/lazygit/releases/tag/v0.20.5 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c3ae1eb30e8..097858fa6f2 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.4"; + version = "0.20.5"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk"; + sha256 = "0968aww43gvc4wx2nyjyavclyspls7rbdlpzq6k5z7pgf4mgganw"; }; meta = with stdenv.lib; { From d5ac1d5d768a190907163fe0a65898f090443ada Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Jul 2020 22:07:53 -0700 Subject: [PATCH 322/400] python3Packages.msrest: 0.6.13 -> 0.6.17 --- pkgs/development/python-modules/msrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index b415537106e..2e67fbec2c0 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.13"; + version = "0.6.17"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz"; + sha256 = "1f1cpl5x7q0f9lpwxc1pl9j5x5yrksfizl9k939iqklf95ssymff"; }; propagatedBuildInputs = [ From f7108ec48b0c7aebef7f07251eede19e3380b038 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Jul 2020 22:08:07 -0700 Subject: [PATCH 323/400] python3Packages.msrestazure: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/msrestazure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index a97469e8073..96c546e5d35 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.6.4"; pname = "msrestazure"; # Pypi tarball doesnt include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrestazure-for-python"; rev = "v${version}"; - sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8"; + sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; }; propagatedBuildInputs = [ adal msrest ]; From 3c8cdbff841178095434118e918a71645e5e7e8a Mon Sep 17 00:00:00 2001 From: Philipp Adolf Date: Sat, 11 Jul 2020 10:57:45 +0200 Subject: [PATCH 324/400] Revert "bashCompletion: speed-up test execution by using xdist" This reverts commit a85b07cbcb7a034bc07dda3642bc68fe621a63ec as executing the tests in parallel makes them flaky. This can be seen very easily on armv7l machines (and probably other machines that are slower than common x86_64 machines as well), but is also reproducible on x86_64. This fixes #91706. --- pkgs/shells/bash/bash-completion/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index e5ef70e43a9..8463b1750d1 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { python3Packages.pexpect python3Packages.pytest bashInteractive - - # use xdist to speed up the test run, just like upstream: - # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4 - python3Packages.pytest_xdist ]; # - ignore test_gcc on ARM because it assumes -march=native @@ -44,7 +40,7 @@ stdenv.mkDerivation rec { # - ignore test_ls because impure logic # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest -n $NIX_BUILD_CORES . \ + pytest . \ ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ From 44391a72b2e08a31680b934df9585ffa326253dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Jul 2020 11:07:18 +0200 Subject: [PATCH 325/400] mongodb: add basic check For example, it detected the issue fixed in the parent commit (tested on aarch64). --- pkgs/servers/nosql/mongodb/mongodb.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 8ffdbcd63c4..2c058edbcca 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -102,6 +102,13 @@ in stdenv.mkDerivation rec { rm -f "$out/bin/install_compass" || true ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + "$out/bin/mongo" --version + runHook postInstallCheck + ''; + prefixKey = "--prefix="; enableParallelBuilding = true; From 56784484ff3dd701071f49d87b9e2234fccc8812 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Jul 2020 04:20:00 -0500 Subject: [PATCH 326/400] jetbrains-mono: 1.0.6 -> 2.000 --- pkgs/data/fonts/jetbrains-mono/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 718b6b218df..4f4f80dbeba 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.6"; + version = "2.000"; in -fetchzip rec { +fetchzip { name = "JetBrainsMono-${version}"; - url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip"; - sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; + sha256 = "1kmb0fckiwaphqxw08xd5fbfjrwnwxz48bidj16ixw8lgcr29b8g"; postFetch = '' mkdir -p $out/share/fonts From 8618e44f46aaac0c6a9afbd349e18379e98c6a5a Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Wed, 1 Jul 2020 21:30:09 +0200 Subject: [PATCH 327/400] atlassian-jira: 8.9.0 -> 8.10.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index fd35ef8735a..81bb6a0e5d2 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1rpibkp57nw084yd018924g1mdcqk8gnj99m85fmmhpppgbh9ca9"; + sha256 = "1l0kxh4cwqyciylbccd4vfmsvq9cr5sfd0v2gbs3lz41av79mlwa"; }; buildPhase = '' From 2968735bbce9ba2706332487362522400e5458d8 Mon Sep 17 00:00:00 2001 From: David McKay Date: Sat, 11 Jul 2020 13:45:02 +0100 Subject: [PATCH 328/400] gnomeExtensions.dash-to-panel: 31 -> 38 --- pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 4e9c4c025cd..a41719f2b9b 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "31"; + version = "38"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0vh36mdncjvfp1jbinifznj5dw3ahsswwm3m9sjw5gydsbx6vh83"; + sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1"; }; buildInputs = [ From ef4f6dba945a0e44a1ee7c571e0bc501a7ac12ad Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:46:29 +0200 Subject: [PATCH 329/400] php73: 7.3.19 -> 7.3.20 Changelog: https://www.php.net/ChangeLog-7.php#7.3.20 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..340f61eca6a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -276,8 +276,8 @@ let }); php73base = callPackage generic (_args // { - version = "7.3.19"; - sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d"; + version = "7.3.20"; + sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From 86ed3bf5780d1d089617866b3886f79611245b39 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:49:37 +0200 Subject: [PATCH 330/400] php72: 7.2.31 -> 7.2.32 Changelog: https://www.php.net/ChangeLog-7.php#7.2.32 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..ec351936664 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -268,8 +268,8 @@ let }; php72base = callPackage generic (_args // { - version = "7.2.31"; - sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv"; + version = "7.2.32"; + sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; From 49316cca663f4258381b731afdd2bc99737d9d37 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:41:01 +0200 Subject: [PATCH 331/400] php74: 7.4.7 -> 7.4.8 Changelog: https://www.php.net/ChangeLog-7.php#7.4.8 --- pkgs/development/interpreters/php/default.nix | 4 ++-- pkgs/top-level/php-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..4c244bb3c9c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -284,8 +284,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.7"; - sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0"; + version = "7.4.8"; + sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a"; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1e6430df983..668ea8c67ed 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1014,6 +1014,7 @@ in +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | '') + ] ++ lib.optional (lib.versionOlder php.version "7.4.8") [ (pkgs.writeText "mysqlnd_fix_compression.patch" '' --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h From 1bff502065370a2ce2e7c967fafd681a1f02bcf3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Jul 2020 15:23:47 +0200 Subject: [PATCH 332/400] =?UTF-8?q?ocamlPackages.lambdasoup:=200.6.3=20?= =?UTF-8?q?=E2=86=92=200.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lambdasoup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index b4980240c90..f535ee78fef 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "0.6.3"; # NB: double-check the license when updating + version = "0.7.1"; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "1w4zp3vswijzvrx0c3fv269ncqwnvvrzc46629nnwm9shwv07vmv"; + sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; }; propagatedBuildInputs = [ markup ]; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; - license = lib.licenses.bsd2; + license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; From bda43779f6a1c90b9733faa046396b59250001e0 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 11 Jul 2020 15:33:23 +0200 Subject: [PATCH 333/400] minetest: 5.2.0 -> 5.3.0 --- pkgs/games/minetest/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index db36b43ea29..f49ec1f4a82 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -39,7 +39,7 @@ let ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" ]; - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; @@ -47,7 +47,7 @@ let buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.2.0"; - sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1"; - dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358"; + version = "5.3.0"; + sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; + dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; }; in { From 512637e1d09d8fcc540d4eab41b96c8a077756e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 05:44:22 +0000 Subject: [PATCH 334/400] gnome3.tali: 3.36.1 -> 3.36.4 --- pkgs/desktops/gnome-3/games/tali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 62df1cd1e3d..2fd1d034db3 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.36.1"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1klnxk49rr1m2lr4zj1wvfl0iaxzdh2k8ngrcmfmcq39vlxnn94y"; + sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c"; }; passthru = { From 4a2327e7f1982a4740e412189ff7feb68554f757 Mon Sep 17 00:00:00 2001 From: uosis Date: Thu, 9 Jul 2020 16:47:22 -0600 Subject: [PATCH 335/400] loop: unstable-2018-12-04 -> unstable-2020-07-08 --- pkgs/tools/misc/loop/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 73907e233ab..3cc0466d80a 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - name = "loop-unstable-2018-12-04"; + pname = "loop"; + version = "unstable-2020-07-08"; src = fetchFromGitHub { owner = "Miserlou"; repo = "Loop"; - rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf"; - sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; + rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0"; + sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; }; - cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv"; + cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; From 05c65878bad487dddf90342797df804ce57e7fa5 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 11 Jul 2020 15:56:48 +0000 Subject: [PATCH 336/400] ipfs-migrator: 1.5.1 -> 1.6.3 --- pkgs/applications/networking/ipfs-migrator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 7a9d8f63970..c4c893f699c 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.5.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; + sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5"; }; vendorSha256 = null; @@ -22,4 +22,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; }; -} \ No newline at end of file +} From 881c92f68f3cf44a601aaf4f624856881b0ecff9 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 11 Jul 2020 16:06:12 +0000 Subject: [PATCH 337/400] mage: 1.9.0 -> 1.10.0 --- pkgs/development/tools/build-managers/mage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index ed145d38c7f..e21410fb6f3 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; + sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf"; }; vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; @@ -27,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ swdunlop ]; platforms = platforms.all; }; -} \ No newline at end of file +} From ca343e539804dfa1ba9c4a7f0f615a47db52a3d1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 11 Jul 2020 18:26:40 +0200 Subject: [PATCH 338/400] cargo-inspect: 0.10.1 -> 0.10.3 --- pkgs/development/tools/rust/cargo-inspect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index f16a5d5727a..8626ae243b8 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-inspect"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "mre"; repo = pname; rev = version; - sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; + sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc"; + cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; meta = with lib; { description = "See what Rust is doing behind the curtains"; From 0877879d0c6230cded88713d26e3b23aa1ecf89e Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 11 Jul 2020 19:46:49 +0300 Subject: [PATCH 339/400] jetbrains.jdk: 11.0.6-b774 -> 11.0.7-b64 (#92837) --- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 1502b243d88..fd3270fa0d0 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11.0.6-b774"; + version = "11.0.7-b64"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0lx3h74jwa14kr8ybwxbzc4jsjj6xnymvckdsrhqhvrciya7bxzw"; + sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90"; }; patches = []; meta = with stdenv.lib; { From 38c590a7defc713bca3bd54203695497fbbbabcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 18:50:21 +0200 Subject: [PATCH 340/400] coreboot-utils: 4.11 -> 4.12 --- pkgs/tools/misc/coreboot-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index e769cb25a73..533b4eefc2a 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.11"; + version = "4.12"; meta = with stdenv.lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp"; + sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd"; }; enableParallelBuilding = true; From 553859d1420d0d67752f94e245cd5615860aa497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 18:54:34 +0200 Subject: [PATCH 341/400] mumble: 1.3.1 -> 1.3.2 --- pkgs/applications/networking/mumble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b83e98a558c..8490c0509a1 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -128,14 +128,14 @@ let } source; source = rec { - version = "1.3.1"; + version = "1.3.2"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc"; + sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6"; fetchSubmodules = true; }; }; From f23acc03cf69baadc31b867627d086678fbed592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:01:19 +0200 Subject: [PATCH 342/400] tipp10: 3.1.0 -> 3.2.0 --- pkgs/applications/misc/tipp10/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 8316fd918ab..4782b90b4a1 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { - owner = "a_a"; + owner = "tipp10"; repo = pname; rev = "v${version}"; - sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1"; + sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; }; nativeBuildInputs = [ cmake qttools ]; From 915d2fa8cb9771287b9198cd09d93489d39b79c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:05:46 +0200 Subject: [PATCH 343/400] uci: unstable-2020-01-27 -> unstable-2020-04-27 --- pkgs/development/libraries/uci/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index e3bdea8c889..aa2a88653bb 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2020-01-27"; + version = "unstable-2020-04-27"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; - sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + rev = "ec8d3233948603485e1b97384113fac9f1bab5d6"; + sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6"; }; hardeningDisable = [ "all" ]; From 67504da51e8333cc855b03b4671c3f0d06fd31c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:08:35 +0200 Subject: [PATCH 344/400] netifd: unstable-2020-01-18 -> unstable-2020-07-11 --- pkgs/tools/networking/netifd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index 38591f38fcf..36d1ec7a423 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2020-01-18"; + version = "unstable-2020-07-11"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; - sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4"; + sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840"; }; buildInputs = [ libnl libubox uci ubus json_c ]; From a9438c28b3634fe7fcacf4d4d7ee55205bacc6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:57:48 +0200 Subject: [PATCH 345/400] jetbrains: update --- .../editors/jetbrains/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7d5a2f79585..bfdf320aeb9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0pqwj4gc23gf10xqciwndimb4ml7djmx8m5rh52c07m77y4aniyn"; /* updated by script */ + sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "07gfqyp6blbf7v8p106ngpq7c5p0llcjahi205yg2jgzkhshn7ld"; /* updated by script */ + sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13qj8n5daz0z0pjizyfsvbbr1gxp5479ar3a68ygi0vrpmbdbssd"; /* updated by script */ + sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2019.2"; + version = "2020.1.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2019.2/MPS-${version}.tar.gz"; - sha256 = "0rph3bibj74ddbyrn0az1npn4san4g1alci8nlq4gaqdlcz6zx22"; + url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; + sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "00c8vlp125j56v9g9d4rc5g4dhgvl1bhi6qrzvpaf6x77jbq4fv4"; /* updated by script */ + sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s04b9w7sydix1sjqzmby63nwcvzs6iw28wz7441kxgryl9qg0qw"; /* updated by script */ + sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1ysj00qbn5ik6i5953b9mln4g456fmn3phdln9m5jmcb0126y235"; /* updated by script */ + sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1zzkd3b5j3q6jqrvibxz33a4fcm7pgqfx91bqjs615v3499ncng7"; /* updated by script */ + sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1ycwml7fyhjajjfy1fhggmx0mcdcjidkxll7357rv2z51r0yhc9h"; /* updated by script */ + sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1szgiccimfk99z9x1k99lgic6ix81fdahf1k3a88rddl8hhncjwv"; /* updated by script */ + sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 7b4e73294f36ab896ee0397e0e13c4b0d90596ba Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sat, 11 Jul 2020 20:37:25 +0200 Subject: [PATCH 346/400] atlassian-confluence: 7.5.1 -> 7.6.0 (#92923) * confluence: 7.5.1 -> 7.5.2 * atlassian-confluence: 7.5.2 -> 7.6.0 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 64ecd981fc4..1460daa95ee 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.5.1"; + version = "7.6.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0lxvff0sn1kxsm599lq72hw11qnwjn2da3mz1h8mqz0rn2adhg07"; + sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz"; }; buildPhase = '' From 3970e7a1c07c0c17e5e6b1ab93b27d7f9e9570af Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Jul 2020 20:55:55 +0200 Subject: [PATCH 347/400] gitea: 1.12.1 -> 1.12.2 https://github.com/go-gitea/gitea/releases/tag/v1.12.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aaae2a4a257..0c60c10fb76 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "0n92msf5pbgb5q6pa2p0nj9lnzs4y0qis62c5mp4hp8rc1j22wlb"; + sha256 = "12zzb1c4cl07ccxaravkmia8vdyw5ffxrlx9v95ampvv6a0swpb9"; }; unpackPhase = '' From 8076db33e9c636c1d0b92fdaafe1a78ba3240149 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 9 Jul 2020 14:39:31 +0200 Subject: [PATCH 348/400] ocrmypdf: 9.8.2 -> 10.2.0 --- pkgs/tools/text/ocrmypdf/default.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 874dc59c7fd..84e0bfb78d1 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.8.2"; + version = "10.2.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0zff9gsbfaf72p8zbjamn6513czpr7papyh1jy0fz1z2a9h7ya0g"; + sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp"; }; nativeBuildInputs = with python3Packages; [ @@ -49,8 +49,10 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cffi chardet + coloredlogs img2pdf pdfminer + pluggy pikepdf pillow reportlab @@ -66,7 +68,7 @@ buildPythonApplication rec { pytestcov pytestrunner python-xmp-toolkit - setuptools + pytestCheckHook ] ++ runtimeDeps; patches = [ @@ -76,25 +78,6 @@ buildPythonApplication rec { }) ]; - # The tests take potentially 20+ minutes, depending on machine - doCheck = false; - - # These tests fail and it might be upstream problem... or packaging. :) - # development is happening on macos and the pinned test versions are - # significantly newer than nixpkgs has. Program still works... - # (to the extent I've used it) -- Kiwi - checkPhase = '' - export HOME=$TMPDIR - pytest -k 'not test_force_ocr_on_pdf_with_no_images \ - and not test_tesseract_crash \ - and not test_tesseract_crash_autorotate \ - and not test_ghostscript_pdfa_failure \ - and not test_gs_render_failure \ - and not test_gs_raster_failure \ - and not test_bad_utf8 \ - and not test_old_unpaper' - ''; - makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; meta = with stdenv.lib; { From df8552e534c6c89074f21c89a79eac709ac701bf Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 21:18:48 +0200 Subject: [PATCH 349/400] home-assistant: Fix dependency restriction --- .../home-assistant/0001-setup.py-relax-dependencies.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index e5718e084a7..7009a036137 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -20,5 +20,6 @@ index 4e46f63217..b1aafee59d 100755 + "requests>=2.23.0", + "ruamel.yaml>=0.15.100", "voluptuous==0.11.7", - "voluptuous-serialize==2.3.0", +- "voluptuous-serialize==2.3.0", ++ "voluptuous-serialize>=2.3.0", ] From 060c1ef6a5771778919a638048aae614c3998823 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 15:27:23 -0400 Subject: [PATCH 350/400] qgroundcontrol: 4.0.8 -> 4.0.9 --- .../science/robotics/qgroundcontrol/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 63247bcff72..ff299cbb0bf 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchgit, SDL2 +{ lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 , qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools , gst_all_1, wayland, pkgconfig @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.8"; + version = "4.0.9"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -58,10 +58,11 @@ mkDerivation rec { ''; # TODO: package mavlink so we can build from a normal source tarball - src = fetchgit { - url = "https://github.com/mavlink/qgroundcontrol.git"; + src = fetchFromGitHub { + owner = "mavlink"; + repo = pname; rev = "v${version}"; - sha256 = "0jr9jpjqdwizsvh9zm0fdp8k2r4536m40dxrn30fbr3ba8vnzkgq"; + sha256 = "0fwibgb9wmxk2zili5vsibi2q6pk1gna21870y5abx4scbvhgq68"; fetchSubmodules = true; }; From 248d460d6f60b157961245ceeb931a5e0f188e4a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 15:28:54 -0400 Subject: [PATCH 351/400] console-bridge: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/console-bridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/development/libraries/console-bridge/default.nix index e02f43fd148..e2370ecce64 100644 --- a/pkgs/development/libraries/console-bridge/default.nix +++ b/pkgs/development/libraries/console-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "console-bridge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ros"; repo = "console_bridge"; rev = version; - sha256 = "14f5i2qgp5clwkm8jjlvv7kxvwx52a607mnbc63x61kx9h6ymxlk"; + sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; }; nativeBuildInputs = [ cmake validatePkgConfig ]; From 18c8866f7740c717b66558649a44c9e40816c38a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 16:06:08 -0400 Subject: [PATCH 352/400] stdenv: correctly make `stdenv.system` refer to the host platform This was supposed to be done in 773233ca771a, but was not due to a small mistake. --- pkgs/stdenv/generic/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e17b41eab32..b5798978690 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -138,8 +138,11 @@ let is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; - # The derivation's `system` is `buildPlatform.system`. - inherit (buildPlatform) system; + # Override `system` so that packages can get the system of the host + # platform through `stdenv.system`. `system` is originally set to the + # build platform within the derivation above so that Nix directs the build + # to correct type of machine. + inherit (hostPlatform) system; inherit (import ./make-derivation.nix { inherit lib config stdenv; From e8fe2e631f2539acdd3dc9753c8bfc416538abde Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 7 Jul 2020 16:02:09 -0700 Subject: [PATCH 353/400] python3Packages.fx2: unstable-2020-01-25 -> 0.9 --- pkgs/development/python-modules/fx2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index acbaf93a4ea..bcc7a4b5c98 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -7,15 +7,15 @@ , crcmod }: -buildPythonPackage { +buildPythonPackage rec { pname = "fx2"; - version = "unstable-2020-01-25"; + version = "0.9"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e"; - sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg"; + rev = version; + sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; nativeBuildInputs = [ sdcc ]; From 3a8c2f71a08e4d964fe5e4040df2b89ef0a9520b Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 7 Jul 2020 16:02:52 -0700 Subject: [PATCH 354/400] python3Packages.glasgow: unstable-2020-02-08 -> unstable-2020-06-29 Includes new analyzer applet. --- pkgs/development/python-modules/glasgow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 6a32364fdf3..8a63f78728e 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -18,15 +18,15 @@ buildPythonPackage rec { pname = "glasgow"; - version = "unstable-2020-02-08"; + version = "unstable-2020-06-29"; # python software/setup.py --version realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498"; - sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m"; + rev = "f885790d7927b893e631c33744622d6ebc18b5e3"; + sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk="; }; nativeBuildInputs = [ setuptools_scm sdcc ]; From 23e259cf7d7bffd8be21687367fcbad1a9b4d8d4 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 11 Jul 2020 13:48:26 +0000 Subject: [PATCH 355/400] nixos/users-groups: fix mkChangedOptionModule for root password hash --- nixos/modules/config/users-groups.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 12d9be94663..7e5f3582ae8 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -430,9 +430,9 @@ in { (mkChangedOptionModule [ "security" "initialRootPassword" ] [ "users" "users" "root" "initialHashedPassword" ] - (cfg: if cfg.security.initialHashedPassword == "!" + (cfg: if cfg.security.initialRootPassword == "!" then null - else cfg.security.initialHashedPassword)) + else cfg.security.initialRootPassword)) ]; ###### interface From 386ebbccf001d8c5bab8681f9a2b936fe099634b Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 12 Jul 2020 07:16:20 +0300 Subject: [PATCH 356/400] pythonPackages.maxminddb: 1.5.2 -> 1.5.4 (#92793) --- pkgs/development/python-modules/maxminddb/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index beddba84fbc..a5ec28f3448 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, lib, fetchPypi +{ stdenv, lib, buildPythonPackage, pythonAtLeast +, fetchPypi +, libmaxminddb , ipaddress , mock , nose @@ -13,10 +15,15 @@ buildPythonPackage rec { sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b"; }; + buildInputs = [ libmaxminddb ]; + propagatedBuildInputs = [ ipaddress ]; checkInputs = [ nose mock ]; + # Tests are broken for macOS on python38 + doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); + meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://www.maxmind.com/en/home"; From d0816b2c0f7cfd9e5f4fb9314b94ebf90fb15068 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:17:21 +0000 Subject: [PATCH 357/400] fluxctl: 1.19.0 -> 1.20.0 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4354d72a5bd..45480e8c30f 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; + sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1"; }; - vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; + vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9"; subPackages = [ "cmd/fluxctl" ]; From 8062c276a85a2340f172710d41ff8ad5eb37e02a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:24:35 +0000 Subject: [PATCH 358/400] font-manager: 0.7.7 -> 0.7.8 --- pkgs/applications/misc/font-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 008e59eebee..b2001c21bf7 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f"; + sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; }; nativeBuildInputs = [ From 4c40111f1d0dfb61d27a4faaf1c6aa74c81cfc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 08:15:02 +0200 Subject: [PATCH 359/400] maturin: 0.8.1 -> 0.8.2 The changelog is not updated, so this has to do: https://github.com/PyO3/maturin/compare/v0.8.1...v0.8.2 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 72b22dba104..9eee570f67e 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "16bxxa261k2l6mpdd55gyzl1mx756i0zbvqp15glpzlcwhb9bm2m"; + sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n"; }; - cargoSha256 = "1s1brfnhwl42jb37qqz4d8mxpyq2ck60jnmjfllkga3mhwm4r8px"; + cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm"; nativeBuildInputs = [ pkgconfig ]; From 55d6b74f20afded296cc6fcfe7e31d10e18a98e1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 12 Jul 2020 07:36:32 +0200 Subject: [PATCH 360/400] bovo: init at 19.12.3 --- pkgs/applications/kde/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 82c653edda4..d6a50acf6e3 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -74,6 +74,7 @@ let akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; + bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; From 2aa2ce332b742f68f8853fd3f14de265df236269 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:38:38 +0000 Subject: [PATCH 361/400] fsmon: 1.7.0 -> 1.8.1 --- pkgs/tools/misc/fsmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index 5e59d34fe4a..668fa463adb 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938"; + sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03"; }; installPhase = '' From 898563323d9425f7a75e925449600dd8e5748d72 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 12 Jul 2020 07:48:18 +0200 Subject: [PATCH 362/400] adding missing expression --- pkgs/applications/kde/bovo.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/applications/kde/bovo.nix diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix new file mode 100644 index 00000000000..4bd3113a051 --- /dev/null +++ b/pkgs/applications/kde/bovo.nix @@ -0,0 +1,28 @@ +{ mkDerivation, lib +, libkdegames, extra-cmake-modules +, kdeclarative, knewstuff +}: + +mkDerivation { + name = "bovo"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.bovo"; + description = "Five in a row application"; + longDescription = '' + Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players, + where the opponents alternate in placing their respective pictogram on the game board. + (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses) + ''; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdeclarative + knewstuff + libkdegames + ]; +} From 2611e96bf3cc798f30b86871718db5855469cda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 15:15:46 +0200 Subject: [PATCH 363/400] python3Packages.pytorch: create separate lib output At some point pytorch.dev was added to expose the libtorch headers and libraries to non-Python users of libtorch. However, this output currently has two disadvantages: 1. An application that compiles against the dev output will also have the libtorch header files in its closure. This is not so nice when e.g. building Docker images of applications that use libtorch. 2. The dev output has a large transitive closure with many dependencies that are not necessary when compiling against libtorch. This change adds the `lib` output so that applications that only link against libtorch libraries have a small closure. Before this change, the libtorch dependency adds 746MiB: % nix path-info -S `realpath result-dev` /nix/store/10rmy81bjk628sfpbj2szxlws6brq1xn-python3.8-pytorch-1.5.1-dev 782203848 With this change it is reduced to 196MiB: % nix path-info -S `realpath result-lib` /nix/store/bck65lf0z7gdhcf89w1zs5nz333lhgwa-python3.8-pytorch-1.5.1-lib 205865056 --- pkgs/development/python-modules/pytorch/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a746d4c7dfb..efe6400fcbd 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -110,7 +110,8 @@ in buildPythonPackage rec { outputs = [ "out" # output standard python package - "dev" # output libtorch only + "dev" # output libtorch headers + "lib" # output libtorch libraries ]; src = fetchFromGitHub { @@ -239,9 +240,11 @@ in buildPythonPackage rec { ]; postInstall = '' mkdir $dev - cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include cp -r $out/${python.sitePackages}/torch/share $dev/share + + mkdir $lib + cp -r $out/${python.sitePackages}/torch/lib $lib/lib ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 880e8452e50732d1eff120df19b46cc32784b30e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 06:44:39 +0000 Subject: [PATCH 364/400] iconpack-jade: 1.22 -> 1.23 --- pkgs/data/icons/iconpack-jade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 1bfa8092a32..619fd0205b5 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x"; + sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m"; }; nativeBuildInputs = [ gtk3 ]; From d5f88bfafa2a3249c143d075ea58abdddb5af674 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 07:17:25 +0000 Subject: [PATCH 365/400] kepubify: 3.1.2 -> 3.1.3 --- pkgs/tools/misc/kepubify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 46d75e5086e..30c648ba124 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; + sha256 = "1fd7w9cmdca6ivppmpn5bkqxmz50xgihrm2pbz6h8jf92i485md0"; }; - vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; + vendorSha256 = "1gzlxdbmrqqnrjx83g65yn7n93w13ci4vr3mpywasxfad866gc24"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 721d304103db3f19aad74ab1663d5be5f6449aa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 07:33:20 +0000 Subject: [PATCH 366/400] leatherman: 1.12.0 -> 1.12.1 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 95226504495..4623e5ca70e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { - sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; + sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From e1867b4e5c8327aafd7a5ce4f1cfc0862c3e62f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 08:36:33 +0000 Subject: [PATCH 367/400] logrotate: 3.16.0 -> 3.17.0 --- pkgs/tools/system/logrotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 3e357d37d83..4c891e3e5b3 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh"; + sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h"; }; # Logrotate wants to access the 'mail' program; to be done. From c0a0552f1018a6fa4cc863a26c293b8c16257c90 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 09:11:50 +0000 Subject: [PATCH 368/400] minikube: 1.11.0 -> 1.12.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index c409bf4712c..b3b3ee1a672 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "minikube"; - version = "1.11.0"; + version = "1.12.0"; # for -ldflags commit = "57e2f55f47effe9ce396cea42a1e0eb4f611ebbd"; - vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv"; + vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0y761svwyrpc4ywdd4vr9hxkg6593wg4wwqzn8n86g0zcz6qg11d"; + sha256 = "0bvdyfx5vjcgnkqd23rpbbhxf1zigpzxlqpay2sb6dpldsj0nhdk"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From 2c774044e2ee37fd7563955ed241a2f2e104c96e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 Jul 2020 04:20:00 -0500 Subject: [PATCH 369/400] minikube: use src.rev as commit --- .../networking/cluster/docker-machine/hyperkit.nix | 4 ++-- pkgs/applications/networking/cluster/docker-machine/kvm2.nix | 4 ++-- pkgs/applications/networking/cluster/minikube/default.nix | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 0c5a716aa8a..83c03671bf7 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,12 +1,12 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256; pname = "docker-machine-hyperkit"; buildPhase = '' - make docker-machine-driver-hyperkit COMMIT=${commit} + make docker-machine-driver-hyperkit COMMIT=${src.rev} ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 60d478fe158..2e2115b4b71 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256; pname = "docker-machine-kvm2"; @@ -10,7 +10,7 @@ buildGoModule rec { ''; buildPhase = '' - make docker-machine-driver-kvm2 COMMIT=${commit} + make docker-machine-driver-kvm2 COMMIT=${src.rev} ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index b3b3ee1a672..fa75098588a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -13,9 +13,6 @@ buildGoModule rec { pname = "minikube"; version = "1.12.0"; - # for -ldflags - commit = "57e2f55f47effe9ce396cea42a1e0eb4f611ebbd"; - vendorSha256 = "0wcm7kw5z7d0ch59nyx5xlv5ci7jrwnzspmsh1yb76318cx2aghi"; src = fetchFromGitHub { @@ -30,7 +27,7 @@ buildGoModule rec { buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; buildPhase = '' - make COMMIT=${commit} + make COMMIT=${src.rev} ''; installPhase = '' From 9e8cc183279c27e58feb2f4ae54425f45ab98a59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 Jul 2020 04:20:00 -0500 Subject: [PATCH 370/400] minikube: install fish completions --- pkgs/applications/networking/cluster/minikube/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index fa75098588a..7e2554330a9 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { export MINIKUBE_WANTUPDATENOTIFICATION=false export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false - for shell in bash zsh; do + for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell installShellCompletion minikube.$shell done From 3b2b3f7c535006f8a6a1c79a2a41601f68ba7e6b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 12 Jul 2020 12:14:16 +0200 Subject: [PATCH 371/400] nixos/systemd: add missing defaults, make options nullable Otherwise evaluation will fail if these are not set. --- nixos/modules/system/boot/systemd.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 020cf38ea3f..01ecf1d0292 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -819,7 +819,8 @@ in }; systemd.watchdog.device = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = "/dev/watchdog"; description = '' The path to a hardware watchdog device which will be managed by systemd. @@ -828,7 +829,8 @@ in }; systemd.watchdog.runtimeTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "30s"; description = '' The amount of time which can elapse before a watchdog hardware device @@ -838,7 +840,8 @@ in }; systemd.watchdog.rebootTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "10m"; description = '' The amount of time which can elapse after a reboot has been triggered @@ -848,7 +851,8 @@ in }; systemd.watchdog.kexecTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "10m"; description = '' The amount of time which can elapse when kexec is being executed before @@ -928,16 +932,16 @@ in DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity - ${optionalString (config.systemd.watchdog.device != "") '' + ${optionalString (config.systemd.watchdog.device != null) '' WatchdogDevice=${config.systemd.watchdog.device} ''} - ${optionalString (config.systemd.watchdog.runtimeTime != "") '' + ${optionalString (config.systemd.watchdog.runtimeTime != null) '' RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime} ''} - ${optionalString (config.systemd.watchdog.rebootTime != "") '' + ${optionalString (config.systemd.watchdog.rebootTime != null) '' RebootWatchdogSec=${config.systemd.watchdog.rebootTime} ''} - ${optionalString (config.systemd.watchdog.kexecTime != "") '' + ${optionalString (config.systemd.watchdog.kexecTime != null) '' KExecWatchdogSec=${config.systemd.watchdog.kexecTime} ''} From eeab7d4a2f49a34507f7f4e4aaaffc472dcb380c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 04:08:51 -0700 Subject: [PATCH 372/400] vaapiIntel: 2.4.0 -> 2.4.1 (#89983) --- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index c61429324ed..44b92fc8fa4 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-vaapi-driver"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; rev = version; - sha256 = "019w0hvjc9l85yqhy01z2bvvljq208nkb43ai2v377l02krgcrbl"; + sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; patchPhase = '' From 359f2345c03819fc3085103da940511b0b0bad8b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Jul 2020 14:21:08 +0300 Subject: [PATCH 373/400] hplip: Remove all python related gcc references Use in stripDebugList python sitePackages directory used by the build, and don't hard code python3.7's sitePackages path. --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 98ced28b877..afd1f8f6fe4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -230,7 +230,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" ]; meta = with stdenv.lib; { From fc2a4610a190e951f243215cfa50f60e4d0d275e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 12 Jul 2020 14:29:18 +0200 Subject: [PATCH 374/400] vaapiIntel: Refactor and improve the build expression (#92996) This doesn't cause any changes to the contents of the output path (apart from the $out reference changing due to the modified expression). --- .../libraries/vaapi-intel/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 44b92fc8fa4..81edb9caea0 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 +{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid }: @@ -14,25 +14,19 @@ stdenv.mkDerivation rec { sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; - patchPhase = '' - patchShebangs ./src/shaders/gpp.py - ''; - - preConfigure = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; + # Set the correct install path: + LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; postInstall = stdenv.lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ ''; configureFlags = [ - "--enable-drm" "--enable-x11" "--enable-wayland" ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; - nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; @@ -42,8 +36,18 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; - description = "Intel driver for the VAAPI library"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + description = "VA-API user mode driver for Intel GEN Graphics family"; + longDescription = '' + This VA-API video driver backend provides a bridge to the GEN GPUs through + the packaging of buffers and commands to be sent to the i915 driver for + exercising both hardware and shader functionality for video decode, + encode, and processing. + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library and driver-specific acceleration + backends for each supported hardware vendor. + ''; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ primeos ]; }; } From 42b7f16c149dc78670e4bf921e0a6e2c6906ee1c Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Sun, 12 Jul 2020 16:21:46 +0200 Subject: [PATCH 375/400] wofi: Package manpages --- pkgs/applications/misc/wofi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 37b991e6d47..d466384e66c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }: +{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; # Fixes icon bug on NixOS. @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { }) ]; + postInstall = '' + installManPage man/wofi* + ''; + meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; From 0b5bc84571ba8162cc30885d089bc1a5856025bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 14:25:54 +0000 Subject: [PATCH 376/400] traefik: 2.2.1 -> 2.2.4 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index db310061927..7b21ed5951c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.1"; + version = "2.2.4"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; + sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2"; }; - vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; + vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; From 6d46aee695f5f2ac00ae0b9f45597b67f3c25860 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 12 Jul 2020 18:07:08 +0200 Subject: [PATCH 377/400] mutt: 1.14.5 -> 1.14.6 Sorry that the update took so long this time, I had a party-weekend when the release came out. Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index a6acea9d1cb..ec4778cd4ab 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.5"; + version = "1.14.6"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri"; + sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; }; patches = optional smimeSupport (fetchpatch { From bab982e5ec42ad2900d6981148dc780bc0525109 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 7 Jun 2020 20:51:16 +0200 Subject: [PATCH 378/400] gns3-{gui,server}: 2.2.8 -> 2.2.9 Note: This update is pretty delayed as it was initially blocked by sentry-sdk being too old and breaking Python changes from staging. --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/gui.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6cfc5ed3a99..6b289b7cdb6 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.8"; + stableVersion = "2.2.9"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -25,8 +25,8 @@ let }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; - serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; + guiSrcHash = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd"; + serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index bc5f78d104f..adc31463b02 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -23,7 +23,7 @@ in python.pkgs.buildPythonPackage rec { }; propagatedBuildInputs = with python.pkgs; [ - raven psutil jsonschema # tox for check + sentry-sdk psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools pkgs.qt5Full diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 26553b9aed2..55d6a7626c5 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles + jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles prompt_toolkit py-cpuinfo ]; From 99ab9545b294de6be2fd7ee9efef91de738c81b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 12 Jul 2020 19:16:40 +0200 Subject: [PATCH 379/400] gns3-{gui,server}: 2.2.9 -> 2.2.11 --- pkgs/applications/networking/gns3/default.nix | 13 +++++++------ pkgs/applications/networking/gns3/gui.nix | 2 -- pkgs/applications/networking/gns3/server.nix | 17 +++++++++++++---- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6b289b7cdb6..d8125e21d1b 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.9"; + stableVersion = "2.2.11"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -15,18 +15,19 @@ let src = oldAttrs.src.override { inherit version sha256; }; - doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.6" - "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + (mkOverride "psutil" "5.7.0" + "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd"; - serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n"; + guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn"; + serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index adc31463b02..7cdc74dfd48 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -4,8 +4,6 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; python = python3.override { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 55d6a7626c5..1ee204b0691 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,10 +4,19 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") - (mkOverride "aiofiles" "0.4.0" - "1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2") + (mkOverride "aiofiles" "0.5.0" + "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec { + version = "6.0.0"; + src = fetchFromGitHub { + owner = "workhorsy"; + repo = "py-cpuinfo"; + rev = "v${version}"; + sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5"; + }; + }); + }) ]; python = python3.override { From 3518436b9291b9233fe7ca1ec1453a59a69152e2 Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Sat, 11 Jul 2020 23:39:52 +0200 Subject: [PATCH 380/400] bpm-tools: Specify dependencies and wrap executables --- pkgs/tools/audio/bpm-tools/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index 035fbf09533..6207cbeb9fe 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -1,8 +1,17 @@ { stdenv, fetchurl, + gnuplot, + sox, + flac, + id3v2, + vorbis-tools, + makeWrapper }: +let + path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; +in stdenv.mkDerivation rec { pname = "bpm-tools"; version = "0.3"; @@ -12,15 +21,17 @@ stdenv.mkDerivation rec { sha256 = "151vfbs8h3cibs7kbdps5pqrsxhpjv16y2iyfqbxzsclylgfivrp"; }; - patchPhase = '' - patchShebangs bpm-tag - patchShebangs bpm-graph - ''; + nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; + postFixup = '' + wrapProgram $out/bin/bpm-tag --prefix PATH : "${path}" + wrapProgram $out/bin/bpm-graph --prefix PATH : "${path}" + ''; + meta = with stdenv.lib; { homepage = "http://www.pogo.org.uk/~mark/bpm-tools/"; description = "Automatically calculate BPM (tempo) of music files"; From 6c70cee85a263f654ccf86850e959db07a5f450e Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 12 Jul 2020 11:50:04 -0600 Subject: [PATCH 381/400] lazygit: 0.20.5 -> 0.20.6 new version released with some improvements and a couple fixes: https://github.com/jesseduffield/lazygit/releases/tag/v0.20.6 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 097858fa6f2..9d37dcfd5d2 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.5"; + version = "0.20.6"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0968aww43gvc4wx2nyjyavclyspls7rbdlpzq6k5z7pgf4mgganw"; + sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i"; }; meta = with stdenv.lib; { From 9efcb767dac243702aca7be58bae3f0e49b8700e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Jan 2020 23:50:40 +0100 Subject: [PATCH 382/400] webtorrent_desktop: 0.20.0 -> 0.21.0 Fix build This reverts commit c255b0fa45adfde495931fae3d44515fae11c715. --- .../video/webtorrent_desktop/default.nix | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 24c17daa759..ef50dad86bc 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,14 +1,16 @@ { - alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, - gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, + gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, - libxcb, nspr, nss, stdenv, udev + libxcb, nspr, nss, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core }: let rpath = stdenv.lib.makeLibraryPath ([ alsaLib atk + at-spi2-core + at-spi2-atk cairo cups dbus @@ -17,9 +19,9 @@ freetype gdk-pixbuf glib - gnome2.GConf - gnome2.gtk - gnome2.pango + gnome3.gtk + pango + libuuid libX11 libXScrnSaver libXcomposite @@ -39,29 +41,33 @@ ]); in stdenv.mkDerivation rec { pname = "webtorrent-desktop"; - version = "0.20.0"; + version = "0.21.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb"; - sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k"; + fetchzip { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip"; + sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852"; } else throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; + desktopFile = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop"; + sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca"; + }; + icon256File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png"; + sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk"; + }; + icon48File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; + sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; + }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out - cp -R opt $out - - mv ./usr/share $out/share - mv $out/opt/webtorrent-desktop $out/libexec - chmod +x $out/libexec/WebTorrent - rmdir $out/opt - - chmod -R g-w $out + mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps} + cp -R . $out/libexec # Patch WebTorrent patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -71,9 +77,11 @@ mkdir -p $out/bin ln -s $out/libexec/WebTorrent $out/bin/WebTorrent - # Fix the desktop link - substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ - --replace /opt/webtorrent-desktop $out/bin + cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png + cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png + ## Fix the desktop link + substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop $out/libexec ''; meta = with stdenv.lib; { From 97da56664c865e70437fda65496363b3caac3e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 10 Jul 2020 23:49:47 +0200 Subject: [PATCH 383/400] chiaki: 1.1.3 -> 1.2.1 --- pkgs/games/chiaki/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index ac228118444..be4ec7b73b4 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,23 +1,23 @@ { lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg_3, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf , python3Packages, SDL2 }: mkDerivation rec { pname = "chiaki"; - version = "1.1.3"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "thestr4ng3r"; repo = "chiaki"; fetchSubmodules = true; - sha256 = "12cb4wpibh077san9rpsmavihf0xy9iqc9zl7y0aagrkl50h19kr"; + sha256 = "00lzsbjd1w1bhlblgf7zp112sk8ac09c3bzi5ljxbn02mi0an3qp"; }; nativeBuildInputs = [ cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf ]; - buildInputs = [ ffmpeg_3 libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; From 34f096d0126aec902c96aec73696e6ea1a6b471b Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 12 Jul 2020 14:09:11 -0400 Subject: [PATCH 384/400] diskonaut: 0.3.0 -> 0.9.0 remove special handling for checkPhase Diskonaut now measures file sizes consistently and tests can be run without modification discussion: https://github.com/imsnif/diskonaut/issues/50 implementation: https://github.com/imsnif/diskonaut/pull/66 --- pkgs/tools/misc/diskonaut/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index b0a413da8c0..dd9490b4267 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diskonaut"; - version = "0.3.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "imsnif"; repo = "diskonaut"; rev = version; - sha256 = "0vnmch2cac0j9b44vlcpqnayqhfdfdwvfa01bn7lwcyrcln5cd0z"; + sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; }; - cargoSha256 = "03hqdg6pnfxnhwk0xwhwmbrk4dicjpjllbbai56a3391xac5wmi6"; - - # some tests fail due to non-portable (in terms of filesystems) measurements of block sizes - # try to re-enable tests once actual-file-size is added - # see https://github.com/imsnif/diskonaut/issues/50 for more info - doCheck = false; + cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; meta = with stdenv.lib; { description = "Terminal disk space navigator"; From 16921381a8afe7206ff0f5f720417db0b49c0dfe Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 12 Jul 2020 23:11:09 +0200 Subject: [PATCH 385/400] bovo: export in all-packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97114ad14f1..e2a08e32f4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20671,7 +20671,7 @@ in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b + akonadi akregator ark bovo dolphin dragon elisa ffmpegthumbs filelight gwenview k3b kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; From d6c63c7bcda71473b4c0103095f9b883c49d2f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 12 Jul 2020 23:34:36 +0200 Subject: [PATCH 386/400] minecraft: 2.1.15166 -> 2.1.15852 --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 8770ec08b22..ac09b5078af 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.15166"; + version = "2.1.15852"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "14q41zk370zvzz2jbynhfw11r98l9x49142lqf2izfl42fhv8yhw"; + sha256 = "06k3npsk878dh93r7fws5r438hwll3x3kxi0zslb10z634marn2x"; }; icon = fetchurl { From 45325b1d24f4f91df5181881093af3c7412c7488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 13 Jul 2020 02:16:43 +0200 Subject: [PATCH 387/400] install-grub.pl: Fix GRUB always reinstalling. (#92756) See https://github.com/NixOS/nixpkgs/pull/92520#issuecomment-655157990. In #85895 I accidentally introduced a comparison between an array reference and an array, which can never be true. Fixed by dereferencing. --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 9af799184b6..5d7f58e7c73 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -652,7 +652,7 @@ my @deviceTargets = getList('devices'); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/,/, $prevGrubState->devices; my @extraGrubInstallArgs = getList('extraGrubInstallArgs'); -my @prevExtraGrubInstallArgs = $prevGrubState->extraGrubInstallArgs; +my @prevExtraGrubInstallArgs = @{$prevGrubState->extraGrubInstallArgs}; my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference()); my $extraGrubInstallArgsDiffer = scalar (List::Compare->new( '-u', '-a', \@extraGrubInstallArgs, \@prevExtraGrubInstallArgs)->get_symmetric_difference()); From 2de809d3276e3a5e873bbb2b39ff238325125ac8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 08:51:39 +0000 Subject: [PATCH 388/400] gnome3.gnome-taquin: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index fb609bbb978..99bdffe16ad 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4"; + sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0"; }; passthru = { From 0260f04fe257f56b7221dccc427dc104de1e6d77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 09:21:01 +0000 Subject: [PATCH 389/400] gnome3.gnome-initial-setup: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index ff7463b940e..ff7b1f45e45 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq"; + sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s"; }; nativeBuildInputs = [ From 1e4290b78c055b3de85e4ad6e73bc147f12e4dd3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 11 Jul 2020 18:56:26 -0400 Subject: [PATCH 390/400] python2Packages.numpy: fix build on darwin By applying the old patch (compatible with 1.18.x and older). Also refactor expression to make presence of the "old" version more explicit. --- .../development/python-modules/numpy/1.16.nix | 94 +++++++++++++++++++ .../numpy/numpy-distutils-C++_1.16.patch | 30 ++++++ pkgs/top-level/python-packages.nix | 15 +-- 3 files changed, 129 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/numpy/1.16.nix create mode 100644 pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix new file mode 100644 index 00000000000..af419c5e0a4 --- /dev/null +++ b/pkgs/development/python-modules/numpy/1.16.nix @@ -0,0 +1,94 @@ +{ lib +, fetchPypi +, python +, buildPythonPackage +, gfortran +, pytest +, blas +, lapack +, writeTextFile +, isPyPy +, cython +, setuptoolsBuildHook + }: + +assert (!blas.isILP64) && (!lapack.isILP64); + +let + cfg = writeTextFile { + name = "site.cfg"; + text = (lib.generators.toINI {} { + ${blas.implementation} = { + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + libraries = "lapack,lapacke,blas,cblas"; + }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + }; + }); + }; +in buildPythonPackage rec { + pname = "numpy"; + version = "1.16.5"; + format = "pyproject.toml"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; + }; + + nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; + buildInputs = [ blas lapack ]; + + patches = lib.optionals python.hasDistutilsCxxPatch [ + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ./numpy-distutils-C++_1.16.patch + ]; + + preConfigure = '' + sed -i 's/-faltivec//' numpy/distutils/system_info.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + + preBuild = '' + ln -s ${cfg} site.cfg + ''; + + enableParallelBuilding = true; + + doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + # just for backwards compatibility + blas = blas.provider; + blasImplementation = blas.implementation; + inherit cfg; + }; + + # Disable test + # - test_large_file_support: takes a long time and can cause the machine to run out of disk space + NOSE_EXCLUDE="test_large_file_support"; + + meta = { + description = "Scientific tools for Python"; + homepage = "https://numpy.org/"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch new file mode 100644 index 00000000000..b2626ea26e5 --- /dev/null +++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch @@ -0,0 +1,30 @@ +diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py +--- a/numpy/distutils/unixccompiler.py ++++ b/numpy/distutils/unixccompiler.py +@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + if opt not in llink_s: + self.linker_so = llink_s.split() + opt.split() + +- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) +- + # gcc style automatic dependencies, outputs a makefile (-MF) that lists + # all headers needed by a c file as a side effect of compilation (-MMD) + if getattr(self, '_auto_depends', False): +@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + deps = [] + + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + +- extra_postargs, display = display) ++ if self.detect_language(src) == 'c++': ++ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ else: ++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ + except DistutilsExecError: + msg = str(get_exception()) + raise CompileError(msg) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b492fe28cfa..63045ee8c0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4926,16 +4926,11 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; - numpy = let - numpy_ = callPackage ../development/python-modules/numpy { }; - numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { - version = "1.16.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; - }; - }); - in if pythonOlder "3.5" then numpy_2 else numpy_; + numpy = + if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; numpydoc = callPackage ../development/python-modules/numpydoc { }; From 215011c44d57d5978f9a2720b99686baacfc794d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Jul 2020 07:11:49 +0000 Subject: [PATCH 391/400] gromacs: 2020.2 -> 2020.3 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d345827ed4e..151abb099f5 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.2"; + name = "gromacs-2020.3"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz"; - sha256 = "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz"; + sha256 = "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch"; }; nativeBuildInputs = [ cmake ]; From 7e858f9a47d413ea473139f43bd23ba2bd1d4639 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Jul 2020 05:15:56 +0000 Subject: [PATCH 392/400] gnome-podcasts: 0.4.7 -> 0.4.8 --- pkgs/applications/audio/gnome-podcasts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index d5bec0c09e5..c7df55118c7 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -20,7 +20,7 @@ }: rustPlatform.buildRustPackage rec { - version = "0.4.7"; + version = "0.4.8"; pname = "gnome-podcasts"; src = fetchFromGitLab { @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage rec { owner = "World"; repo = "podcasts"; rev = version; - sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; + sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; }; - cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; + cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q"; nativeBuildInputs = [ meson From ec427c3e66b8fbec4942a2e092fe576e0202e892 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 13 Jul 2020 10:42:27 +0200 Subject: [PATCH 393/400] wtf: 0.30.0 -> 0.31.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index aeece53e779..8bc0a31b91f 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "11vy39zygk1gxb1nc1zmxlgs6fn7yq68090fwm2jar0lsxx8a83i"; + sha256 = "07ngk83p753w9qxm8bvw6n5vk0zldn14yv08d900sxny8cg2h0rb"; }; - vendorSha256 = "0qfb352gmsmy5glrsjwc3w57di5k2kjdsyfqn4xf7p4v12yg88va"; + vendorSha256 = "09iy148pnbdrzjj2j50lbd8s9mkv7vggrx77mj88p1gnqclz3lip"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 8aa6716621d6e93add91fc84254ab57c1823de91 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 13 Jul 2020 10:48:20 +0200 Subject: [PATCH 394/400] gitAndTools.delta: 0.2.0 -> 0.3.0 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 0cc184e2cfe..2d103f62745 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "15c7rsmiinnpxh12520jz3wr0j86vgzjq1ss5pf30fa7lcgicb32"; + sha256 = "0y3gkan5v0d6637yf5p5a9dklyv5zngw7a8pyqzj4ixys72ixg20"; }; - cargoSha256 = "0lzz32qh80s4dxr0d4pg0qagkn549lr4vbqknl2l0cmlq1bvvq6g"; + cargoSha256 = "15sh2lsc16nf9w7sp3avy77f4vyj0rdsm6m1bn60y8gmv2r16v6i"; nativeBuildInputs = [ installShellFiles ]; From 49897b8859bdbdd3275a038adef49dc2275b29bb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 13 Jul 2020 04:20:00 -0500 Subject: [PATCH 395/400] SDL2: fix build on darwin --- pkgs/development/libraries/SDL2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 40fe1c42d7a..31624bee2fb 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkgconfig ]; - nativeBuildInputs = [ pkgconfig wayland ]; + nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; From e6e8d495978282ff22be4bcfdd728cb7324dad09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 13 Jul 2020 14:51:36 +0200 Subject: [PATCH 396/400] gscan2pdf: 2.8.0 -> 2.8.1 --- pkgs/applications/graphics/gscan2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 118faee1df4..2906026c48f 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0rqx41hkppil3lp1dhkxwlhv0kwp8w8fkgzlapryq1yd9pgkx6lw"; + sha256 = "00g2vw7lz3yb4nq358x8d3r4mf3hkrq2vw1g9lli27zdp5p6jja1"; }; nativeBuildInputs = [ wrapGAppsHook ]; From 68a15c260a1de928403a0ae363b5c0a5f2b2a958 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Thu, 9 Jul 2020 16:27:23 +0200 Subject: [PATCH 397/400] oneshot: init at 1.1.0 --- pkgs/tools/networking/oneshot/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/oneshot/default.nix diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix new file mode 100644 index 00000000000..fb7fe48c08a --- /dev/null +++ b/pkgs/tools/networking/oneshot/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "oneshot"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "raphaelreyna"; + repo = "oneshot"; + rev = "v${version}"; + sha256 = "1gcxwamchznkzg3m0gfig7733z2w035lxxj6h18gc6zzcnf6p57w"; + }; + + goPackagePath = "github.com/raphaelreyna/oneshot"; + vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "A first-come-first-serve single-fire HTTP server"; + homepage = "https://github.com/raphaelreyna/oneshot"; + license = licenses.mit; + maintainers = with maintainers; [ edibopp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb8d0c45ed..fd23def4432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2157,6 +2157,8 @@ in onboard = callPackage ../applications/misc/onboard { }; + oneshot = callPackage ../tools/networking/oneshot { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; xkbd = callPackage ../applications/misc/xkbd { }; From eb41ed2fad3b55938ca6f1bb6cb54baccd454ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 13 Jul 2020 15:03:47 +0200 Subject: [PATCH 398/400] diffoscope: 150 -> 151 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 784d7494b9b..3c1a98a46d2 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "150"; + version = "151"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "0hsjhcaka4nxbwyyk2gajblsp648km9492aq4100drsgnj5d36hg"; + sha256 = "180sfk0jfajkn3w3d4bw8ai25wh1bj7ca05lpsxxj7k472w6fsg9"; }; outputs = [ "out" "man" ]; From 6206029f69376d5a61cd205cfe6e886303098b0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Jul 2020 10:19:00 -0400 Subject: [PATCH 399/400] linux: 5.8-rc4 -> 5.8-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 28cafbcc8a1..d4c249b1d43 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc4"; + version = "5.8-rc5"; extraMeta.branch = "5.8"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "16hby58g3h527nrl7gpx8x3zg7s92cwz7p6y15jxnmbv3igdcyib"; + sha256 = "11g4hd3m7wjwrxhgpd0hwad07svi62hj699jdm30f7r12py5kgb9"; }; # Should the testing kernels ever be built on Hydra? From 8958237f388d8d7acebcffb63583dcaffa40c57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 13 Jul 2020 12:22:23 +0200 Subject: [PATCH 400/400] gtk-sharp3: fixed build and removed broken flag. --- pkgs/development/libraries/gtk-sharp/3.0.nix | 32 ++++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index f8f1f20cc2f..49405c655e1 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, mono , glib , pango , gtk3 @@ -14,29 +18,32 @@ , monoDLLFixer }: -stdenv.mkDerivation { - name = "gtk-sharp-2.99.3"; +stdenv.mkDerivation rec { + pname = "gtk-sharp"; + version = "2.99.3"; builder = ./builder.sh; src = fetchurl { - #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; - url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - # patch bad usage of glib, which wasn't tolerated anymore - # prePatch = '' - # for f in glib/glue/{thread,list,slist}.c; do - # sed -i 's,#include ,#include ,g' "$f" - # done - # ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + patches = [ + # Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling against newer versions of mono. + # @see https://github.com/mono/gtk-sharp/pull/266 + (fetchpatch { + name = "MONO_PROFILE_ENTER_LEAVE.patch"; + url = "https://github.com/mono/gtk-sharp/commit/401df51bc461de93c1a78b6a7a0d5adc63cf186c.patch"; + sha256 = "0hrkcr5a7wkixnyp60v4d6j3arsb63h54rd30lc5ajfjb3p92kcf"; + }) + ]; + dontStrip = true; inherit monoDLLFixer; @@ -47,6 +54,5 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-09-21, build has failed since 2018-04-28 }; }