From c56dd53092ab5774e81de0f478812203dd2e113b Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 11 Jul 2018 20:40:16 +0300 Subject: [PATCH 01/49] mesa, mesa-darwin: free up floating point textures (patents expired) https://cgit.freedesktop.org/mesa/mesa/commit/?id=66673bef941af344314fe9c91cad8cd330b245eb https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed --- pkgs/development/libraries/mesa-darwin/default.nix | 6 ++++++ pkgs/development/libraries/mesa/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index f18c1e693cbc..2bfdb679156c 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -50,6 +50,12 @@ let configurePhase = ":"; + configureFlags = [ + # NOTE: Patents expired on June 17 2018. + # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed + "texture-float" + ]; + makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480afcf607a6..2dfa6275a415 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,9 +6,6 @@ , libglvnd , grsecEnabled ? false , enableRadv ? true -# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. -# It's overridden for mesa_drivers. -, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -115,7 +112,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add4e0f4e235..cb15b0d9f34c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,7 +10962,6 @@ with pkgs; mesa_drivers = let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - enableTextureFloats = true; }; in mo.drivers; From 8f101cce83fe5357814268e4ab6337262ec6730c Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 00:22:57 +0300 Subject: [PATCH 02/49] rm maintainer eduarrrd from packages, no activity > year --- pkgs/applications/audio/pianobar/default.nix | 1 - pkgs/applications/graphics/photoqt/default.nix | 1 - pkgs/applications/misc/dfilemanager/default.nix | 1 - pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/servers/http/pshs/default.nix | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e21815574d1e..1518ed9b7942 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 01affbbbd94c..7571bb29bec9 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 6cbdc8ece0ca..eeb7a8ccf526 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation { description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2dfa6275a415..93354dc9a71f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -268,7 +268,7 @@ let self = stdenv.mkDerivation { homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.linux; - maintainers = with maintainers; [ eduarrrd vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; }; in self diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index a0a1addeeebf..2205c91789f5 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = https://github.com/mgorny/pshs; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; platforms = stdenv.lib.platforms.linux; }; } From 4c77fdef4ada69da7ae09b867ee8e98c575cc8ee Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 00:39:47 +0300 Subject: [PATCH 03/49] mesa_drivers: reduced to alias of mesa_noglu --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb15b0d9f34c..a1d9799ad451 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10959,11 +10959,12 @@ with pkgs; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa_drivers = - let mo = mesa_noglu.override { - grsecEnabled = config.grsecurity or false; - }; - in mo.drivers; + + # NOTE: 2018-07-12: legacy alias: + # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, + # so package reduced to alias + mesa_drivers = mesa_noglu; ## End libGL/libGLU/Mesa stuff From 7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 12:34:45 +0300 Subject: [PATCH 04/49] mesa: cleanup: rm defunct glx-rts & sysfs flags, grsec/PaX patch Config log: ``` configure: WARNING: unrecognized options: --disable-glx-rts, --enable-sysfs ``` --- pkgs/development/libraries/mesa/default.nix | 4 --- .../libraries/mesa/glx_ro_text_segm.patch | 25 ------------------- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/glx_ro_text_segm.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 93354dc9a71f..ab2aa0ce3ae8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,7 +4,6 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd -, grsecEnabled ? false , enableRadv ? true , galliumDrivers ? null , driDrivers ? null @@ -87,7 +86,6 @@ let self = stdenv.mkDerivation { # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; @@ -112,7 +110,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine "--enable-libglvnd" @@ -131,7 +128,6 @@ let self = stdenv.mkDerivation { "--enable-xvmc" "--enable-vdpau" "--enable-shared-glapi" - "--enable-sysfs" "--enable-llvm-shared-libs" "--enable-omx-bellagio" "--enable-va" diff --git a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch b/pkgs/development/libraries/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 95f01ba9e52c..000000000000 --- a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5068913..3d4271e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -429,6 +429,20 @@ AC_SUBST([GLESv2_LIB_GLOB]) - AC_SUBST([VG_LIB_GLOB]) - AC_SUBST([GLAPI_LIB_GLOB]) - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl Arch/platform-specific settings - dnl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d9799ad451..ae3c4dc5ba76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10952,9 +10952,6 @@ with pkgs; libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; mesa_noglu = callPackage ../development/libraries/mesa { - # makes it slower, but during runtime we link against just mesa_drivers - # through /run/opengl-driver*, which is overriden according to config.grsecurity - # grsecEnabled = true; # no more support in nixpkgs ATM llvmPackages = llvmPackages_6; }; From 456d3e3192e0b87fdf4337628715f1f7f4e70f82 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 17 Jul 2018 23:24:24 +0000 Subject: [PATCH 05/49] glib: use tested version when `doCheckByDefault` is set This changes the way how the `glib` dependecy cycles are broken to make the tested `glib` the default. `glib-tested` is no longer needed as packages now use the checked version when `doCheckByDefault` is set, since it was not used anywhere, I removed it. --- pkgs/development/libraries/glib/default.nix | 15 +++++++++------ pkgs/top-level/all-packages.nix | 16 ++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8a07a9f9f227..428b9ee482ec 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,9 +3,10 @@ # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null -# this is just for tests (not in closure of any regular package) -, coreutils, dbus, libxml2, tzdata, desktop-file-utils -, shared-mime-info, doCheck ? false +# this is just for tests (not in the closure of any regular package) +, doCheck ? stdenv.config.doCheckByDefault or false +, coreutils, dbus, libxml2, tzdata +, desktop-file-utils, shared-mime-info }: with stdenv.lib; @@ -66,8 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ libelf setupHook pcre ] - ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount nativeBuildInputs = [ pkgconfig perl python gettext ]; @@ -114,7 +114,8 @@ stdenv.mkDerivation rec { -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c ''; - inherit doCheck; + checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" @@ -139,6 +140,8 @@ stdenv.mkDerivation rec { sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; + inherit doCheck; + passthru = { gioModuleDir = "lib/gio/modules"; inherit flattenInclude; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add4e0f4e235..04d5f55fd5b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9521,12 +9521,16 @@ with pkgs; gtkmathview = callPackage ../development/libraries/gtkmathview { }; - glib = callPackage ../development/libraries/glib { - }; - glib-tested = glib.override { # checked version separate to break cycles - doCheck = true; - libffi = libffi.override { doCheck = true; }; - }; + glib = callPackage ../development/libraries/glib (let + glib-untested = glib.override { doCheck = false; }; + in { + # break dependency cycles + # these things are only used for tests, they don't get into the closure + shared-mime-info = shared-mime-info.override { glib = glib-untested; }; + desktop-file-utils = desktop-file-utils.override { glib = glib-untested; }; + dbus = dbus.override { systemd = null; }; + }); + glibmm = callPackage ../development/libraries/glibmm { }; glib-networking = callPackage ../development/libraries/glib-networking {}; From 47e81e9c9f9432f64775066667da850ea48c2cda Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:24:38 +0000 Subject: [PATCH 06/49] [cpan2nix] perlPackages.CPANPerlReleases: 3.68 -> 3.70 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcc17cd71242..319d1172eeba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2838,10 +2838,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.68"; + name = "CPAN-Perl-Releases-3.70"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "00d97zlg0npa8sr9d8lzj2zqwx7vkq6cypccdm2g669ls5h82shs"; + sha256 = "1yv9gq3rzhccskmpd9nn2n8v8zc6r9rlq5x47l0yva29yfgqb16r"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From aa9872a9dd79a953cfb34d9662583c5bbbbf2246 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:25:09 +0000 Subject: [PATCH 07/49] [cpan2nix] perlPackages.ExporterTiny: 1.000000 -> 1.002001 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 319d1172eeba..867768e7bdb7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5341,10 +5341,10 @@ let self = _self // overrides; _self = with self; { }; ExporterTiny = buildPerlPackage { - name = "Exporter-Tiny-1.000000"; + name = "Exporter-Tiny-1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz; - sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz; + sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; From 1e899945b54bb12c67627acaaabe06455e67114b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:25:44 +0000 Subject: [PATCH 08/49] [cpan2nix] perlPackages.LogAny: 1.705 -> 1.706 --- 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 867768e7bdb7..a17ffad559b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8689,10 +8689,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.705"; + name = "Log-Any-1.706"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "85c7c5189a8bfc2ffb6f879b4cd04dd77f94bc5abc3800b4330f42f43fb9a696"; + sha256 = "3ed0e5a4b7d490ab00624b7f905421239261f1dc976192aad2c0d1509bec08be"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; From 4728a85c64602abd32f62a8652eed3bbd746940d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:25:51 +0000 Subject: [PATCH 09/49] [cpan2nix] perlPackages.ModuleCoreList: 5.20180626 -> 5.20180720 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a17ffad559b1..8b2eaaef06a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9634,10 +9634,10 @@ let self = _self // overrides; _self = with self; { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180626"; + name = "Module-CoreList-5.20180720"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180626.tar.gz; - sha256 = "1x9r0s4rlqziccb05p4k3aljx242ssx1abw5yl5ixn2c0g9ykll1"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180720.tar.gz; + sha256 = "0l6dyj4m4qgv2yzq3pp0bkvg1j9nh9mcm1p4x3g3j93gkba7whws"; }; meta = { homepage = http://dev.perl.org/; From 857bffceae09522132343044625ab475fd9c6818 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:25:54 +0000 Subject: [PATCH 10/49] [cpan2nix] perlPackages.Mojolicious: 7.87 -> 7.88 --- 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 8b2eaaef06a1..07fc979c71c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9936,10 +9936,10 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.87"; + name = "Mojolicious-7.88"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "898a24a4344eaafe97cf0b8da2fbc89e0e21cc328f5e5a39a44774f8144989b1"; + sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; }; meta = { homepage = https://mojolicious.org/; From 6493e21920c654a9f3d78419e05de16bc0aa89f2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:26:05 +0000 Subject: [PATCH 11/49] [cpan2nix] perlPackages.Parent: 0.236 -> 0.237 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07fc979c71c5..61ec4ce15c15 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11781,10 +11781,10 @@ let self = _self // overrides; _self = with self; { }; Parent = buildPerlPackage { - name = "parent-0.236"; + name = "parent-0.237"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.236.tar.gz; - sha256 = "0yhjps1fprifhvzdwwl09bp1ngyqx85rvyn96j34papn0jypx0rd"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz; + sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; }; }; From 0d5c3e9fc1b34bc0bdbccf03e5eedf817f552f03 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:26:06 +0000 Subject: [PATCH 12/49] [cpan2nix] perlPackages.PathTiny: 0.104 -> 0.106 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61ec4ce15c15..a3725857d77d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11874,10 +11874,10 @@ let self = _self // overrides; _self = with self; { }; PathTiny = buildPerlPackage { - name = "Path-Tiny-0.104"; + name = "Path-Tiny-0.106"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; - sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.106.tar.gz; + sha256 = "308e39087b626013569a15783b896d61916fd1e67d06017f40cff567af36464d"; }; meta = { description = "File path utility"; From 4f77d68e207aaa39c9209829f6e74f695315355d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:26:42 +0000 Subject: [PATCH 13/49] [cpan2nix] perlPackages.TestSimple13: 1.302136 -> 1.302138 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a3725857d77d..1711db16af45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15664,10 +15664,10 @@ let self = _self // overrides; _self = with self; { }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302136"; + name = "Test-Simple-1.302138"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302136.tar.gz; - sha256 = "8d9a5c53b0309257af58b55177045f7d94e095e1c1416cb1e11aae4c1cdad446"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz; + sha256 = "568615a551075d3657cb0cbca55cf3672734c954f0306e9823ecd002aa911655"; }; meta = { description = "Basic utilities for writing tests"; From b0cb7d45b2e3899719c19796b3c410e7e6bb7ac4 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:26:50 +0000 Subject: [PATCH 14/49] [cpan2nix] perlPackages.ThreadQueue: 3.12 -> 3.13 --- 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 1711db16af45..cdee71efe607 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16509,10 +16509,10 @@ let self = _self // overrides; _self = with self; { }; ThreadQueue = buildPerlPackage rec { - name = "Thread-Queue-3.12"; + name = "Thread-Queue-3.13"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0wpqdbdfa4mw8lpcaw1lp2d553gl65cl8mli1srj8wrg0kaxshhx"; + sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; }; meta = { description = "Thread-safe queues"; From f386aad50556a4f6bc12937da5b9c76e2347025d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:27:03 +0000 Subject: [PATCH 15/49] [cpan2nix] perlPackages.YAMLLibYAML: 0.70 -> 0.72 --- 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 cdee71efe607..25e79e99a662 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17753,10 +17753,10 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.70"; + name = "YAML-LibYAML-0.72"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; - sha256 = "1lqgal20v79ij68jhrpg57vxsv4sdahgmqdv88vg0388y776n95j"; + sha256 = "0dn50pranjyai4gclb501m29y0ks03y87g132wqpb469rb3sjd0g"; }; }; From 97bb88eedbdb255789a75a884b604c3a87f0813b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:27:12 +0000 Subject: [PATCH 16/49] [cpan2nix] perlPackages.BusinessISMN: 1.131 -> 1.132 --- 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 25e79e99a662..79fe161f70d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -878,10 +878,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISMN = buildPerlPackage rec { - name = "Business-ISMN-1.131"; + name = "Business-ISMN-1.132"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g"; + sha256 = "009dbkjx1s918qn6hm5qmc0rlqagiazhwg3m7rrfci7mw80hyb6g"; }; propagatedBuildInputs = [ TieCycle ]; meta = { From 090253642d65189ef9f888c90e88da092595c5b6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:27:31 +0000 Subject: [PATCH 17/49] [cpan2nix] perlPackages.IOSocketSSL: 2.056 -> 2.058 --- 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 79fe161f70d3..ae766f993831 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7711,10 +7711,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.056"; + name = "IO-Socket-SSL-2.058"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259"; + sha256 = "746cd17c292cfc206b394497a060b0582d0b06a1040e6bb27e6530d56786e40b"; }; propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. From da069a87aa79ff32564e1884339df9da00080e59 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:27:46 +0000 Subject: [PATCH 18/49] [cpan2nix] perlPackages.TestTempDirTiny: 0.017 -> 0.018 dependencies: perlPackages.FileTemp: init at 0.2308 --- pkgs/top-level/perl-packages.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae766f993831..39b5f3201062 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6129,6 +6129,19 @@ let self = _self // overrides; _self = with self; { }; }; + FileTemp = buildPerlPackage { + name = "File-Temp-0.2308"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz; + sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w"; + }; + meta = { + description = "return name and handle of a temporary file safely"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/Perl-Toolchain-Gang/File-Temp"; + }; + }; + FileTouch = buildPerlPackage rec { name = "File-Touch-0.11"; src = fetchurl { @@ -15726,16 +15739,17 @@ let self = _self // overrides; _self = with self; { }; TestTempDirTiny = buildPerlPackage rec { - name = "Test-TempDir-Tiny-0.017"; + name = "Test-TempDir-Tiny-0.018"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz; - sha256 = "0y2km1lbvp4hhsah2yc8vacp705zi1ijflsf7lkvqh640q6p5m55"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz; + sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp"; }; meta = { description = "Temporary directories that stick around when tests fail"; license = with stdenv.lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; }; + propagatedBuildInputs = [ FileTemp ]; }; TestTCP = buildPerlPackage rec { From 09a66b0ba8c890f5ca9e4e6770b78a4b028ae868 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:27:52 +0000 Subject: [PATCH 19/49] [cpan2nix] perlPackages.AudioScan: 1.00 -> 1.01 --- 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 39b5f3201062..720395204310 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -518,10 +518,10 @@ let self = _self // overrides; _self = with self; { ArchiveZip_1_53 = ArchiveZip; AudioScan = buildPerlPackage rec { - name = "Audio-Scan-1.00"; + name = "Audio-Scan-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "00aj95mv5dsyi0cnmd8b6i6hvvw1xiczgkmc5mv775p385q3pcfm"; + sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3"; }; buildInputs = [ pkgs.zlib TestWarn ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; From fb63fa3c938b47687ca78f40efdfa4a98d010d51 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:28:05 +0000 Subject: [PATCH 20/49] [cpan2nix] perlPackages.NetDNS: 1.15 -> 1.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 720395204310..4a3893366a70 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11135,12 +11135,12 @@ let self = _self // overrides; _self = with self; { }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.15"; + name = "Net-DNS-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0"; + sha256 = "8163eebaf46d1a870b6f596684f345da7c3a7461d7dba2b85f23e02d8982ea37"; }; - propagatedBuildInputs = [ DigestHMAC ]; + propagatedBuildInputs = [ DigestHMAC IOSocketIP ]; makeMakerFlags = "--noonline-tests"; meta = { description = "Perl Interface to the Domain Name System"; From 59addc1548e4d6ef0a92c1d988d638412bbb9a12 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:28:06 +0000 Subject: [PATCH 21/49] [cpan2nix] perlPackages.ParallelForkManager: 1.19 -> 1.20 --- 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 4a3893366a70..ac7a96736767 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11671,10 +11671,10 @@ let self = _self // overrides; _self = with self; { }; ParallelForkManager = buildPerlPackage rec { - name = "Parallel-ForkManager-1.19"; + name = "Parallel-ForkManager-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz"; - sha256 = "f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472"; + sha256 = "7cc4c1c3b0e676b61ffa90f82f4128e8057327449ca86a9beb2f39217023f289"; }; buildInputs = [ TestWarn ]; meta = { From bfdc2cd9486ccd1a15aa90113ae5bfce874290b0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:28:17 +0000 Subject: [PATCH 22/49] [cpan2nix] perlPackages.AuthenRadius: 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 ac7a96736767..20c7aeb1c3b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -572,10 +572,10 @@ let self = _self // overrides; _self = with self; { }; AuthenRadius = buildPerlPackage rec { - name = "Authen-Radius-0.26"; + name = "Authen-Radius-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz; - sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz; + sha256 = "e5a3052fe46dc38424c1947da92e623e8996216f97bd7be72221eb6c5f7c09f8"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; From 0a65e4f28011b04b361fc6a8b0e487e440dd54d7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:28:29 +0000 Subject: [PATCH 23/49] [cpan2nix] perlPackages.URIdb: 0.18 -> 0.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 20c7aeb1c3b6..23391e6b7121 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17002,10 +17002,10 @@ let self = _self // overrides; _self = with self; { }; URIdb = buildPerlModule { - name = "URI-db-0.18"; + name = "URI-db-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.18.tar.gz; - sha256 = "460a1d3b9a45779f56dbbeebc60612370b32771f3158c87da981857163b43e0b"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz; + sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658"; }; propagatedBuildInputs = [ URINested ]; meta = { From 1d018d13d5342d929014b611e4b2c27912e4b1a8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:28:47 +0000 Subject: [PATCH 24/49] [cpan2nix] perlPackages.StatisticsDescriptive: 3.0613 -> 3.0701 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23391e6b7121..4e703377b988 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13672,10 +13672,10 @@ let self = _self // overrides; _self = with self; { }; StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0613"; + name = "Statistics-Descriptive-3.0701"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0613.tar.gz; - sha256 = "ee053899c06bb042c7ff3a0d32feabe457ed0a2c893355633288436a49707ead"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0701.tar.gz; + sha256 = "35b09ed91b8660a6095c272a36ed2c61b3c660aa535fc23a20beadf7769e1919"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement From 516979ad9753ef0cb977e3cbae3686f82f271da2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:09 +0000 Subject: [PATCH 25/49] [cpan2nix] perlPackages.Test2Suite: 0.000114 -> 0.000115 --- 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 4e703377b988..94acd3cad6df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14702,10 +14702,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000114"; + name = "Test2-Suite-0.000115"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "439b37d63ffcee7876bc43b4830d4e40c454f02646faff0131e7d36d46fa8c45"; + sha256 = "02be3428a0965aeb21245d44bbadda69b94dc76cd68d5695352c996ac7fc3638"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From c82f7545a60508c099a8aa1ab41a87c65bea0178 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:12 +0000 Subject: [PATCH 26/49] [cpan2nix] perlPackages.FileHandleUnget: 0.1629 -> 0.1634 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94acd3cad6df..42954a451a9e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5824,12 +5824,12 @@ let self = _self // overrides; _self = with self; { }; FileHandleUnget = buildPerlPackage rec { - name = "FileHandle-Unget-0.1629"; + name = "FileHandle-Unget-0.1634"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "65925ec334d239c79f4a446716fb0816acb010de495ffd6b23d677f5bcc54362"; + sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785"; }; - buildInputs = [ FileSlurp TestCompile UNIVERSALrequire URI ]; + buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ]; meta = { homepage = https://github.com/coppit/filehandle-unget/; description = "FileHandle which supports multi-byte unget"; From e789b6ecf1fb5aa34bfb2f7ff3d53cf0b9149c35 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:27 +0000 Subject: [PATCH 27/49] [cpan2nix] perlPackages.TestMockObject: 1.20161202 -> 1.20180705 --- 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 42954a451a9e..79d536492353 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15251,10 +15251,10 @@ let self = _self // overrides; _self = with self; { TestMockObject = buildPerlPackage rec { - name = "Test-MockObject-1.20161202"; + name = "Test-MockObject-1.20180705"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; - sha256 = "14b225fff3645338697976dbbe2c39e44c1c93536855b78b3bbc6e9bfe94a0a2"; + sha256 = "4516058d5d511155c1c462dab4027d762d6a474b99f73bf7da20b5ffbd024518"; }; buildInputs = [ CGI TestException TestWarn ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; From 5e21d976bee43feb30da2662a0649d90023dc55b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:50 +0000 Subject: [PATCH 28/49] [cpan2nix] perlPackages.MailMboxMessageParser: 1.5106 -> 1.5111 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79d536492353..62f82b818df3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9031,12 +9031,12 @@ let self = _self // overrides; _self = with self; { }; MailMboxMessageParser = buildPerlPackage rec { - name = "Mail-Mbox-MessageParser-1.5106"; + name = "Mail-Mbox-MessageParser-1.5111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "d65fc8e8ce84273abbc14220d15813d93ddf6c7a256cdc24de156cb6c08923be"; + sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237"; }; - buildInputs = [ FileSlurp TestCompile TextDiff URI ]; + buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { homepage = https://github.com/coppit/mail-mbox-messageparser; From fd9b252f2c643a0abb53295f66f9fa118e69f3ec Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:53 +0000 Subject: [PATCH 29/49] [cpan2nix] perlPackages.PPIxQuoteLike: 0.005 -> 0.006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62f82b818df3..6412fe6a4e09 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12440,10 +12440,10 @@ let self = _self // overrides; _self = with self; { }; PPIxQuoteLike = buildPerlModule rec { - name = "PPIx-QuoteLike-0.005"; + name = "PPIx-QuoteLike-0.006"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.005.tar.gz; - sha256 = "13jvbjiqpm52kknjryzk3v4rnq70rzmx7w1bny9v5m5j6g029a4s"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz; + sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq"; }; propagatedBuildInputs = [ PPI ]; meta = { From 356bf433a906b2cdcccba41d96818df3d968e96d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:29:53 +0000 Subject: [PATCH 30/49] [cpan2nix] perlPackages.PPIxRegexp: 0.060 -> 0.061 --- 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 6412fe6a4e09..c75beb68f968 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12453,10 +12453,10 @@ let self = _self // overrides; _self = with self; { }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.060"; + name = "PPIx-Regexp-0.061"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "885e172bbfde54c240bdfd6013fc6e1b76bdd19c211901d2128f3873938ff377"; + sha256 = "e2d63a4102024e15994c685672d30c6d708272a1600abcd6241e6f2c1b3b7c92"; }; propagatedBuildInputs = [ PPI ]; meta = { From 0c6033c362497c58ba7641f2b189051eecc5e063 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:00 +0000 Subject: [PATCH 31/49] [cpan2nix] perlPackages.grepmail: 5.3105 -> 5.3111 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c75beb68f968..530555a87eb3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6623,12 +6623,12 @@ let self = _self // overrides; _self = with self; { }; grepmail = buildPerlPackage rec { - name = "grepmail-5.3105"; + name = "grepmail-5.3111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "c74fb7a0cd4549d98c78395c2485b00788ca655109358ca0ec550ea71588a5d4"; + sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761"; }; - buildInputs = [ FileSlurp TestCompile URI ]; + buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { From c4220ea3b97ffebb6363673f7f6eb2bb9349ccfd Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:01 +0000 Subject: [PATCH 32/49] [cpan2nix] perlPackages.LWP: 6.34 -> 6.35 --- 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 530555a87eb3..b004f7a570c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8866,10 +8866,10 @@ let self = _self // overrides; _self = with self; { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.34"; + name = "libwww-perl-6.35"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.34.tar.gz; - sha256 = "260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c"; + url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.35.tar.gz; + sha256 = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; meta = with stdenv.lib; { @@ -8877,7 +8877,7 @@ let self = _self // overrides; _self = with self; { license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; - buildInputs = [ TestFatal TestRequiresInternet ]; + buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; }; LWPAuthenOAuth = buildPerlPackage rec { From 8730f8233bca2848c373fb32742ed5828962bb34 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:02 +0000 Subject: [PATCH 33/49] [cpan2nix] perlPackages.FCGIClient: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b004f7a570c8..d454a2749120 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5602,17 +5602,18 @@ let self = _self // overrides; _self = with self; { }; }; - FCGIClient = buildPerlPackage rec { - name = "FCGI-Client-0.08"; + FCGIClient = buildPerlModule rec { + name = "FCGI-Client-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.08.tar.gz; - sha256 = "1rvhfnyhib1aslr06x8s0yfykaf44j5glj0rxz9ani7z6l0p2vqa"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz; + sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; }; - propagatedBuildInputs = [ AnyMoose ]; + propagatedBuildInputs = [ Moo TypeTiny ]; meta = { description = "client library for fastcgi protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny ]; }; FCGIProcManager = buildPerlPackage { From afc95f8f730c798289b497863d480bbc8108e8a0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:04 +0000 Subject: [PATCH 34/49] [cpan2nix] perlPackages.SQLAbstract: 1.85 -> 1.86 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d454a2749120..4cd6e91a7da4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13546,10 +13546,10 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.85"; + name = "SQL-Abstract-1.86"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; + sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; }; buildInputs = [ TestDeep TestException TestWarn ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ]; From e3dc19049707b4df0a6f0003d8e8151806c28d78 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:13 +0000 Subject: [PATCH 35/49] [cpan2nix] perlPackages.ArchiveTarWrapper: 0.31 -> 0.33 dependencies: perlPackages.Dumbbench: init at 0.111 perlPackages.NumberWithError: init at 1.01 perlPackages.StatisticsCaseResampling: init at 0.15 perlPackages.TestLectroTest: init at 0.5001 perlPackages.prefork: init at 1.04 --- pkgs/top-level/perl-packages.nix | 71 ++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4cd6e91a7da4..b1bcb07a3915 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -490,16 +490,16 @@ let self = _self // overrides; _self = with self; { }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.31"; + name = "Archive-Tar-Wrapper-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.31.tar.gz; - sha256 = "18rvqzy7m900ikq7r4hxpja21wcsh3z6rz7qhs4ksgc0dpdqb9qd"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.33.tar.gz; + sha256 = "0z6ngvgl4w4nihvmwkg77gmi5h7a695b83dpyybxhx4j3bj1izca"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { description = "API wrapper around the 'tar' utility"; }; - buildInputs = [ TestSimple13 ]; + buildInputs = [ Dumbbench TestSimple13 ]; }; ArchiveZip = buildPerlPackage { @@ -4859,6 +4859,20 @@ let self = _self // overrides; _self = with self; { }; }; + Dumbbench = buildPerlPackage { + name = "Dumbbench-0.111"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz; + sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk"; + }; + propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; + meta = { + description = "More reliable benchmarking with the least amount of thinking"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/briandfoy/dumbbench"; + }; + }; + EmailAbstract = buildPerlPackage rec { name = "Email-Abstract-3.008"; src = fetchurl { @@ -11444,6 +11458,20 @@ let self = _self // overrides; _self = with self; { }; }; + NumberWithError = buildPerlPackage { + name = "Number-WithError-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz; + sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz"; + }; + propagatedBuildInputs = [ ParamsUtil prefork ]; + buildInputs = [ TestLectroTest ]; + meta = { + description = "Numbers with error propagation and scientific rounding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NTLM = buildPerlPackage rec { name = "NTLM-1.09"; src = fetchurl { @@ -12797,6 +12825,18 @@ let self = _self // overrides; _self = with self; { }; }; + prefork = buildPerlPackage { + name = "prefork-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz; + sha256 = "1xzxx9wgrrfl1ys05yglp2q3bwscvdzlnsiybqk8drbvwlzj5kz3"; + }; + meta = { + description = "Optimized module loading for forking or non-forking processes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodPerldoc = buildPerlPackage rec { name = "Pod-Perldoc-3.28"; src = fetchurl { @@ -13672,6 +13712,17 @@ let self = _self // overrides; _self = with self; { }; }; + StatisticsCaseResampling = buildPerlPackage { + name = "Statistics-CaseResampling-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz; + sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745"; + }; + meta = { + description = "Efficient resampling and calculation of medians with confidence intervals"; + }; + }; + StatisticsDescriptive = buildPerlModule { name = "Statistics-Descriptive-3.0701"; src = fetchurl { @@ -15171,6 +15222,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestLectroTest = buildPerlPackage { + name = "Test-LectroTest-0.5001"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz; + sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc"; + }; + meta = { + description = "Easy, automatic, specification-based tests"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestLongString = buildPerlPackage rec { name = "Test-LongString-0.17"; src = fetchurl { From 20276b840ab3c1b59bff22b909fc462145a23972 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:30:25 +0000 Subject: [PATCH 36/49] [cpan2nix] perlPackages.SOAPLite: 1.11 -> 1.27 dependencies: perlPackages.IOSessionData: init at 1.03 perlPackages.XMLParserLite: init at 0.721 --- pkgs/top-level/perl-packages.nix | 33 ++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1bcb07a3915..dde2e5ec7d3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7716,6 +7716,17 @@ let self = _self // overrides; _self = with self; { }; }; + IOSessionData = buildPerlPackage { + name = "IO-SessionData-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; + sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; + }; + meta = { + description = "supporting module for SOAP::Lite"; + }; + }; + IOSocketIP = buildPerlModule { name = "IO-Socket-IP-0.39"; src = fetchurl { @@ -13426,18 +13437,19 @@ let self = _self // overrides; _self = with self; { }; SOAPLite = buildPerlPackage { - name = "SOAP-Lite-1.11"; + name = "SOAP-Lite-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.11.tar.gz; - sha256 = "1zhy06v72r95ih3lx5rlx0bvkq214ndmcmn97m5k2rkxxy4ybpp4"; + url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz; + sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3"; }; - propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; + propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestWarn XMLParserLite ]; }; Socket = buildPerlPackage { @@ -17590,6 +17602,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ LWP ]; }; + XMLParserLite = buildPerlPackage { + name = "XML-Parser-Lite-0.721"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz; + sha256 = "1fh8g77nkfv9n07ivilnfxdapx6jx13whf8q0anrmnxrr9pa6qjq"; + }; + buildInputs = [ TestRequires ]; + meta = { + description = "Lightweight pure-perl XML Parser (based on regexps)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLXPath = buildPerlPackage rec { name = "XML-XPath-1.42"; src = fetchurl { From 233f1b9d816e4cdeccf63980656e280a0d7662ea Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:31:36 +0000 Subject: [PATCH 37/49] [cpan2nix] perlPackages.NetAmazonS3: 0.80 -> 0.84 dependencies: perlPackages.RefUtil: init at 0.204 --- pkgs/top-level/perl-packages.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dde2e5ec7d3c..42c81452f36f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11057,13 +11057,13 @@ let self = _self // overrides; _self = with self; { }; NetAmazonS3 = buildPerlPackage rec { - name = "Net-Amazon-S3-0.80"; + name = "Net-Amazon-S3-0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; - sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; + url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.84.tar.gz; + sha256 = "9e995f7d7982d4ab3510bf30e842426b341be20e4b7e6fe48edafeb067f49626"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ]; + buildInputs = [ TestDeep TestException ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon TermEncoding TermProgressBarSimple XMLLibXML ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13062,6 +13062,18 @@ let self = _self // overrides; _self = with self; { }; }; + RefUtil = buildPerlPackage { + name = "Ref-Util-0.204"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz; + sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1"; + }; + meta = { + description = "Utility functions for checking references"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + RegexpAssemble = buildPerlPackage rec { name = "Regexp-Assemble-0.38"; src = fetchurl { From dbf6a5e68cde43703a62a9ad1d87a1213d308fed Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 04:43:42 +0000 Subject: [PATCH 38/49] perlPackages: 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 42c81452f36f..cb292af94641 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7722,6 +7722,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; }; + outputs = [ "out" "dev" ]; # no "devdoc" meta = { description = "supporting module for SOAP::Lite"; }; @@ -17910,7 +17911,6 @@ let self = _self // overrides; _self = with self; { TextAbbrev = null; # part of Perl 5.22 TextTabsWrap = null; # part of Perl 5.22 DigestSHA = null; - FileTemp = null; "if" = null; TestSimple = null; From c5019585354291686e7b8c6a263336782d9de814 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 25 Jul 2018 22:12:39 +0000 Subject: [PATCH 39/49] hydra: fix build --- pkgs/development/tools/misc/hydra/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f4f72491970c..425ffd8f03f6 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -40,6 +40,7 @@ let FileSlurp IOCompress IPCRun + JSON JSONAny JSONXS LWP From 52681db9a3c24a592fd5fd745bea0db6ad7f8d8d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 11 Jul 2018 15:38:20 -0400 Subject: [PATCH 40/49] darwin.objc4: install Object.h header --- pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 5c78182085b5..a7cedaaea114 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -18,6 +18,7 @@ appleDerivation { cp runtime/OldClasses.subproj/List.h $out/include/objc/List.h cp runtime/NSObjCRuntime.h $out/include/objc/NSObjCRuntime.h cp runtime/NSObject.h $out/include/objc/NSObject.h + cp runtime/Object.h $out/include/objc/Object.h cp runtime/Protocol.h $out/include/objc/Protocol.h cp runtime/hashtable.h $out/include/objc/hashtable.h cp runtime/hashtable2.h $out/include/objc/hashtable2.h From 465166fb1a8a720a50597f0a9d46691477528628 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Jul 2018 00:14:57 -0400 Subject: [PATCH 41/49] libuv: disable tty_pty test on darwin --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index ce8d741adf23..a0ace84bc67d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + "tty_pty" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' From d69f3a2a43a0ccfc16771e83236442fdb62a53ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 9 May 2018 20:21:55 +0200 Subject: [PATCH 42/49] =?UTF-8?q?pulseaudio:=2011.1=20=E2=86=92=2012.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GConf was finally removed in favour of GSettings. Removes patches that were upstreamed and caps-fix.patch, which is not needed since f1d465f429252d7c58a920ad9d7ee93e34e7fad9. --- pkgs/servers/pulseaudio/caps-fix.patch | 13 ---------- pkgs/servers/pulseaudio/default.nix | 34 ++++++++++---------------- pkgs/top-level/all-packages.nix | 6 ++--- 3 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 pkgs/servers/pulseaudio/caps-fix.patch diff --git a/pkgs/servers/pulseaudio/caps-fix.patch b/pkgs/servers/pulseaudio/caps-fix.patch deleted file mode 100644 index 1d69a16982f9..000000000000 --- a/pkgs/servers/pulseaudio/caps-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3c71472..71b5c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -620,6 +620,8 @@ AC_ARG_WITH([caps], - - if test "x${with_caps}" != "xno"; then - AC_SEARCH_LIBS([cap_init], [cap], [], []) -+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"], -+ LIBS="-L${with_caps}/lib $LIBS") - - # Only give an error on hosts that we know could support capabilities - AC_CHECK_HEADERS([sys/capability.h], [], [ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67d..37a104b8b6d8 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, libsndfile, libtool -, xorg, libcap, alsaLib, glib +{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +, libsndfile, libtool, makeWrapper +, xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, speexdsp, systemd, webrtc-audio-processing, gconf ? null +, speexdsp, systemd, webrtc-audio-processing # Database selection , tdb ? null, gdbm ? null @@ -20,8 +20,6 @@ , airtunesSupport ? false -, gconfSupport ? false - , bluetoothSupport ? false , remoteControlSupport ? false @@ -36,27 +34,16 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.1"; + version = "12.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; + sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"; }; - patches = [ ./caps-fix.patch (fetchpatch { - name = "glibc-2.27.patch"; - url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; - sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; - }) ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "padsp-fix.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; - sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q"; - }); - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; @@ -72,7 +59,6 @@ stdenv.mkDerivation rec { ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl - ++ lib.optional gconfSupport gconf ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc ++ lib.optional zeroconfSupport avahi @@ -128,6 +114,12 @@ stdenv.mkDerivation rec { '' + ''moveToOutput lib/cmake "$dev" ''; + preFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/libexec/pulse/gsettings-helper \ + --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f48a9e4591..6cab1ee5b664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3719,7 +3719,7 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; - + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -4988,7 +4988,7 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; seexpr = callPackage ../development/compilers/seexpr { }; - + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; @@ -12919,11 +12919,9 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; - gconfSupport = true; bluetoothSupport = true; remoteControlSupport = true; zeroconfSupport = true; From f2163b9dffca0103beafddb9cbaf250437f951e5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 8 Jul 2018 04:52:41 +0200 Subject: [PATCH 43/49] =?UTF-8?q?paprefs:=200.9.10=20=E2=86=92=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/paprefs/default.nix | 15 +++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 5f95a60237f2..23ba3582ce61 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus-glib, GConf, gconfmm, intltool }: +{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "paprefs-0.9.10"; + name = "paprefs-1.0"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; - sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; + sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedUserEnvPkgs = [ GConf ]; - - configureFlags = [ "--disable-lynx" ]; + buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ]; meta = with stdenv.lib; { description = "PulseAudio Preferences"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cab1ee5b664..0f19235e1180 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17660,9 +17660,7 @@ with pkgs; panotools = callPackage ../applications/graphics/panotools { }; - paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome2) libglademm gconfmm GConf; - }; + paprefs = callPackage ../applications/audio/paprefs { }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; From 774e5294a288da69c4dabda664d9dd2dfeb3d9f3 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 29 Jul 2018 20:01:45 +0000 Subject: [PATCH 44/49] wxGTK30: 3.0.3.1 -> 3.0.4 (#44045) --- .../libraries/wxwidgets/3.0/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 309d9be274d1..5d3086fc5049 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -14,17 +14,15 @@ assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null with stdenv.lib; -let - version = "3.0.3.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "3.0.4"; name = "wxwidgets-${version}"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; buildInputs = @@ -44,11 +42,7 @@ stdenv.mkDerivation { + "fix_assertion_using_hide_in_destroy.diff"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; }) - # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - ] ++ optional (!withGtk2) (fetchpatch { - url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; - sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; - }); + ]; configureFlags = [ "--disable-precomp-headers" "--enable-mediactrl" @@ -87,7 +81,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - + meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; From 3e7f4611a0c1ec9f1a31d3cd40a1fed4331b6e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Jul 2018 08:47:02 +0200 Subject: [PATCH 45/49] mesa: 8.1.4 -> 8.1.5 (maintenance) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ab2aa0ce3ae8..dbcfcf19bd10 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -63,7 +63,7 @@ let in let - version = "18.1.4"; + version = "18.1.5"; branch = head (splitString "." version); in @@ -77,7 +77,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; + sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea"; }; prePatch = "patchShebangs ."; From bd63de114e7a317acebc5c11b77ba305cba2d605 Mon Sep 17 00:00:00 2001 From: James Deikun Date: Mon, 30 Jul 2018 10:44:35 -0400 Subject: [PATCH 46/49] stdenv/build-support: support .tbz and .txz tarballs --- doc/stdenv.xml | 7 ++++--- pkgs/build-support/release/functions.sh | 2 +- pkgs/stdenv/generic/setup.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index e7f52377e687..94bd7365dd9a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -836,9 +836,10 @@ passthru = { These can optionally be compressed using gzip (.tar.gz, .tgz or .tar.Z), bzip2 - (.tar.bz2 or .tbz2) or - xz (.tar.xz or - .tar.lzma). + (.tar.bz2, .tbz2 or + .tbz) or xz + (.tar.xz, .tar.lzma or + .txz). diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index 875a2da178de..120d19685427 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -1,7 +1,7 @@ findTarball() { local suffix i if [ -d "$1/tarballs/" ]; then - for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do + for suffix in tar.gz tgz tar.bz2 tbz2 tbz tar.xz txz tar.lzma; do for i in $1/tarballs/*.$suffix; do echo $i; break; done done | sort | head -1 return diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 8b98aac1146d..141e94c5ed46 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -801,11 +801,11 @@ _defaultUnpack() { else case "$fn" in - *.tar.xz | *.tar.lzma) + *.tar.xz | *.tar.lzma | *.txz) # Don't rely on tar knowing about .xz. xz -d < "$fn" | tar xf - ;; - *.tar | *.tar.* | *.tgz | *.tbz2) + *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) # GNU tar can automatically select the decompression method # (info "(tar) gzip"). tar xf "$fn" From 73959b68c25a70599adaace31154b65c82618aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Jul 2018 09:48:16 +0200 Subject: [PATCH 47/49] Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE" This reverts commit fd81a2ecb6b85594dc79ad53566c822849d4e47a. Moved from master to staging. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 1b43d7cc211a..8003fe1d8f38 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -126,7 +126,7 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}" fi NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" fi From 7be0521a25dcae3c8363b8187f5be0d70b47b64b Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 1 Aug 2018 09:04:54 +0200 Subject: [PATCH 48/49] file: 5.33 -> 5.34 fixes CVE-2018-10360 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 485f46d03144..1e8c902a0508 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.33"; + version = "5.34"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"; + sha256 = "02mj4g34l13facacsc0ff8rchbh93ccqw7hns45yqgx8pzdm0npi"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; From 11ceef47699fb0911bea790e4b8059d97e95ad14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Aug 2018 10:56:17 +0200 Subject: [PATCH 49/49] mesa_drivers: fix a mistake from 4c77fdef4 --- 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 4dbb8f983e05..e7923c9f06ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11029,7 +11029,7 @@ with pkgs; # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ # floating point textures patents are expired, # so package reduced to alias - mesa_drivers = mesa_noglu; + mesa_drivers = mesa_noglu.drivers; ## End libGL/libGLU/Mesa stuff