From 15b0cff112694ed76d9a980f5b44380d8b63d4d8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 11 Oct 2019 21:36:37 -0400 Subject: [PATCH 001/467] networkmanager: enable polkit_agent Not sure why we had this disabled. This is for the nmcli/nmtui `agent` subcommand [0] which allows it to act as a polkit agent. > nmcli agent { secret | polkit | all } > Run nmcli as a NetworkManager secret agent, or polkit agent. For example, this is useful if you want to use nmcli/nmtui to authenti- cate with polkit on a headless server. [0]: https://developer.gnome.org/NetworkManager/stable/nmcli.html --- pkgs/tools/networking/network-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1459ac53a129..e18b5970370f 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "-Dcrypto=gnutls" "-Dsession_tracking=systemd" "-Dmodem_manager=true" + "-Dpolkit_agent=true" "-Dnmtui=true" "-Ddocs=true" "-Dtests=no" From 231432e93c677bfd5d780d16491e168551945f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 15 Oct 2019 11:26:59 +0200 Subject: [PATCH 002/467] spidermonkey_60: 60.4.0 -> 60.9.0 This is the last 60-esr I believe. - fixed multiple outputs (saves $out 2MB from $out) - updated the only patch we carry - symlinked `js` to `js60`, some packages using spidermonkey expects `js`. Might make it possible to drop 38 in the future. --- pkgs/development/interpreters/spidermonkey/60.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index f62638dd8386..f6a4483edba7 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -4,23 +4,28 @@ with stdenv.lib; let - version = "60.4.0"; + version = "60.9.0"; in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "11gzxd82grc3kg1ha4yni6ag6b97n46qycvv6x15s91ziia5hli0"; + sha256 = "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + buildInputs = [ readline zlib icu ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; patches = [ + # Fixed in 62.0 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1415202 (fetchpatch { - url = https://bug1415202.bmoattachments.org/attachment.cgi?id=8926363; - sha256 = "082ryrvqa3lvs67v3sq9kf2jshf4qp1fpi195wffc40jdrl8fnin"; + url = "https://src.fedoraproject.org/rpms/mozjs60/raw/a1b605c73f382db25977cb2d4d70a3ba2ff85b92/f/Always-use-the-equivalent-year-to-determine-the-time-zone.patch"; + sha256 = "12i225qbzlyfj2disms50zrr5jy8zgn2cc4rgsg58sfgf1bn7150"; }) ]; @@ -61,7 +66,9 @@ in stdenv.mkDerivation { # Remove unnecessary static lib preFixup = '' + moveToOutput bin/js60-config "$dev" rm $out/lib/libjs_static.ajs + ln -s $out/bin/js60 $out/bin/js ''; enableParallelBuilding = true; From 18d7929e95a76210d771c1648b97d90737756854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 15 Oct 2019 11:52:54 +0200 Subject: [PATCH 003/467] spidermonkey_52: drop, as is unused `gnome-shell-extensions` switched over to `spidermonkey_60` in 3.34 leaving `spidermonkey_52` unused. --- .../interpreters/spidermonkey/52.nix | 82 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/52.nix diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix deleted file mode 100644 index 238afd4bd040..000000000000 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }: - -let - version = "52.9.0"; -in stdenv.mkDerivation { - pname = "spidermonkey"; - inherit version; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - buildInputs = [ readline icu zlib nspr ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ]; - - # Apparently this package fails to build correctly with modern compilers, which at least - # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. - # These flags were stolen from: - # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52 - NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp"; - - patches = [ - # needed to build gnome3.gjs - (fetchpatch { - name = "mozjs52-disable-mozglue.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; - sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; - }) - ]; - - configurePlatforms = [ ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python2.interpreter}" - configureFlagsArray+=("--includedir=$dev/include") - - cd js/src - - autoconf - ''; - - configureFlags = [ - "--with-nspr-prefix=${nspr}" - "--with-system-zlib" - "--with-system-icu" - "--with-intl-api" - "--enable-readline" - "--enable-shared-js" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc" - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - makeFlags = [ - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" - ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - enableParallelBuilding = true; - - postInstall = '' - moveToOutput bin/js52-config "$dev" - # Nuke a static lib. - rm $out/lib/libjs_static.ajs - ''; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bda9a699d29a..de89191537ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -344,6 +344,7 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dc771df22d3..bdaf8ef80672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9034,7 +9034,6 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey = spidermonkey_38; From cb0adc11ffb0926adae7aa2ed22835c4f9ea971c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 27 Oct 2018 16:01:19 +0200 Subject: [PATCH 004/467] pinentry: build with multiple outputs in single drv Co-authored-by: Florian Klink Co-authored-by: worldofpeace --- nixos/modules/config/no-x-libs.nix | 1 - pkgs/tools/security/pinentry/default.nix | 103 +++++++++++++++-------- pkgs/top-level/all-packages.nix | 31 ++----- 3 files changed, 74 insertions(+), 61 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 74cf74d74181..873b8073fed9 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -34,7 +34,6 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt4 = null; qt5 = null; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; })); }; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 160816a8cb72..87edc914131d 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,60 +1,93 @@ -{ fetchurl, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook -, libgpgerror, libassuan -, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null -, qt4 ? null, qt5 ? null -, enableEmacs ? false +{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook, wrapGAppsHook +, libgpgerror, libassuan, qtbase, wrapQtAppsHook +, ncurses, gtk2, gcr +, libcap ? null, libsecret ? null +, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "gnome3" "emacs" ] }: -assert qt5 != null -> qt4 == null; -assert qt4 != null -> qt5 == null; +with stdenv.lib; + +assert isList enabledFlavors && enabledFlavors != []; let - mkDerivation = - if qt5 != null - then qt5.mkDerivation + pinentryMkDerivation = + if (builtins.elem "qt" enabledFlavors) + then mkDerivation else stdenv.mkDerivation; + + mkFlag = pfxTrue: pfxFalse: cond: name: + "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; + + mkEnablePinentry = f: + let + info = flavorInfo.${f}; + flag = flavorInfo.${f}.flag or null; + in + optionalString (flag != null) + (mkEnable (elem f enabledFlavors) ("pinentry-" + flag)); + + flavorInfo = { + curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; + tty = { bin = "tty"; flag = "tty"; }; + gtk2 = { bin = "gtk-2"; flag = "gtk2"; buildInputs = [ gtk2 ]; }; + gnome3 = { bin = "gnome3"; flag = "gnome3"; buildInputs = [ gcr ]; nativeBuildInputs = [ wrapGAppsHook ]; }; + qt = { bin = "qt"; flag = "qt"; buildInputs = [ qtbase ]; nativeBuildInputs = [ wrapQtAppsHook ]; }; + emacs = { bin = "emacs"; flag = "emacs"; buildInputs = []; }; + }; + in -mkDerivation rec { - name = "pinentry-1.1.0"; +pinentryMkDerivation rec { + pname = "pinentry"; + version = "1.1.0"; src = fetchurl { - url = "mirror://gnupg/pinentry/${name}.tar.bz2"; + url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2"; sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = - [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ] - ++ stdenv.lib.optional (qt5 != null) qt5.qtbase; + nativeBuildInputs = [ pkgconfig autoreconfHook ] + ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; + buildInputs = [ libgpgerror libassuan libcap libsecret ] + ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; - prePatch = '' - substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses - ''; + dontWrapGApps = true; + dontWrapQtApps = true; patches = [ ./autoconf-ar.patch - ] ++ lib.optionals (gtk2 != null) [ + ] ++ optionals (elem "gtk2" enabledFlavors) [ (fetchpatch { - url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/" - + "0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; + url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; }) ]; configureFlags = [ - (stdenv.lib.withFeature (libcap != null) "libcap") - (stdenv.lib.enableFeature (libsecret != null) "libsecret") - (stdenv.lib.enableFeature (ncurses != null) "pinentry-curses") - (stdenv.lib.enableFeature true "pinentry-tty") - (stdenv.lib.enableFeature enableEmacs "pinentry-emacs") - (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") - (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") - (stdenv.lib.enableFeature (qt4 != null || qt5 != null) "pinentry-qt") + (mkWith (libcap != null) "libcap") + (mkEnable (libsecret != null) "libsecret") + ] ++ (map mkEnablePinentry (attrNames flavorInfo)); - "--with-libassuan-prefix=${libassuan.dev}" - "--with-libgpg-error-prefix=${libgpgerror.dev}" - ]; + postInstall = + concatStrings (flip map enabledFlavors (f: + let + binary = "pinentry-" + flavorInfo.${f}.bin; + in '' + moveToOutput bin/${binary} ${placeholder f} + ln -sf ${placeholder f}/bin/${binary} ${placeholder f}/bin/pinentry + '' + optionalString (f == "gnome3") '' + wrapGApp ${placeholder f}/bin/${binary} + '' + optionalString (f == "qt") '' + wrapQtApp ${placeholder f}/bin/${binary} + '')) + '' + ln -sf ${placeholder (head enabledFlavors)}/bin/pinentry-${flavorInfo.${head enabledFlavors}.bin} $out/bin/pinentry + ''; + + outputs = [ "out" ] ++ enabledFlavors; + + passthru = { flavors = enabledFlavors; }; meta = with stdenv.lib; { homepage = http://gnupg.org/aegypten2/; @@ -65,6 +98,6 @@ mkDerivation rec { Pinentry provides a console and (optional) GTK and Qt GUIs allowing users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; - maintainers = [ maintainers.ttuegel ]; + maintainers = with maintainers; [ ttuegel fpletz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64f625f77257..29353545530c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,34 +5521,15 @@ in phodav = callPackage ../tools/networking/phodav { }; - pinentry = callPackage ../tools/security/pinentry { + pinentry = libsForQt5.callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; - gcr = null; - qt4 = null; - qt5 = null; }; - pinentry_ncurses = res.pinentry.override { - gtk2 = null; - }; - - pinentry_emacs = res.pinentry.override { - enableEmacs = true; - }; - - pinentry_gnome = res.pinentry.override { - inherit gcr; - }; - - pinentry_qt4 = res.pinentry.override { - gtk2 = null; - inherit qt4; - }; - - pinentry_qt5 = res.pinentry.override { - gtk2 = null; - inherit qt5; - }; + pinentry_curses = (stdenv.lib.getOutput "curses" pinentry); + pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry); + pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); + pinentry_qt = (stdenv.lib.getOutput "qt" pinentry); + pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; From 511b1823fcdb53368df347d641ff6d4e067d8d77 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 14 Oct 2019 00:14:42 +0200 Subject: [PATCH 005/467] pinentry: change attributes to dashes, alias old ones --- pkgs/tools/security/kwalletcli/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 5 +++++ pkgs/top-level/all-packages.nix | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index fedf3421fb1c..9356e2f53f94 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig -, kcoreaddons, ki18n, kwallet, mksh, pinentry_qt5 }: +, kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: mkDerivation rec { pname = "kwalletcli"; @@ -36,7 +36,7 @@ mkDerivation rec { postInstall = '' wrapProgram $out/bin/pinentry-kwallet \ - --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry_qt5 ]} \ + --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ --set-default PINENTRY pinentry-qt ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 50d657318fc7..d9b324f761f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -290,6 +290,11 @@ mapAliases ({ pg_hll = postgresqlPackages.pg_hll; pg_cron = postgresqlPackages.pg_cron; pg_topn = postgresqlPackages.pg_topn; + pinentry_curses = pinentry-curses; # added 2019-10-14 + pinentry_emacs = pinentry-emacs; # added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 + pinentry_qt = pinentry-qt; # added 2019-10-14 + pinentry_gnome = pinentry-gnome; # added 2019-10-14 postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29353545530c..08837c7a5756 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5525,11 +5525,11 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_curses = (stdenv.lib.getOutput "curses" pinentry); - pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry); - pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); - pinentry_qt = (stdenv.lib.getOutput "qt" pinentry); - pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry); + pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); + pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); + pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); + pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; From c2576266baaf02be2d4da39cf25ed48044b6245e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 27 Oct 2018 16:02:16 +0200 Subject: [PATCH 006/467] nixos/gnupg: add option for setting pinentry flavours Co-authored-by: Florian Klink --- nixos/modules/installer/tools/tools.nix | 6 +++- nixos/modules/programs/gnupg.nix | 39 ++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 329260059598..9e6eead3c4d7 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -120,7 +120,11 @@ in # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # flavour = "gnome3"; + # }; # List services that you want to enable: diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index bcbc994efe9b..dd3d74c26326 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -6,6 +6,19 @@ let cfg = config.programs.gnupg; + xserverCfg = config.services.xserver; + + defaultPinentryFlavor = + if xserverCfg.desktopManager.lxqt.enable + || xserverCfg.desktopManager.plasma5.enable then + "qt" + else if xserverCfg.desktopManager.xfce.enable then + "gtk2" + else if xserverCfg.enable then + "gnome3" + else + null; + in { @@ -54,6 +67,20 @@ in ''; }; + agent.pinentryFlavor = mkOption { + type = types.nullOr (types.enum pkgs.pinentry.flavors); + example = "gnome3"; + description = '' + Which pinentry interface to use. If not null, the path to the + pinentry binary will be passed to gpg-agent via commandline and + thus overrides the pinentry option in gpg-agent.conf in the user's + home directory. + If not set at all, it'll pick an appropriate flavor depending on the + system configuration (qt3 flavor for lxqt and plasma5, gtk2 for xfce + 4.12, gnome3 on all other systems with X enabled, ncurses otherwise). + ''; + }; + dirmngr.enable = mkOption { type = types.bool; default = false; @@ -64,6 +91,16 @@ in }; config = mkIf cfg.agent.enable { + programs.gnupg.agent.pinentryFlavor = mkDefault defaultPinentryFlavor; + + # This overrides the systemd user unit shipped with the gnupg package + systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) { + serviceConfig.ExecStart = [ "" '' + ${pkgs.gnupg}/bin/gpg-agent --supervised \ + --pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry + '' ]; + }; + systemd.user.sockets.gpg-agent = { wantedBy = [ "sockets.target" ]; }; @@ -83,7 +120,7 @@ in systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable { wantedBy = [ "sockets.target" ]; }; - + environment.systemPackages = with pkgs; [ cfg.package ]; systemd.packages = [ cfg.package ]; From 3d832dee59ed0338db4afb83b4c481a062163771 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 27 Oct 2018 16:03:13 +0200 Subject: [PATCH 007/467] gnupg: disable gui/pinentry support by default This solves the dependency cycle in gcr alternatively so there won't be two gnupg store paths in a standard NixOS system which has udisks2 enabled by default. NixOS users are expected to use the gpg-agent user service to pull in the appropriate pinentry flavour or install it on their systemPackages and set it in their local gnupg agent config instead. Co-authored-by: Florian Klink --- nixos/doc/manual/release-notes/rl-2003.xml | 9 ++++++++- nixos/modules/programs/gnupg.nix | 2 +- pkgs/development/libraries/gcr/default.nix | 6 +----- pkgs/tools/security/gnupg/20.nix | 2 +- pkgs/tools/security/gnupg/22.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ++++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index ab0951e831ce..49ffcd1c2d21 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -85,7 +85,14 @@ - + + GnuPG is now built without support for a graphical passphrase entry + by default. Please enable the gpg-agent user service + via the NixOS option programs.gnupg.agent.enable. + Note that upstream recommends using gpg-agent and + will spawn a gpg-agent on the first invocation of + GnuPG anyway. + diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index dd3d74c26326..4fb7c43c8b2e 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -76,7 +76,7 @@ in thus overrides the pinentry option in gpg-agent.conf in the user's home directory. If not set at all, it'll pick an appropriate flavor depending on the - system configuration (qt3 flavor for lxqt and plasma5, gtk2 for xfce + system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce 4.12, gnome3 on all other systems with X enabled, ncurses otherwise). ''; }; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 18b568b0f6c6..1947d40dc85d 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -24,11 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ]; - buildInputs = let - gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome - in [ - gpg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk - ]; + buildInputs = [ gnupg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk ]; propagatedBuildInputs = [ glib gtk3 p11-kit ]; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 6336d319997f..ef348e388342 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -3,7 +3,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, guiSupport ? true +, pinentry ? null, guiSupport ? false , openldap ? null, bzip2 ? null, libusb ? null, curl ? null }: diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index e2f460e7e308..f62f10c8cf9d 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, guiSupport ? true +, pinentry ? null, guiSupport ? false , adns ? null, gnutls ? null, libusb ? null, openldap ? null , readline ? null, zlib ? null, bzip2 ? null }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08837c7a5756..055209a3bc42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3499,10 +3499,12 @@ in gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; }; gnupg = gnupg22; From ec6224b6cd147943eee685ef671811b3683cb2ce Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 27 Oct 2018 16:08:17 +0200 Subject: [PATCH 008/467] Revert "installer: Disable udisks" This reverts commit 571fb74f449aa173e231166515b41feb778524b8. The dependency on gtk2 was removed. Co-authored-by: Florian Klink --- nixos/modules/profiles/installation-device.nix | 3 --- nixos/tests/installer.nix | 4 ---- nixos/tests/os-prober.nix | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index fd30220ce1c9..4596e163404c 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -31,9 +31,6 @@ with lib; # Let the user play Rogue on TTY 8 during the installation. #services.rogue.enable = true; - # Disable some other stuff we don't need. - services.udisks2.enable = mkDefault false; - # Use less privileged nixos user users.users.nixos = { isNormalUser = true; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a136678c6eff..eb1f4f192dd1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -54,8 +54,6 @@ let hardware.enableAllFirmware = lib.mkForce false; - services.udisks2.enable = lib.mkDefault false; - ${replaceChars ["\n"] ["\n "] extraConfig} } ''; @@ -295,8 +293,6 @@ let ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; - services.udisks2.enable = mkDefault false; - nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 9cd9f4ecd150..5407a62339fe 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -51,12 +51,11 @@ let hashed-mirrors = connect-timeout = 1 ''; - services.udisks2.enable = lib.mkForce false; }; # /etc/nixos/configuration.nix for the vm configFile = pkgs.writeText "configuration.nix" '' {config, pkgs, ...}: ({ - imports = + imports = [ ./hardware-configuration.nix ]; From 36756e930fb4b6b45aa3e7528c0bb6551f69e5a6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 16 Oct 2019 19:31:58 +0200 Subject: [PATCH 009/467] udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 --- nixos/modules/services/hardware/udisks2.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index ed8703be921c..e898f3260585 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -34,10 +34,7 @@ with lib; services.dbus.packages = [ pkgs.udisks2 ]; - system.activationScripts.udisks2 = - '' - mkdir -m 0755 -p /var/lib/udisks2 - ''; + systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; services.udev.packages = [ pkgs.udisks2 ]; From 5b324c18255847fb1298799f23bffd0c4cf5bb59 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Oct 2019 19:43:07 +0200 Subject: [PATCH 010/467] Remove references to the nixpkgs-channels repo Channel branches are now provided in the nixpkgs repo. Issue #71176. --- README.md | 4 +--- doc/introduction.chapter.md | 4 ++-- doc/reviewing-contributions.xml | 9 +-------- nixos/doc/manual/development/sources.xml | 19 +++++++++---------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 49550f8fe7a9..15ef4048d900 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,7 @@ system, [Hydra](https://hydra.nixos.org/). Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are met, the Nixpkgs expressions are distributed via [Nix -channels](https://nixos.org/nix/manual/#sec-channels). The channels -are provided via a read-only mirror of the Nixpkgs repository called -[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels). +channels](https://nixos.org/nix/manual/#sec-channels). # Contributing diff --git a/doc/introduction.chapter.md b/doc/introduction.chapter.md index 6abdc2714e2c..713c7181a3a0 100644 --- a/doc/introduction.chapter.md +++ b/doc/introduction.chapter.md @@ -47,5 +47,5 @@ which also builds binary packages from the Nix expressions in Nixpkgs for The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the -[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository, -which has branches corresponding to the available channels. +[`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches +that correspond to the channel names (e.g. `nixos-19.09-small`). diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 5a14684f9b1e..02606569297c 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -115,19 +115,12 @@ It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. -$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git -$ git fetch channels nixos-unstable +$ git fetch origin nixos-unstable $ git fetch origin pull/PRNUMBER/head $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - - - This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository. - - Fetching the nixos-unstable branch. diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 3c30c782746d..b333ccabb420 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -13,17 +13,16 @@ $ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs -$ git remote add channels https://github.com/NixOS/nixpkgs-channels -$ git remote update channels +$ git remote update origin This will check out the latest Nixpkgs sources to ./nixpkgs the NixOS sources to ./nixpkgs/nixos. (The NixOS source tree lives in a - subdirectory of the Nixpkgs repository.) The remote - channels refers to a read-only repository that tracks the - Nixpkgs/NixOS channels (see for more + subdirectory of the Nixpkgs repository.) The + nixpkgs repository has branches that correspond + to each Nixpkgs/NixOS channel (see for more information about channels). Thus, the Git branch - channels/nixos-17.03 will contain the latest built and + origin/nixos-17.03 will contain the latest built and tested version available in the nixos-17.03 channel. @@ -40,15 +39,15 @@ Or, to base your local branch on the latest version available in a NixOS channel: -$ git remote update channels -$ git checkout -b local channels/nixos-17.03 +$ git remote update origin +$ git checkout -b local origin/nixos-17.03 (Replace nixos-17.03 with the name of the channel you want to use.) You can use git merge or git rebase to keep your local branch in sync with the channel, e.g. -$ git remote update channels -$ git merge channels/nixos-17.03 +$ git remote update origin +$ git merge origin/nixos-17.03 You can use git cherry-pick to copy commits from your local branch to the upstream branch. From 5d0b43069e5e8cda0bb9ea2dccf4fbfe43d81d4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:20:18 +0200 Subject: [PATCH 011/467] python: pytz: 2019.1 -> 2019.3 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 534bb1618bc4..e7ce3b62b5b8 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2019.1"; + version = "2019.3"; src = fetchPypi { inherit pname version; - sha256 = "d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"; + sha256 = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be"; }; checkPhase = '' From 7728edab004ec827b271ba962ff9867117e960f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:23:01 +0200 Subject: [PATCH 012/467] python.pkgs.bootstrapped-pip: upgrade pip and setuptools --- .../python-modules/bootstrapped-pip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index d2f64a5e5a8b..29695ddbbc82 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -13,20 +13,20 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "41.2.0"; + version = "41.4.0"; format = "wheel"; - sha256 = "4380abcf2a4ffd1a5ba22d687c6d690dce83b2b51c70e9c6d09f7e8c7e8040dc"; + sha256 = "8d01f7ee4191d9fdcd9cc5796f75199deccb25b154eba82d44d6a042cf873670"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "19.2.3"; + version = "19.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "340a0ba40fdeb16413914c0fcd8e0b4ebb0bf39a900ec80e11c05d836c05103f"; + sha256 = "e100a7eccf085f0720b4478d3bb838e1c179b1e128ec01c0403f84e86e0e2dfb"; }; dontUseSetuptoolsBuild = true; From dc410db4ced1fae25b46a0c131f40cd32685ac26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:23:11 +0200 Subject: [PATCH 013/467] pythonPackages.pip: 19.2.3 -> 19.3 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 9892d02b3922..535489c65252 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pip"; - version = "19.2.3"; + version = "19.3"; format = "other"; src = fetchPypi { inherit pname version; - sha256 = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135"; + sha256 = "324d234b8f6124846b4e390df255cacbe09ce22791c3b714aa1ea6e44a4f2861"; }; nativeBuildInputs = [ bootstrapped-pip ]; From 501314c9e8b2dcecc76b5eb7a8fcae6b425efbe8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:23:21 +0200 Subject: [PATCH 014/467] pythonPackages.setuptools: 41.4.0 --- 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 c802d58a60a9..5053a46f4bf8 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "setuptools"; - version = "41.2.0"; + version = "41.4.0"; # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. # Instead, we override it to remove setuptools to avoid a circular dependency. # The same is done for pip and the pipInstallHook. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012"; + sha256 = "7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d"; }; nativeBuildInputs = [ From bff8343481572fd9971416b2480764550ec59b41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:24:15 +0200 Subject: [PATCH 015/467] python: pytest: 5.1.0 -> 5.2.1 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 1ddf52a33bd5..6088d78bba5e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.1"; pname = "pytest"; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031"; + sha256 = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0"; }; checkInputs = [ hypothesis mock ]; From 7181aca6d998b59af9bf170087220f83e9fb5028 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:39:59 +0200 Subject: [PATCH 016/467] update-python-libraries: handle other format --- .../python/update-python-libraries/update-python-libraries.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 2315e53220b9..3dc973fba392 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -194,6 +194,8 @@ def _determine_extension(text, fetcher): src_format = 'setuptools' elif src_format == 'flit': raise ValueError("Don't know how to update a Flit package.") + elif src_format == 'other': + raise ValueError("Don't know how to update a format='other' package.") extension = FORMATS[src_format] elif fetcher == 'fetchurl': @@ -326,4 +328,4 @@ def main(): if __name__ == '__main__': - main() \ No newline at end of file + main() From aedf4fc8fc41e2a982d7ecb14e8a53a43adddc72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:41:17 +0200 Subject: [PATCH 017/467] Revert "update-python-libraries: use version key for latest release (#68857)" This broke support for --target. This reverts commit e8c29fa77c2d08ecbc93754b681f2902b53bef79. --- .../update-python-libraries.py | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 3dc973fba392..e4a79d0c428c 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -116,11 +116,45 @@ SEMVER = { } +def _determine_latest_version(current_version, target, versions): + """Determine latest version, given `target`. + """ + current_version = Version(current_version) + + def _parse_versions(versions): + for v in versions: + try: + yield Version(v) + except InvalidVersion: + pass + + versions = _parse_versions(versions) + + index = SEMVER[target] + + ceiling = list(current_version[0:index]) + if len(ceiling) == 0: + ceiling = None + else: + ceiling[-1]+=1 + ceiling = Version(".".join(map(str, ceiling))) + + # We do not want prereleases + versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) + + if ceiling is not None: + versions = SpecifierSet(f"<{ceiling}").filter(versions) + + return (max(sorted(versions))).raw_version + + def _get_latest_version_pypi(package, extension, current_version, target): """Get latest version and hash from PyPI.""" url = "{}/{}/json".format(INDEX, package) json = _fetch_page(url) - version = json['info']['version'] + + versions = json['releases'].keys() + version = _determine_latest_version(current_version, target, versions) try: releases = json['releases'][version] @@ -132,7 +166,6 @@ def _get_latest_version_pypi(package, extension, current_version, target): sha256 = release['digests']['sha256'] break else: - logging.error("Release not found for extension: {}".format(extension)) sha256 = None return version, sha256 From 3e0150478594185f242fe0653e11fdf993a9f842 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:01 +0200 Subject: [PATCH 018/467] python: GitPython: 2.1.11 -> 2.1.14 --- pkgs/development/python-modules/GitPython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 24fe4a2458d6..78ef323255e4 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "2.1.11"; + version = "2.1.14"; pname = "GitPython"; src = fetchPypi { inherit pname version; - sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; + sha256 = "392f31eaadc19db35a54e3ab7285577fb4a86d96ecee08cf22a573f06633baab"; }; patches = [ From 7cf6312f1685e1953893717e09c1c3fdb8734e65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:01 +0200 Subject: [PATCH 019/467] python: Mako: 1.0.12 -> 1.0.14 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 85493f2760a3..ef665639d398 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.0.12"; + version = "1.0.14"; src = fetchPypi { inherit pname version; - sha256 = "0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162"; + sha256 = "f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b"; }; checkInputs = [ markupsafe nose mock pytest ]; From c465f71005a44969ce7049917c9ad213efeef910 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:01 +0200 Subject: [PATCH 020/467] python: adal: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/adal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 9f764df3376c..a2e4d015b2a0 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "b6edd095be66561382bdaa59d40b04490e93149fb3b7fa44c1fa5504eed5b8b9"; + sha256 = "5a7f1e037c6290c6d7609cab33a9e5e988c2fbec5c51d1c4c649ee3faff37eaf"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; From aa9af6be9a5f3a80e2e687baaead50be8454296e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 021/467] python: aenum: 2.1.2 -> 2.1.4 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 5962b309ee5c..b3db5aa7b811 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.1.2"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687"; + sha256 = "0644e5d19627beaaf01ca1a8349371f9de962eeb63c2b2c28045b2e674975b8c"; }; # For Python 3, locale has to be set to en_US.UTF-8 for From 5b668740d27c9d88465976f0ed4f4549e2fbbf27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 022/467] python: aiohue: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2b719ddf063d..258d5f10c958 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "3c23aed8e82f398b732279f5f7ee7ed00949ff2db7009f7a2dc705f7c2d16783"; + sha256 = "a7e545ae17658c10f2c5321e40b85426a8c284e5b33b5dfbe9171f9bdf37aa3e"; }; propagatedBuildInputs = [ aiohttp ]; From f7111acd5aaf54ee8642dcb96b04b3b946e87b59 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 023/467] python: aioresponses: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/aioresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 55120ad58038..13a9e4b546be 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ii1jiwb8qa2y8cqa1zqn7mjax9l8bpf16k4clv616mxw1l0bvs6"; + sha256 = "fab9607d11a2e05050ef766006b8fdd9424e7122c2bd6f34a5376be4c728e242"; }; nativeBuildInputs = [ From 399194531f5a2e30dd4ed100b358e9f17a593388 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 024/467] python: alembic: 1.0.10 -> 1.0.11 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index ddc3779749b8..334f0731c892 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.10"; + version = "1.0.11"; src = fetchPypi { inherit pname version; - sha256 = "828dcaa922155a2b7166c4f36ec45268944e4055c86499bd14319b4c8c0094b7"; + sha256 = "cdb7d98bd5cbf65acd38d70b1c05573c432e6473a82f955cdea541b5c153b0cc"; }; buildInputs = [ pytest pytestcov mock coverage ]; From 8d3a4e1ec99aaa5dafba09864e8d962a9f4e7737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 025/467] python: amqp: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index b8d9e8f2537a..8dad26bbb2ba 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0s2yxnnhhx9hww0n33yn22q6sgnbd6n2nw92050qv2qpc3i1ga8r"; + sha256 = "77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d"; }; checkInputs = [ pytest case pytest-sugar ]; From c18594692f02e52d71e18bae7c4c80b9f76b02e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 026/467] python: annoy: 1.16.0 -> 1.16.2 --- pkgs/development/python-modules/annoy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index e06f916d5a37..e3d32e6a0694 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.16.0"; + version = "1.16.2"; pname = "annoy"; src = fetchPypi { inherit pname version; - sha256 = "0jnm38kg7aw63mkd5113i3pb2p9fp5cia91jwhyg9sazb45bzpv9"; + sha256 = "41348e813fe7125eda3e2229a075eba3d065173ba6c5f20c545bb9c2932633fa"; }; checkInputs = [ From d38463e26b0ed89ae4335ab4c7db638b97633508 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 027/467] python: ansible-runner: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/ansible-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 79b1d8fcc977..fee714ed218c 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1j3jisiy93026ivd28j0c3p2j7ij6zm2k765yjknfx2gg3m5pk14"; + sha256 = "9db56a69ad5d43fe7656ad8efb4083cb1800ea400f7828af6b20f44c0882404f"; }; checkInputs = [ pytest mock ]; From 278bdf4c663d39c10857fd0c01845d653e2e4c39 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 028/467] python: apprise: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index c2c542a8c017..086273679b15 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "02apbzckj158995k9ls0gr1m9hfk7nw3ck0bp7k41srl5wdys72i"; + sha256 = "7a26fa03c4b83f03f17e8f8fc0b94d5502a12dc2e39b48e93a0ab0fd93151a95"; }; nativeBuildInputs = [ Babel ]; From b3e4f01653673582a7a37d950be341cc06a2c6d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 029/467] python: Arpeggio: 1.9.0 -> 1.9.2 --- pkgs/development/python-modules/arpeggio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 045707aee4dc..65cbd577e35f 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Arpeggio"; - version = "1.9.0"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732"; + sha256 = "948ce06163a48a72c97f4fe79ad3d1c1330b6fec4f22ece182fb60ef60bd022b"; }; # Shall not be needed for next release From dfac30de6b4e1c2f49321ac4462cbc3235991c9a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 030/467] python: astropy: 3.2.1 -> 3.2.2 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 35bb7b1aa59a..dea22cccb065 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.2.1"; + version = "3.2.2"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "706c0457789c78285e5464a5a336f5f0b058d646d60f4e5f5ba1f7d5bf424b28"; + sha256 = "8553f4a95e9938a0c7ae520633f7172356824b8eb324dd967fca6baf00ac19bf"; }; nativeBuildInputs = [ astropy-helpers ]; From ffcbccff61dc3f42f5cac7636aebda5812182078 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 031/467] python: astroquery: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/astroquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 7245b5662080..e1f36ffa8cfd 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0zw3xp2rfc6h2v569iqsyvzhfnzp7bfjb7jrj61is1hrqw1cqjrb"; + sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab"; }; # Fix tests using conftest.py from HEAD in the upstream GitHub From 1a5b45f31038b662e70c6e2aa5e0d09552602597 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 032/467] python: atomman: 1.2.6 -> 1.2.8 --- pkgs/development/python-modules/atomman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index a2f6cd721b72..ef69ee91d381 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.6"; + version = "1.2.8"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "19501bfdf7e66090764a0ccbecf85a128b46333ea232c2137fa4345512b8b502"; + sha256 = "0ed099fdceca2d733e81afb08d777e8e852a6e53660d6d268f3739b8d323ced9"; }; checkInputs = [ pytest ]; From 5ca116327cf8236eef0b367aa97c416406ed726f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:02 +0200 Subject: [PATCH 033/467] python: azure-cli-core: 2.0.71 -> 2.0.75 --- pkgs/development/python-modules/azure-cli-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix index f535a2431785..a4d05b4c11ee 100644 --- a/pkgs/development/python-modules/azure-cli-core/default.nix +++ b/pkgs/development/python-modules/azure-cli-core/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "azure-cli-core"; - version = "2.0.71"; + version = "2.0.75"; src = fetchPypi { inherit pname version; - sha256 = "01pqdh16l2c9a6b1az9galmm1szvhg7fyf9shq872wanw1xx88dj"; + sha256 = "6fde38f4448542c0cf7b13201b702c6927180e7294221b8f67e2c834f22ae1bc"; }; propagatedBuildInputs = [ From 44a3defe55c8e776cf97582a6f17dafe5d6138d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 034/467] python: azure-cli-telemetry: 1.0.3 -> 1.0.4 --- .../python-modules/azure-cli-telemetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix index 22b32e20eee3..5c1732cc0c42 100644 --- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix +++ b/pkgs/development/python-modules/azure-cli-telemetry/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "azure-cli-telemetry"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "0sf27pcz653h0cnxsg47nndilhqlw9fl019aqbnji2vn967r9rnl"; + sha256 = "1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577"; }; propagatedBuildInputs = [ From 9116aefca57796e5baffb1b200dc99fafb9700c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 035/467] python: azure-common: 1.1.21 -> 1.1.23 --- pkgs/development/python-modules/azure-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index b3c6f3fa1cc9..a61fd50786a2 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.21"; + version = "1.1.23"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "25d696d2affbf5fe9b13aebe66271fce545e673e7e1eeaaec2d73599ba639d63"; + sha256 = "53b1195b8f20943ccc0e71a17849258f7781bc6db1c72edc7d6c055f79bd54e3"; }; propagatedBuildInputs = [ From 10021be84b481dd7e89cd7d6e606c7db7f0d7243 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 036/467] python: backports.lzma: 0.0.13 -> 0.0.14 --- pkgs/development/python-modules/backports_lzma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 82025df8b9e9..997e4930ac7c 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -9,13 +9,13 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.lzma"; - version = "0.0.13"; + version = "0.0.14"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "50829db66f0445442f6c796bba0ca62d1f87f54760c4682b6d1489e729a43744"; + sha256 = "16d8b68e4d3cd4e6c9ddb059850452946da3914c8a8e197a7f2b0954559f2df4"; }; buildInputs = [ lzma ]; From f0e1baf9be12b745dc7dae41aa55f41b04452f3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 037/467] python: bidict: 0.18.2 -> 0.18.3 --- pkgs/development/python-modules/bidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index e3ceaa0dc9ab..e96e59dd7cf9 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.18.2"; + version = "0.18.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0br3ljvd56nqifr1mbwksvl5jjk40pihrrjlyn7hmc40yq6m5bvh"; + sha256 = "1742a25a9ef1b1ac4000683406879a3e1a6577faa02f31e482e6c84e2e3bf628"; }; nativeBuildInputs = [ setuptools_scm ]; From 2b0e249d97efa2ac992911fd24d0a0155d2ed753 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 038/467] python: billiard: 3.6.0.0 -> 3.6.1.0 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index dd4b548563cc..ca9bbc52cf10 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "billiard"; - version = "3.6.0.0"; + version = "3.6.1.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84"; + sha256 = "b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26"; }; checkInputs = [ pytest case psutil ]; From ae1df396d1e9e2efa2e48a188bb7cb5d5d5a0381 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 039/467] python: blis: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 6afbe0e2f5d2..ca6d5d62442f 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1khh02z6wryrnrxlx2wrxzhaqsg5hlgypy0643rvi4zcqanvdpym"; + sha256 = "d69257d317e86f34a7f230a2fd1f021fd2a1b944137f40d8cdbb23bd334cd0c4"; }; nativeBuildInputs = [ From fb678c4eac42591c1e47a9107a8bb7bfd9e04fd6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 040/467] python: boto3: 1.9.205 -> 1.9.250 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 34178befebe4..cdaabec50f3a 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.205"; # N.B: if you change this, change botocore too + version = "1.9.250"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171"; + sha256 = "95f70eda4bd6756e297a7c89739571cbc5cd474620142e5cbe19810529d6ec1f"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From fc70591dcaf2dfd753cc9e85bfbf79cb0b13559d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 041/467] python: botocore: 1.12.205 -> 1.12.250 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e1465e86b0e7..60856836a502 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.250"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; + sha256 = "ef3257f05efb5b54e447bfeae9802f7e82d0477ee26be8601a1e3611b317aba5"; }; outputs = [ "out" "dev" ]; From 805596ab05d60d3e2765c7474bcf586f1736b65e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 042/467] python: bottle: 0.12.16 -> 0.12.17 --- pkgs/development/python-modules/bottle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 6e1eb5ced000..f36a84b85ca4 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.16"; + version = "0.12.17"; src = fetchPypi { inherit pname version; - sha256 = "9c310da61e7df2b6ac257d8a90811899ccb3a9743e77e947101072a2e3186726"; + sha256 = "e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c"; }; propagatedBuildInputs = [ setuptools ]; From 2e695be35ccbbeff0d39abd7a946279787723978 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 043/467] python: breathe: 4.13.0 -> 4.13.1 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 9a4a26e18b03..08e37e2773c7 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.13.0"; + version = "4.13.1"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "08xs1cqpvcv7735j19c35br34gbwzfn89rkg12n2yfz4af0x3xfp"; + sha256 = "c6752345252f48092bf72a450fd9e84367bd5b4af99d86c92047f82c6c2287ab"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 8f9cb8a7daafa8f3f274243b01ad69f9841f6714 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:03 +0200 Subject: [PATCH 044/467] python: zc.buildout: 2.13.1 -> 2.13.2 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 70dd13cf3b40..c33006377df0 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; + sha256 = "5dd4de86dda684c46ef8ee9cc84e335ca7f6275d4363a684de82225270d1e328"; }; patches = [ ./nix.patch ]; From f831efd7150cb70bdd2fc95f92201c01f6859437 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 045/467] python: bumps: 0.7.12 -> 0.7.13 --- pkgs/development/python-modules/bumps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index ccbbf67c596a..05506a12db00 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.12"; + version = "0.7.13"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0a8m56bwyi0gdrf3kgkdw3cajyxlr40qrj1xlh5yn4qqjbz7ym02"; + sha256 = "fdcf335b800d892edfdbc87fdd539cb45166d8667edbec3dfbb1a3b5c3a35547"; }; meta = with stdenv.lib; { From 4847d6086690e9b3bc68dc7e3016e85ee98a4f0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 046/467] python: python-can: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/can/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index b87e526dc452..b9d2b4b7751a 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd"; + sha256 = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e"; }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; From cb73e0ee0b37fbc822e61119db01330499ae564e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 047/467] python: cheroot: 6.5.6 -> 6.5.8 --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 9b3050942a88..680cc9322767 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv) lib; in buildPythonPackage rec { pname = "cheroot"; - version = "6.5.6"; + version = "6.5.8"; src = fetchPypi { inherit pname version; - sha256 = "b824f9961eb447809badeb051820a05770354e2f9ae5c355eecc21f22633c217"; + sha256 = "427e7e3ce51ad5a6e5cf953252b5782d5dfbeb544c09910634971bc06df6621b"; }; patches = [ ./tests.patch ]; From 8209c9b5b3000758a05d59cd538d281c641b0155 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 048/467] python: click-completion: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/click-completion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 2921970ff28a..79d85a81c379 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "click-completion"; - version = "0.5.1"; + version = "0.5.2"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "1ysn6kzv3fgakn0y06i3cxynd8iaybarrygabk9a0pp2spn2w1vq"; + sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"; }; propagatedBuildInputs = [ click jinja2 shellingham six ]; From 51c3e7fd407a4cf086b80fc2f228c3cc7e4b9b56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 049/467] python: cmd2: 0.9.17 -> 0.9.19 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index d2b3076d28e1..6db6c93a2628 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.17"; + version = "0.9.19"; src = fetchPypi { inherit pname version; - sha256 = "0sp4m5xg8ms3ikps0c6qd51f9cab4ca9byl865bklm9vxc1adgkp"; + sha256 = "c81284083d993af18b8fef57d89d854d49d051d4c2c8a8e12d0281e369ac3682"; }; LC_ALL="en_US.UTF-8"; From 065b5608bfa121a6c3a6adac7f23d8d41153824b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 050/467] python: configparser: 3.7.4 -> 3.7.5 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 7fce23f89c11..8f06951165b6 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.7.4"; + version = "3.7.5"; src = fetchPypi { inherit pname version; - sha256 = "da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"; + sha256 = "9395033080372df999e206387b295946928e2886dd64c5fee7db7ff36c6c6f8e"; }; # No tests available From 16879d28a38fb7963268033bb9239ec0498a3c62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 051/467] python: coverage: 4.5.3 -> 4.5.4 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index b6eb73a80386..dfe86b360651 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.5.3"; + version = "4.5.4"; src = fetchPypi { inherit pname version; - sha256 = "9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609"; + sha256 = "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"; }; # No tests in archive From bee616689b0ade25bdf98d7ecedd175e4db7c086 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 052/467] python: dask-mpi: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/dask-mpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 1bba260e2a03..0ae783c9865c 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.0.2"; + version = "1.0.3"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv"; + sha256 = "e81ca2269eb96f928b2c308aa5eb687e114e5b470924ca8d480fe3bc1b599c6b"; }; checkInputs = [ pytest requests ]; From 5e6fba72143c19cfe3de0bc8a80b019fde26379e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 053/467] python: dask-xgboost: 0.1.5 -> 0.1.7 --- pkgs/development/python-modules/dask-xgboost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 5dfcd2f415b9..50ebaf6be4d2 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.1.7"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "1860d06965fe68def1c83b9195130a92050fd4bc28bf2be689898a3a74ee1316"; + sha256 = "c4eb7989e0b4bcab956c5ab5f89c3419016615ad1ca8f6596ca471e402aae43b"; }; checkInputs = [ pytest scikitlearn ]; From a7c063f0845a989c2182397a422fb4a9c059468e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 054/467] python: DataModelDict: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/datamodeldict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index cd7d6eb8cccd..d23ecec169af 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.9.6"; pname = "DataModelDict"; src = fetchPypi { inherit pname version; - sha256 = "afa15c137c09e7d937e31c8956fd8092be0251c9869a6b7c1d0f81c0901bc47d"; + sha256 = "857d4bf33f0b26ca718bd821fda7502dd6fb15aa09201b1fbdfaf4dfc85b8f6c"; }; propagatedBuildInputs = [ xmltodict ]; From 9bf1f090346d896e4bc8471ab5a3e657ea16fb2a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 055/467] python: dateparser: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/dateparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 22787df8bb64..9c406671f780 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "dateparser"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "42d51be54e74a8e80a4d76d1fa6e4edd997098fce24ad2d94a2eab5ef247193e"; + sha256 = "e1eac8ef28de69a554d5fcdb60b172d526d61924b1a40afbbb08df459a36006b"; }; checkInputs = [ nose mock parameterized six glibcLocales ]; From 1383e74e0d37a22a43973ba8d7a6cd6720102b17 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:04 +0200 Subject: [PATCH 056/467] python: python-debian: 0.1.34 -> 0.1.36 --- pkgs/development/python-modules/debian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index fc9b9017cc99..4399e6bc83ef 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.34"; + version = "0.1.36"; src = fetchPypi { inherit pname version; - sha256 = "a02e073214e9f3a371f7ec0ff8b34dd82bd4941194dd69c49ad80b321b9d887e"; + sha256 = "c953bb0c54e96887badd2324cc66e1887bf2734f301882cd4fe847a844b518a6"; }; propagatedBuildInputs = [ chardet six ]; From 27621cc1081be024b7c49d4b273f64d64aa3289a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 057/467] python: deform: 2.0.7 -> 2.0.8 --- pkgs/development/python-modules/deform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index e1c37fe6eadd..8ebd3ef47bde 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "deform"; - version = "2.0.7"; + version = "2.0.8"; src = fetchPypi { inherit pname version; - sha256 = "2ff29c32ebe544c0f0a77087e268b2cd9cb4b11fa35af3635d5b42913f88d74a"; + sha256 = "8936b70c622406eb8c8259c88841f19eb2996dffcf2bac123126ada851da7271"; }; postPatch = '' From 458346c704e3176b11680d181d43f27a08f6927d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 058/467] python: dependency-injector: 3.14.10 -> 3.14.12 --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index e135d8c7bc6a..b5a3a869b697 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.10"; + version = "3.14.12"; src = fetchPypi { inherit pname version; - sha256 = "1c475axh40f8s4n5dqm52qczx9g2g8b8wsy0qvghirk84ikpca5y"; + sha256 = "c0b593d30a9dcafd71459075fac14ccf52fcefa2094d5062dfc2e174c469dc03"; }; propagatedBuildInputs = [ six ]; From 58f20f9e3e32a2c3ff411c16d297b0e753269661 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 059/467] python: dftfit: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/dftfit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 016a3a919f15..9095eb962fec 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "dftfit"; - version = "0.5.0"; + version = "0.5.1"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "fd9e777157669d004e7c25adce3e7c697234283384c99aa0c23454173a14a7a8"; + sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; }; buildInputs = [ pytestrunner ]; From b63267a38aff38cfb5af9aeda7ecf9fa7e149910 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 060/467] python: django-cors-headers: 3.1.0 -> 3.1.1 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index a91d6bf28705..358f2ab1be44 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0g1vqhc36ay518vs67kkf6w76ay27dc73w145bpwgp9fky81r6z6"; + sha256 = "5762ec9c2d59f38c76828dc1d4308baca4bc0d3e1d6f217683e7a24a1c4611a3"; }; propagatedBuildInputs = [ django ]; From 2d7d1edf3ffc6ec33f1fa137465f0c2506f925f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 061/467] python: django-multiselectfield: 0.1.8 -> 0.1.9 --- .../python-modules/django-multiselectfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index e2db26fe26bb..b10424de396b 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "52483d23aecbf6b502f9e6806e97da9288d5d7f2a3f99f736390763de68c8fd7"; + sha256 = "54fa3886884cbc5d9c2f523e0e4af2cc3b976bd077718b2b443a5be44eb481ec"; }; propagatedBuildInputs = [ django ]; From c247b917bf798a4472d02f6dcc50eb6c63b2b9b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 062/467] python: django-pglocks: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/django-pglocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index b2ee7b6f6442..cb8c5f526306 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-pglocks"; - version = "1.0.2"; + version = "1.0.3"; meta = { description = "PostgreSQL locking context managers and functions for Django."; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ks4k0bk4457wfl3xgzr4v7xb0lxmnkhxwhlp0bbnmzipdafw1cl"; + sha256 = "daa3323de355b9057d8f37143e2ae8d283925fd25128ab66bb8c700d000111d9"; }; buildInputs = [ django ]; From 7ee1098a978d78a01103d2691df27f0a6c8a7ccb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 063/467] python: django-q: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/django-q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index f671674ffe2e..7ceee27e6f4e 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "17mqxiacsp2yszak6j48fm7vx0w44pcg86flc63r9y5yhx490n5r"; + sha256 = "70081f58c6d78748d8664acbf028fb641687c36df38d3d31e9f1b6fcfac1079f"; }; propagatedBuildInputs = [ From a4b2ff6b87ec7c86ae0196578811d0bf966b3b01 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 064/467] python: Django: 2.1.11 -> 2.1.13 --- pkgs/development/python-modules/django/2_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index 78d595082a46..f8598c1e819b 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.11"; + version = "2.1.13"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1m9bs78sh91slsjxkhxgkg715gbsgph9ky7d74czs0z2mhg86h8s"; + sha256 = "7a28a4eb0167eba491ccfafd7006843b5cdd26d8c93b955a74c2ea74f94efc2c"; }; patches = stdenv.lib.optionals withGdal [ From ea7d64bab02544287f130432e023ed8dec1c2383 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 065/467] python: Django: 2.2.5 -> 2.2.6 --- pkgs/development/python-modules/django/2_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 95fd8a769289..eccf694425e8 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.5"; + version = "2.2.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0mpxmckd1mah0yrp6n8vjk6mq7hxf6d5xcbk6rcmi6z572h0mdyy"; + sha256 = "a8ca1033acac9f33995eb2209a6bf18a4681c3e5269a878e9a7e0b7384ed1ca3"; }; patches = stdenv.lib.optional withGdal From 0a26590f0392f8365d7a7ad3c881dca9441723ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 066/467] python: djangoql: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/djangoql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index a2bf586442c8..df8d62e9bdc9 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.13.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "0hkg0zh8w6f4krbrv4nl66blrx48yixgc8ikf915415ghlqfsbjj"; + sha256 = "366293d7d4e416f9f7d6e2b98775c2129222fbb4dc660f3e6c7b9e35a3cf3fce"; }; propagatedBuildInputs = [ ply ]; From 1f6a3d8077dbb3aaa4af57bf1d81d458b71f4485 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 067/467] python: dkimpy: 0.9.3 -> 0.9.5 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index e4ec38c1a7f8..60c5dc24b113 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "0.9.3"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "1rnnax2blmwk6404yrnhswp50xbp2h192rd2l6mra5lh3rg36zvd"; + sha256 = "6bf47aa71bc466f5d6a201042317fb415fbc45f3cae4f5dbe1e337e235549ff2"; }; checkInputs = [ pytest ]; From 0680417f967296a8c55d69596fc68863caa7afca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 068/467] python: drms: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/drms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 4d322695ebf2..975ec8400b2b 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "drms"; - version = "0.5.6"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "95cac0e14532893a44eeab8e329ddb76150e6848153d8cb1e4e08ba55569e6af"; + sha256 = "ab3ec6d072b1980f77dadf3b2cb0fe56c648eaf927ea381f606b4db66d4cbff2"; }; propagatedBuildInputs = [ From 1900c88b7bae0b1357e35210e5f17fe0e5bfe8ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:05 +0200 Subject: [PATCH 069/467] python: dulwich: 0.19.11 -> 0.19.13 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 5ab65ace69f5..ae6507c44428 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.11"; + version = "0.19.13"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725"; + sha256 = "aa628449c5f594a9a282f4d9e5993fef65481ef5e3b9b6c52ff31200f8f5dc95"; }; LC_ALL = "en_US.UTF-8"; From 6b125ada801cd2c6ab5ad067726d3fcdc70e62d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 070/467] python: ecdsa: 0.13.2 -> 0.13.3 --- pkgs/development/python-modules/ecdsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 95e1835198e0..825cc0df56ca 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.13.2"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884"; + sha256 = "163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d"; }; # Only needed for tests From 22f9eb3a61b0ab3e3840b0aa42ca628664fbb773 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 071/467] python: elasticsearch: 7.0.2 -> 7.0.5 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index dc991f529fcb..e9c65018f674 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.0.2"; + version = "7.0.5"; src = fetchPypi { inherit pname version; - sha256 = "cbc73831c63fa2824538df76fcb2c4be007b43dbd9e7788ae70ea6d24109925b"; + sha256 = "693935914d59a517dfffdaab547ff906712a386d9e25027517464960221cbd4c"; }; # Check is disabled because running them destroy the content of the local cluster! From 4f353216506cbad3951a404c1db8c1dc52235d5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 072/467] python: enum-compat: 0.0.2 -> 0.0.3 --- pkgs/development/python-modules/enum-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index 29c8184bd4e8..e95eb089bc47 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "enum-compat"; - version = "0.0.2"; + version = "0.0.3"; src = fetchPypi { inherit pname version; - sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + sha256 = "3677daabed56a6f724451d585662253d8fb4e5569845aafa8bb0da36b1a8751e"; }; propagatedBuildInputs = [ enum34 ]; From b75781027dec4041b7508c94b2ac7b48ddcab862 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 073/467] python: Eve: 0.9 -> 0.9.2 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index e23821a48e46..2e913edf03a9 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.9"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "18shfaxa1vqshnyiqx3jqsri2wxz9ibip3mdxaz8pljmk734r4b1"; + sha256 = "0191ed42ef85d747758bba29df5ff1e296b8152fefddb2f75c3d778c2e6fb9d3"; }; propagatedBuildInputs = [ From 6807901adcf77c7ccd9f7b84f81085a1e41a8faa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 074/467] python: execnet: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/execnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index c7766802e4e4..bc7b67f52d42 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "execnet"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2"; + sha256 = "cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50"; }; checkInputs = [ pytest ]; From eca801a4b04d0a143fe7864c739c473ec381b246 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 075/467] python: Faker: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index e597e07ca364..7aed501a8105 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -16,11 +16,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "1jins8jlqyxjwx6i2h2jknwwfpi0bpz1qggvw6xnbxl0g9spyiv0"; + sha256 = "6886d58f3c24d8ecdaa3740b138121614197ffd3e0adfb0cb02ca4e71e292dfe"; }; buildInputs = [ pytestrunner ]; From 7ae2859d71b7484fbac1d257cc83e1bb8410c124 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 076/467] python: flake8-debugger: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/flake8-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 32e9a08b7414..3935092fdaae 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-debugger"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97"; + sha256 = "103d86d2ecb95f8aab90f90603446f4e2bb60e01f1593e4fec410074dedabac6"; }; nativeBuildInputs = [ pytestrunner ]; From df015bc3e6e9fb38bd040de4ec325d663d41062d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 077/467] python: flake8: 3.7.7 -> 3.7.8 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 7016e69bd0c1..a10fccfc911d 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.7"; + version = "3.7.8"; src = fetchPypi { inherit pname version; - sha256 = "859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661"; + sha256 = "19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548"; }; checkInputs = [ pytest mock pytestrunner ]; From 4dbc60aa8e51b03cef34a5ff5c46f311c72c5b33 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 078/467] python: Flask-SQLAlchemy: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 2ff84f2531b0..02d8d25bafee 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc"; + sha256 = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d"; }; propagatedBuildInputs = [ flask sqlalchemy ]; From 9e9fbcbcb7fd03e7fa768b5457764c0aead178f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 079/467] python: fs-s3fs: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/fs-s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 26277161b0bc..cb9723742dc0 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fs-s3fs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418"; + sha256 = "b57f8c7664460ff7b451b4b44ca2ea9623a374d74e1284c2d5e6df499dc7976c"; }; propagatedBuildInputs = [ fs six boto3 ]; From a081e6a0a3895d7b2d316117fdeeb07a26dbea02 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 080/467] python: fs: 2.4.8 -> 2.4.11 --- pkgs/development/python-modules/fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index cbbb88868468..8cb35c23bb59 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.8"; + version = "2.4.11"; src = fetchPypi { inherit pname version; - sha256 = "5e19251e939b10d50e4b58b0cf2862851794abcf4aa4387b67c69dd61e97b3dc"; + sha256 = "cc99d476b500f993df8ef697b96dc70928ca2946a455c396a566efe021126767"; }; buildInputs = [ glibcLocales ]; From a846a8652aa7d814e18d65b75531e070a70a6bf0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:06 +0200 Subject: [PATCH 081/467] python: fsspec: 0.4.1 -> 0.4.5 --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 8f4b9cf8c890..5592150eae63 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fsspec"; - version = "0.4.1"; + version = "0.4.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0fvm1kdnnbf0pppv23mlfdqh220gcldmv72w2rdxp6ks1rcphzg3"; + sha256 = "824e406f5628cfde927ac945acf4ff70bc712b8bd204d7b99fe127993254db70"; }; # no tests From 30515fd1c00433a5efe7b8198398cb1f3d793a3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 082/467] python: gensim: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 18815cfe64b5..592db824f3f1 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.8.0"; + version = "3.8.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rjpmxcd4hphq41y7frg6by6gwjjmrdbnim8jvx951ps5gzyfpgc"; + sha256 = "33277fc0a8d7b0c7ce70fcc74bb82ad39f944c009b334856c6e86bf552b1dfdc"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; From a41e0034acb0905ed20b34050f862bf306fbf43a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 083/467] python: gitdb2: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/gitdb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix index 2b6a118885c7..ff4cc913f034 100644 --- a/pkgs/development/python-modules/gitdb2/default.nix +++ b/pkgs/development/python-modules/gitdb2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gitdb2"; - version = "2.0.5"; + version = "2.0.6"; src = fetchPypi { inherit pname version; - sha256 = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2"; + sha256 = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350"; }; propagatedBuildInputs = [ smmap2 ]; From 5ecf592b7e6c8e030c8b735b29615993646569fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 084/467] python: google-auth-oauthlib: 0.4.0 -> 0.4.1 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 2cc1513812fa..54498ba1a853 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1fl3w23c93hlgqf0l57cdy17wmvyhrv3bh133ksd2h490ir012va"; + sha256 = "88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd"; }; checkInputs = [ From 322f9123961b827d5205a6c6ba2f136ef5a42a51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 085/467] python: google-cloud-bigquery: 1.9.0 -> 1.9.1 --- .../python-modules/google_cloud_bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 1646888b36ad..21a6013ccf3e 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f"; + sha256 = "aacba434c54b1ecc83527d6fa06ffc0938a7af109e292ed1f2cfd56d567a0a29"; }; checkInputs = [ pytest mock ipython ]; From 38fc9ef31242224bd13306d21a6c1776f518870d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 086/467] python: google-cloud-storage: 1.15.1 -> 1.15.2 --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index efb0c6aacd8c..c60c87247932 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.15.1"; + version = "1.15.2"; src = fetchPypi { inherit pname version; - sha256 = "8032e576e2f91a1d3de2355118040c3bcd9916e0453a6b3f64c1b42ed151690a"; + sha256 = "23e3d09f44f86128b754518c81492fac673ea39f7230356c126140f877c231c8"; }; checkInputs = [ pytest mock ]; From bcfc308feca6d37e847ae4f6cc22ff50b5d969dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 087/467] python: google-resumable-media: 0.3.2 -> 0.3.3 --- .../python-modules/google_resumable_media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 096f93b017f4..edd86cccb489 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "3e38923493ca0d7de0ad91c31acfefc393c78586db89364e91cb4f11990e51ba"; + sha256 = "49493999cf046b5a02f648e201f0c2fc718c5969c53326b4d2c0693b01bdc8bb"; }; checkInputs = [ pytest mock ]; From aa84a182defb63d073d55d3e0858b7a8441fe97e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 088/467] python: grpcio-tools: 1.23.0 -> 1.23.1 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index cb6e47a60026..d51c31fc2ee2 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.23.0"; + version = "1.23.1"; src = fetchPypi { inherit pname version; - sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db"; + sha256 = "c2f5306153dee33bc04212802c898cf79539917e31cf07516f31c2943bea2160"; }; enableParallelBuilding = true; From 771b4adad928e204d9870135212ac366d198ea6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 089/467] python: guessit: 3.0.4 -> 3.0.5 --- pkgs/development/python-modules/guessit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 494860d4dc27..d24fd20234ba 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.0.4"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "1h9f4car26mkck360dxaf9ccdff3inbvpqyz4la2w3zjsz03x01p"; + sha256 = "3559c2f37575b048c3d8723cc7a8eedb83b6c411d1be0d64e8b54f4b90138ca2"; }; # Tests require more packages. From 6edaaa7288105024c268899d45a671f7d3810633 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 090/467] python: gym: 0.12.5 -> 0.12.6 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index e27aed0627b3..fbe068fa44c0 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.12.5"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "027422f59b662748eae3420b804e35bbf953f62d40cd96d2de9f842c08de822e"; + sha256 = "90f53ec8291063abb4654eddeaac2a3a23152438a38c39830d3a3f3fc6a7ca59"; }; propagatedBuildInputs = [ From 6d6f5128240435bb5e1dd84a26a7b09851e69797 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 091/467] python: hdbscan: 0.8.22 -> 0.8.23 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 02f888b175dc..4566e43c0bd3 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.22"; + version = "0.8.23"; src = fetchPypi { inherit pname version; - sha256 = "5cfdc25375123eb9a72363449979141cc928c1953f220f0f81d7baabcaccec2d"; + sha256 = "ff60c66591452ceb6bdb7592c560a1ebc7e128a02dd3880e048861f7fea7f78d"; }; checkInputs = [ nose ]; From 6f5ea551ba5f6433f184b2d4092fe375f8eec6bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 092/467] python: HeapDict: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/heapdict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 34c01091ddf2..841c3a452595 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "HeapDict"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; + sha256 = "8495f57b3e03d8e46d5f1b2cc62ca881aca392fd5cc048dc0aa2e1a6d23ecdb6"; }; doCheck = !isPy3k; From 41c49645d6dbdb679578187fc8359000d011bb95 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:07 +0200 Subject: [PATCH 093/467] python: hiro: 0.5 -> 0.5.1 --- pkgs/development/python-modules/hiro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 4d9ebdb0129e..ea6cb6d34e36 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; - version = "0.5"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "57d9dac63077f24c3d0132c02ac5c71e4bd1d79bdac30dccad4c83fadd49fa1c"; + sha256 = "d10e3b7f27b36673b4fa1283cd38d610326ba1ff1291260d0275152f15ae4bc7"; }; propagatedBuildInputs = [ six mock ]; From 43ba2a06771e1292352b4fe32ccb579c8bc892f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 094/467] python: holoviews: 1.12.5 -> 1.12.6 --- 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 07be912a65a4..1bc8f10241d9 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.12.5"; + version = "1.12.6"; src = fetchPypi { inherit pname version; - sha256 = "15cay2fnhwqr42s4hiq37b8q87sir5k59p14g96mvg5p0gjnhg3w"; + sha256 = "4f6ad184fb6136e5ee37a74b5276825fc3d5fce5033ff3c8db8831ec11ea2e75"; }; propagatedBuildInputs = [ From f6d7058a41d1b1f3a3e72958b2604f245599da7c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 095/467] python: hopcroftkarp: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/hopcroftkarp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index 4acf05b41426..e6033aa347e9 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "hopcroftkarp"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "cc6fc7ad348bbe5c9451f8116845c46ae26290c92b2dd14690aae2d55ba5e3a6"; + sha256 = "28a7887db81ad995ccd36a1b5164a4c542b16d2781e8c49334dc9d141968c0e7"; }; # tests fail due to bad package name From 4d0c23db68b1bb3789f339b1bd771c7997780157 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 096/467] python: httpretty: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/httpretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 3a76bd9f148b..86b8ef13a7ae 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "httpretty"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc"; + sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; }; propagatedBuildInputs = [ six ]; From 995772fbfa82e7f843d9d2e93ae07d7fa05143b5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 097/467] python: ijson: 2.5 -> 2.5.1 --- pkgs/development/python-modules/ijson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 8110a646bc4b..8729de427d96 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.5"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "08ppzz4my7dbs5bsdv3r1yn8bx8ijqmk5hjfdblrzrxhj184v4bs"; + sha256 = "19ec46a2f7991004e5202ecee56c569616b8a7f95686ad7fd0a9ec81cac00269"; }; doCheck = false; # something about yajl From 597a78d8cdb0d41ee5f4141f25dc499194a01817 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 098/467] python: impacket: 0.9.15 -> 0.9.20 --- pkgs/development/python-modules/impacket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index e4e14cf7bbf8..1d71b15137c7 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.9.15"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - sha256 = "1sq1698g7wqj731h24f7gr4lc0fz0mxrqv6mm3j4hm2j6h3rrbr6"; + sha256 = "43ebdb62e179113a55ccd4297316532582be71857b85d85ba187cd6146757397"; }; disabled = isPy3k; From d3c53cea4c735e87d1ea511b4724b18aaeced4be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 099/467] python: imutils: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/imutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index c5530d7c1d09..45e795cd616c 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.5.2"; + version = "0.5.3"; pname = "imutils"; src = fetchPypi { inherit pname version; - sha256 = "1d2bdf373e3e6cfbdc113d4e91547d3add3774d8722c8d4f225fa39586fb8076"; + sha256 = "857af6169d90e4a0a814130b9b107f5d611150ce440107e1c1233521c6fb1e2b"; }; propagatedBuildInputs = [ opencv3 ]; From 647fc0c164c9df9e4b499e662b24ba0ca4a2f0f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 100/467] python: ipykernel: 4.10.0 -> 4.10.1 --- pkgs/development/python-modules/ipykernel/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix index 49dfbf6ad8ec..9ef4a96366d5 100644 --- a/pkgs/development/python-modules/ipykernel/4.nix +++ b/pkgs/development/python-modules/ipykernel/4.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "4.10.0"; + version = "4.10.1"; src = fetchPypi { inherit pname version; - sha256 = "699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad"; + sha256 = "eeb74b2bcfe0ced5a7900361f98fa1171288aa47ed4b522efe5acb167c6cf5fb"; }; checkInputs = [ nose ] ++ lib.optional isPy27 mock; From 7a4912c5087a5891b1daba7c39ffaece2ace4be5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 101/467] python: ipywidgets: 7.5.0 -> 7.5.1 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index fd71569e293e..20f91f5e806f 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.5.0"; + version = "7.5.1"; src = fetchPypi { inherit pname version; - sha256 = "cb263c6974aca902d00a435711823bb4aaf6614a5f997f517e15fa84151e8fa2"; + sha256 = "e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97"; }; # Tests are not distributed From 97712f956a420ca14ff63c893d091a0a37f2b088 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 102/467] python: isort: 4.3.20 -> 4.3.21 --- pkgs/development/python-modules/isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 979213f945be..6cc2570ab36a 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -5,11 +5,11 @@ let testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; in buildPythonPackage rec { pname = "isort"; - version = "4.3.20"; # Note 4.x is the last version that supports Python2 + version = "4.3.21"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "c40744b6bc5162bbb39c1257fe298b7a393861d50978b565f3ccd9cb9de0182a"; + sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"; }; propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; From 631d365d2e26905de7a58002447f06fa863eac30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 103/467] python: jeepney: 0.4 -> 0.4.1 --- pkgs/development/python-modules/jeepney/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 8b1100cd3f40..04e47ff6b581 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.4"; + version = "0.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0w1w1rawl9k4lx91w16d19kbmf1349mhy8ph8x3w0qp1blm432b0"; + sha256 = "13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb"; }; propagatedBuildInputs = [ From ecec1317017e4e33d5249f86ac8021f0fee5a36b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 104/467] python: Jinja2: 2.10.1 -> 2.10.3 --- pkgs/development/python-modules/jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index c8b7f740363d..862e5a7802eb 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "2.10.1"; + version = "2.10.3"; src = fetchPypi { inherit pname version; - sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"; + sha256 = "9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de"; }; checkInputs = [ pytest ]; From 982da9492aa50f3c7f5050792882291546e067e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 105/467] python: jsbeautifier: 1.10.0 -> 1.10.2 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 10d0004f74a5..4c77a07da02e 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.10.0"; + version = "1.10.2"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108"; + sha256 = "a5ce5195c0b54a68eb813649829143373823ca28caa4d7aa682442b87ebea1ce"; }; meta = with lib; { From 214f752f5d9df6d19e435d7465ce24916b76f474 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:08 +0200 Subject: [PATCH 106/467] python: jupyter_client: 5.3.1 -> 5.3.4 --- 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 01830514b46b..e5dec4c98e2a 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 = "5.3.1"; + version = "5.3.4"; src = fetchPypi { inherit pname version; - sha256 = "102qgc7isfxwq0zsj6m9apcyj2hk8c8c4fz7656lxlpmvxgazs4q"; + sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; }; propagatedBuildInputs = [ From 8d0996fb469272c5e71655fe3a7067683cf2b1a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 107/467] python: jupyterlab_server: 0.3.0 -> 0.3.4 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index b74e31c39f35..57fa31533288 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "0.3.0"; + version = "0.3.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "13b728z5ls0g3p1gq5hvfqg7302clxna5grvgjfwbfzss0avlpjc"; + sha256 = "ae0c8629b9f0196b314f017e374a70a702522739f4f08bece84963af5e8c8351"; }; checkInputs = [ requests pytest ]; From 034da53bd8f78c420c9b17fe37ebda1cef2f3ae7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 108/467] python: jupytext: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index c0b89ddddbd3..2bb7e22b0970 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "0a2c00bncf68havs3msra6jkx8frbv3yal56mk85wnkwhzlahj0c"; + sha256 = "490e1127033fceed5c49f7b1cde6aabffb059fe0a778a0e8b10d28d9eecef1f0"; }; propagatedBuildInputs = [ From 777a09353ff345b496fb53199bd7b494d6017b7c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 109/467] python: kafka-python: 1.4.6 -> 1.4.7 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 891aa3f33941..52c6e64aa10a 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.6"; + version = "1.4.7"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "08f83d8e0af2e64d25f94314d4bef6785b34e3b0df0effe9eebf76b98de66eeb"; + sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada"; }; checkInputs = [ pytest six mock ]; From 2d2a2b7669788389a17a126189478067e0897cf5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 110/467] python: Keras_Applications: 1.0.7 -> 1.0.8 --- .../development/python-modules/keras-applications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index c6fdd21d2ebe..54509f04e71c 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Applications"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "1yk9brcvr96s1slpgj9vr6np7fk8limcrw9v2pjq72c6k0mpnq30"; + sha256 = "5579f9a12bcde9748f4a12233925a59b93b73ae6947409ff34aa2ba258189fe5"; }; # Cyclic dependency: keras-applications requires keras, which requires keras-applications From 05e626d5b78937a443fcc3f48e85b664ec471d89 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 111/467] python: Keras: 2.2.4 -> 2.2.5 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index dde820876d81..b772d820a8b3 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.2.4"; + version = "2.2.5"; src = fetchPypi { inherit pname version; - sha256 = "90b610a3dbbf6d257b20a079eba3fdf2eed2158f64066a7c6f7227023fd60bc9"; + sha256 = "0fb448b95643a708d25d2394183a2f3a84eefb55fb64917152a46826990113ea"; }; checkInputs = [ From fdad811ed5b52d87a780ff9dd5988431796e083d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 112/467] python: kombu: 4.6.3 -> 4.6.5 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index fef8345a980e..759b9d2a440e 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.3"; + version = "4.6.5"; src = fetchPypi { inherit pname version; - sha256 = "eb365ea795cd7e629ba2f1f398e0c3ba354b91ef4de225ffdf6ab45fdfc7d581"; + sha256 = "c9078124ce2616b29cf6607f0ac3db894c59154252dee6392cdbbe15e5c4b566"; }; postPatch = '' From fd8dbe5339be789c49e27781af5496118605353e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 113/467] python: lxml: 4.3.3 -> 4.3.5 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index fca4366e8a0e..f054f26a527d 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.3.3"; + version = "4.3.5"; src = fetchPypi { inherit pname version; - sha256 = "4a03dd682f8e35a10234904e0b9508d705ff98cf962c5851ed052e9340df3d90"; + sha256 = "738862e9724d201f1aa8394cb666d8136d666198e97d6e1e5c9876ad884a86b3"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; From eaa4df679cface97f6d294624ca061fc24593e54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 114/467] python: mapsplotlib: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/mapsplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index a046cfd96102..be21fb3e836c 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mapsplotlib"; - version = "1.1.2"; + version = "1.1.3"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "99ff773a298bdf0f3185a4c7ac20677a843df818583b368925dcf766cd99f09a"; + sha256 = "9214a2ddc5157fc6fef7659db7c1fa1c096b4d79f543cc2eeb2c5fc706b89c98"; }; propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ]; From 1cfa4c75fae6d2b343f972bd4616cc8036246e7a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 115/467] python: micawber: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index bc94202a070b..b5fd1d334584 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0vk4xkby306f79gkwrn3cx94qdqil285dand8kb6lnlsdi90sb25"; + sha256 = "5e1e6fbab5bfc1edc6d575b900707c24a3484c51cf2e01f059a7e070724a3633"; }; propagatedBuildInputs = [ beautifulsoup4 ]; From 68c1df52a639c083742251fa8e76473196c8143c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 116/467] python: minio: 4.0.17 -> 4.0.21 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index f5a37832e8fc..6aa5f46ed1f5 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "4.0.17"; + version = "4.0.21"; src = fetchPypi { inherit pname version; - sha256 = "0fb1faab701008a1ff05b9b2497b6ba52d1aff963323356ed86f2771b186db6b"; + sha256 = "35643f056b4d12e053fa7d8f40d98394ed7cc4d5d44ba53c9971e7428fd58e60"; }; disabled = !isPy3k; From a13f0d5a9c4ae872e15f7aa90bee2abb9440d2f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 117/467] python: moretools: 0.1.10 -> 0.1.12 --- pkgs/development/python-modules/moretools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 6f11b01481b0..061eedfe7b01 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moretools"; - version = "0.1.10"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "1rvd9kl0163gm5kqwsb2m44x87sp72k5pirvcmhy2ffix4pzadqp"; + sha256 = "73b0469d4f1df6d967508103473f0b1524708adbff71f8f90ef71d9a44226b22"; }; checkPhase = '' From 1a0e68784e9526d503edaedd060373d2db97ce11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 118/467] python: msgpack: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/msgpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index d48d0995a764..20be837782ab 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972"; + sha256 = "ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830"; }; checkPhase = '' From e15ba4bd5c2a037d113817b92a371aa506faa0ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:09 +0200 Subject: [PATCH 119/467] python: multiprocess: 0.70.7 -> 0.70.9 --- pkgs/development/python-modules/multiprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index a98697039a86..51fe7a83c9d5 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.7"; + version = "0.70.9"; src = fetchPypi { inherit pname version; - sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3"; + sha256 = "9fd5bd990132da77e73dec6e9613408602a4612e1d73caf2e2b813d2b61508e5"; }; propagatedBuildInputs = [ dill ]; From cafcf56d978d2e0638c0f51814369f5decc2ed21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 120/467] python: mwoauth: 0.3.3 -> 0.3.5 --- pkgs/development/python-modules/mwoauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index d22bd460f5f5..d643e71f258e 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mwoauth"; - version = "0.3.3"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "8a57a315732733240e9522d3c4e370cbdf2c045d00fe0dab433d6119fa09038f"; + sha256 = "c7e4c56561a280e14ca4cc20b79ba4a9dd4ec752ff4c797cf29dad4460fb7832"; }; # package has no tests From 03f3b6d1f183e44c0a63bcdffca747e721a00a1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 121/467] python: mypy_extensions: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/mypy/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 36407fd684ae..f78b5e1bff4f 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mypy_extensions"; - version = "0.4.1"; + version = "0.4.2"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p"; + sha256 = "a161e3b917053de87dbe469987e173e49fb454eca10ef28b48b384538cc11458"; }; propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; From b874bc9f6a2215c0e3bfd1d2ec39ad021f0344c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 122/467] python: nibabel: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/nibabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 365f741c57fa..f118e4d5a430 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw"; + sha256 = "83ecac4773ece02c49c364d99b465644c17cc66f1719560117e74991d9eb566b"; }; propagatedBuildInputs = [ From eeb0767ea2d9e6523809fdc474c6bd71c6052c5c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 123/467] python: nipype: 1.2.0 -> 1.2.3 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5f33a5fe63ca..4d80a0638c72 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -45,11 +45,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.2.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5"; + sha256 = "a79c7a72897d81985d20a8c805465285400b59a45ddc527cda44026795fd1c47"; }; postPatch = '' From 71e4f9403a5d04b0da424f1b34f25b2f4ffed991 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 124/467] python: numba: 0.45.0 -> 0.45.1 --- 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 78593e443b17..5eddde4b1af4 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.45.0"; + version = "0.45.1"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "fcea8dc6f9e0f1ddf7bd52a207858539bc14e893c5ee66d8730c3e5b9344c4b3"; + sha256 = "41376e8635fa43743ca7ff9b4fb503c0c3315a9243d523b5870207d6199bdfd9"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 5e68955abeff4ae61d9c0b9b26005e583bb5d31c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 125/467] python: oauthlib: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index cdf88db632ca..ed533253390d 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.0.2"; pname = "oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298"; + sha256 = "b4d99ae8ccfb7d33ba9591b59355c64eef5241534aa3da2e4c0435346b84bc8e"; }; checkInputs = [ mock pytest ]; From 6530757af58ffd25523688d2858c32b756e07a29 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 126/467] python: onkyo-eiscp: 1.2.5 -> 1.2.7 --- pkgs/development/python-modules/onkyo-eiscp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 7b5622cfeefb..39c987060605 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "onkyo-eiscp"; - version = "1.2.5"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "cfcca6bc6c36992095f5aa4a15870a3ef89b9a26d991da2333891c2675d4ef1b"; + sha256 = "761abb16c654a1136763b927d094174d41f282809e44ea32cd47e199dd79d9c9"; }; propagatedBuildInputs = [ docopt netifaces ]; From b8cde54b5aca1edac2dd7634187d5c2b5749ba76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 127/467] python: openpyxl: 2.6.2 -> 2.6.4 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index ea12f1cc35a3..b7d39e08497d 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.6.2"; + version = "2.6.4"; src = fetchPypi { inherit pname version; - sha256 = "1d2af392cef8c8227bd2ac3ebe3a28b25aba74fd4fa473ce106065f0b73bfe2e"; + sha256 = "1d53801678e18d7fe38c116f1ad0c2383a654670c4c8806105b611c92d92f2e3"; }; checkInputs = [ pytest ]; From 3faa6e98adc98eab1819ddde7f5c96fe7d1981f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 128/467] python: panel: 0.6.2 -> 0.6.4 --- 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 4c88f0e1e4b7..99575715d949 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.6.2"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40"; + sha256 = "9b86a827f24dcfd1b6d821836e691fca7aab21b79a293031297f83cf2f8d6cef"; }; propagatedBuildInputs = [ From c394b23907e13abdfd34689095ea182bafdaef93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 129/467] python: param: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/param/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index cb27fdb64e5f..d6b35725c76e 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi"; + sha256 = "a2dcb07c6a4ff48bade69bb5d30d84a96911a7e9dcb76b6de975453f933332f8"; }; checkInputs = [ flake8 nose ]; From 303172a03bba00214a49d234f69aed58ce1b4440 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 130/467] python: parse: 1.12.0 -> 1.12.1 --- pkgs/development/python-modules/parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 2bbf92f40d46..d79badd66c9e 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0hkic57kaxd5s56ylbwslmngqnpab864mjj8c0ayawfk6is6as0v"; + sha256 = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717"; }; checkPhase = '' From d01114e4a65f1a6853605bd7757a59453ef305ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:10 +0200 Subject: [PATCH 131/467] python: pathlib2: 2.3.3 -> 2.3.5 --- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 7669e03cf6f0..a81c652075c9 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.3"; + version = "2.3.5"; src = fetchPypi { inherit pname version; - sha256 = "25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742"; + sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; From 4b2b817cd47ec616040a6715893f15d178240216 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 132/467] python: pathos: 0.2.3 -> 0.2.5 --- pkgs/development/python-modules/pathos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 814854596e9d..b121176c31bc 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9"; + sha256 = "21ae2cb1d5a76dcf57d5fe93ae8719c7339f467e246163650c08ccf35b87c846"; }; propagatedBuildInputs = [ dill pox ppft multiprocess ]; From 2cc6d0f1fc8e8902d5b6fd5f636e1455459de3d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 133/467] python: pdftotext: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 6c3b1c0cb925..0a2427283f46 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1jwc2zpss0983wqqi0kpichasljsxar9c4ma8vycn8maw3pi3bg3"; + sha256 = "c8bdc47b08baa17b8e03ba1f960fc6335b183d2644eaf7300e088516758a6090"; }; buildInputs = [ poppler ]; From 6140b95f3935646c8e632477798ff3b6a569c58e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 134/467] python: pendulum: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index c3090f959008..354bded7b8cf 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "cf535d36c063575d4752af36df928882b2e0e31541b4482c97d63752785f9fcb"; + sha256 = "d3078e007315a959989c41cee5cfd63cfeeca21dd3d8295f4bc24199489e9b6c"; }; propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing; From fde3878b92f4fd2030625923bc24d079fb327816 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 135/467] python: persim: 0.0.9 -> 0.0.10 --- pkgs/development/python-modules/persim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 12bfddb3deb2..8240b437ecd1 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.0.9"; + version = "0.0.10"; src = fetchPypi { inherit pname version; - sha256 = "52ce59856de25eec74c6f20951301b13e7d98c434e712d2225653e2087d54fbc"; + sha256 = "a644a932c5aaf6976bd59003d2823db9276779aa4f9d99dcccc99dc234c80c1f"; }; propagatedBuildInputs = [ From bfa142a976308d070f4e56e8436ee384bba50de3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 136/467] python: pg8000: 1.13.1 -> 1.13.2 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 7ea154255c10..33790b97c4ed 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.13.1"; + version = "1.13.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b"; + sha256 = "eebcb4176a7e407987e525a07454882f611985e0becb2b73f76efb93bbdc0aab"; }; propagatedBuildInputs = [ passlib ]; From 74ad65b7b383c4e28aa7742a6fb22b20bc52bb1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 137/467] python: phonenumbers: 8.10.19 -> 8.10.20 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f52d61e839b7..03995647986f 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.19"; + version = "8.10.20"; src = fetchPypi { inherit pname version; - sha256 = "0xdj4faxvcmkw1war203yxcb66jhhbgscjyqxjifknr0mxax3ngw"; + sha256 = "f743940907118dacb552da39caf1839632a5cc510157fc468a1f497f36562e1c"; }; meta = { From f4a072e259c5333ddca3e0e12590ae2e54e94462 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 138/467] python: pid: 2.2.3 -> 2.2.5 --- pkgs/development/python-modules/pid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 680094357500..20e9390861dc 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.3"; + version = "2.2.5"; src = fetchPypi { inherit pname version; - sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d"; + sha256 = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef"; }; buildInputs = [ nose ]; From 2ea6a4eed3220723715845fc4bca12e1b8ba2324 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 139/467] python: pikepdf: 1.6.2 -> 1.6.4 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 025b17d19ae9..5ae36f5fae23 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.6.2"; + version = "1.6.4"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z"; + sha256 = "50ad2f2903db21b9105c1092ef947b456134a77355b4386535492dc28a6a4e52"; }; buildInputs = [ From a51f74034c639f1ff2784d462e20037b06929273 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 140/467] python: plone.testing: 7.0.1 -> 7.0.2 --- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index ff4020a920b9..37ca1a33d659 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.1"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "98a6e9ce8df1fdd33876e2d8c3ca3d8291612c20bd7e0811dac83b6ce10e984b"; + sha256 = "2533c48b7bd54ff19da2b4f0c3ccd0a8878c46f03fadbf5f933baaf749d17690"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; From 8d43d1e281c640dc7bfc88517438bd48e08bb0ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 141/467] python: plyfile: 0.7 -> 0.7.1 --- pkgs/development/python-modules/plyfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 3f6f3ab13bf3..0aa891cd5acf 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089"; + sha256 = "b119705dec157314cf504e9d2d6f7d5a76606495a778b673c2864ac92895dced"; }; propagatedBuildInputs = [ numpy ]; From 3bda3c659879a84acf580fe2e08d26972757bb24 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 142/467] python: jsonschema: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/poetry/jsonschema.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/jsonschema.nix b/pkgs/development/python-modules/poetry/jsonschema.nix index 35607b536f34..f85477d04fac 100644 --- a/pkgs/development/python-modules/poetry/jsonschema.nix +++ b/pkgs/development/python-modules/poetry/jsonschema.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d"; + sha256 = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d"; }; nativeBuildInputs = [ setuptools_scm ]; From 032247a78fe8f93b6ebecf3a91982b2afaecd9de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:11 +0200 Subject: [PATCH 143/467] python: pox: 0.2.5 -> 0.2.7 --- pkgs/development/python-modules/pox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 18aa9cb7369d..4b0e292ce78b 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pox"; - version = "0.2.5"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8"; + sha256 = "06afe1a4a1dbf8b47f7ad5a3c1d8ada9104c64933a1da11338269a2bd8642778"; }; meta = with stdenv.lib; { From 887f0ab4f9872cab8a4bba6ac13a21486ce54734 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 144/467] python: ppft: 1.6.4.9 -> 1.6.6.1 --- pkgs/development/python-modules/ppft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 770b3a5a73e0..5beed26cb200 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.6.4.9"; + version = "1.6.6.1"; src = fetchPypi { inherit pname version; - sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791"; + sha256 = "9e2173042edd5cc9c7bee0d7731873f17fcdce0e42e4b7ab68857d0de7b631fc"; }; checkPhase = '' From 452334ea90095e0a70d69b03ca3ba7bf6c829f58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 145/467] python: prompt_toolkit: 1.0.16 -> 1.0.18 --- pkgs/development/python-modules/prompt_toolkit/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix index 133a1096863f..c296af18de97 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "1.0.16"; + version = "1.0.18"; src = fetchPypi { inherit pname version; - sha256 = "c1cedd626e08b8ee830ee65897de754113ff3f3035880030c08b01674d85c5b4"; + sha256 = "dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126"; }; checkPhase = '' rm prompt_toolkit/win32_types.py From bb1a400e81840d2b0505db13671df8cc779b42b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 146/467] python: ptpython: 2.0.4 -> 2.0.6 --- pkgs/development/python-modules/ptpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index cf722e90ab3e..01f9dda8f2c1 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "2.0.4"; + version = "2.0.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1m34jbwj3j3762mg1vynpgciqw4kqdzdqjvd62mwhbjkly7ddsgb"; + sha256 = "90e24040e82de4abae0bbe6e352d59ae6657e14e1154e742c0038679361b052f"; }; propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ]; From 04bb5d396ad868b41769543a53b43b4739906534 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 147/467] python: pyasn1-modules: 0.2.5 -> 0.2.7 --- pkgs/development/python-modules/pyasn1-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 446ec81bb4f8..4ed93f635519 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.5"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "ef721f68f7951fab9b0404d42590f479e30d9005daccb1699b0a51bb4177db96"; + sha256 = "0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b"; }; propagatedBuildInputs = [ pyasn1 ]; From fbea317984e5e0f845adff448d4ab4f966ef795c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 148/467] python: pyasn1: 0.4.5 -> 0.4.7 --- pkgs/development/python-modules/pyasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index f44cfef8a29e..f8925cd3b52c 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.4.5"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7"; + sha256 = "a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604"; }; meta = with stdenv.lib; { From f985312640f69ca180c9cf2deddd355b5cbee1fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 149/467] python: pyatv: 0.3.12 -> 0.3.13 --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 783a36dd2ded..ae2780e1dc35 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.3.12"; + version = "0.3.13"; src = fetchPypi { inherit pname version; - sha256 = "135xvy1nn0x5knc7l05amfs837xkx2gcg3lpp69ya9kqs8j6brgp"; + sha256 = "8fc1a903a9d666e4109127410d35a83458559a86bc0de3fe1ffb3f15d2d653b3"; }; propagatedBuildInputs = [ srptools aiohttp zeroconf ed25519 cryptography curve25519-donna tox ]; From c812f260eb3fcaa0edbd796b948f6fb55850bc4d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 150/467] python: pybids: 0.9.2 -> 0.9.4 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 8779ad36ca2a..38108e6e659c 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.9.4"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs"; + sha256 = "08abd3573e823e536990caf54405ffef573a88ef9d019c2d94e0be995e21885f"; }; propagatedBuildInputs = [ From 4be680d0c8f3608f50be6a87b8e5cb6b9df8f382 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 151/467] python: PyBindGen: 0.20.0 -> 0.20.1 --- pkgs/development/python-modules/pybindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index a322518979a3..79c015576a5b 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.20.0"; + version = "0.20.1"; src = fetchPypi { inherit pname version; - sha256 = "0l9pz4s7p82ddf9nq56y1fk84j5dbsff1r2xnfily0m7sahyvc8g"; + sha256 = "5615f6b5d9b8aec86d69acedd050ecb5eb7d1338436c3667e345f800a2658f9f"; }; buildInputs = [ setuptools_scm ]; From d7aff58f3b0923048c6e8dad6ef106fa6f2a97b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 152/467] python: pybotvac: 0.0.13 -> 0.0.16 --- pkgs/development/python-modules/pybotvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 180b7c8d18f5..7d6c7abf9b35 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.13"; + version = "0.0.16"; src = fetchPypi { inherit pname version; - sha256 = "f6f147694ee5cbab1dea494454c11bd254e1c214d96d057cba27894a87210f1b"; + sha256 = "f75240520c918793510766d8b1f5ebc1feb0286f86eab971550f6580b0ea68f5"; }; propagatedBuildInputs = [ requests ]; From 46c7e609c099d082e39d210a4a119df0b31a5924 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 153/467] python: pybtex-docutils: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/pybtex-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index 45d907df2233..878654cef163 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.2.2"; pname = "pybtex-docutils"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0dqk4lplij7rbqqi4dbpw3wzr4wj08ysswvdibls6s0x3ij7bc74"; + sha256 = "ea90935da188a0f4de2fe6b32930e185c33a0e306154322ccc12e519ebb5fa7d"; }; meta = { From 49774ffe027e6bdf1c2d85a7dce07d56560ccb36 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 154/467] python: pydocumentdb: 2.3.3 -> 2.3.5 --- pkgs/development/python-modules/pydocumentdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 4413f9eef2e7..f2e57274458a 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "2.3.3"; + version = "2.3.5"; pname = "pydocumentdb"; src = fetchPypi { inherit pname version; - sha256 = "1fcp3g62pc9hpa0r6vdjhaln4h0azywjqfzi8bd4414ja0mxmj3p"; + sha256 = "1e6f072ae516fc061c9442f8ca470463b53dc626f0f6a86ff3a803293f4b50dd"; }; propagatedBuildInputs = [ six requests ]; From 55025d7f985d3d5ca91f8272f9cf5e81d5f4501c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 155/467] python: pyfma: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/pyfma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index d9aab0b8faed..6c7038b94888 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyfma"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "79514717f8e632a0fb165e3d61222ed61202bea7b0e082f7b41c91e738f1fbc9"; + sha256 = "2c9ea44c5e30ca8318ca794ff1e3941d3dc7958901b1a9c430d38734bf7b6f8d"; }; buildInputs = [ From bffe81c6cbf9a94afec2f00225e7b5dd128b800e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 156/467] python: pyftdi: 0.30.0 -> 0.30.3 --- pkgs/development/python-modules/pyftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index afd7a4599ec8..ecb36313f34e 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.30.0"; + version = "0.30.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0avmxz38bkl6hp3fn1jm31qahsdp76j454mfnpxwx5wlk35iss09"; + sha256 = "ed55f0cb2d2f84b6e97be9583d582480ba9777cb0179aac0bb0ac480cd6760f5"; }; propagatedBuildInputs = [ pyusb pyserial ]; From 4ff0b7144be97ec33aef9c79a6a21a6556c99611 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:12 +0200 Subject: [PATCH 157/467] python: pyhocon: 0.3.51 -> 0.3.53 --- pkgs/development/python-modules/pyhocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index ac4af42851cd..14db6b2be2bb 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.51"; + version = "0.3.53"; src = fetchPypi { inherit pname version; - sha256 = "10l014br012fa583rnj3wqf6g9gmljamcwpw4snqwwg15i0dmkll"; + sha256 = "29d9b64d0141d202b77c18665dc4fcafc05fd4c1a4b0fd95ca57c8b58c0e6c2d"; }; propagatedBuildInputs = [ pyparsing ]; From 7ed7e890c6568ee13ee1ea638506ce61a0aa989f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 158/467] python: pyhomematic: 0.1.60 -> 0.1.61 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index cdd5f0fde6cc..e55ef007eab3 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.60"; + version = "0.1.61"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0af06249988d3d38f01c4464e28fb895f5a22304fe479269c6e56d7c69df0b31"; + sha256 = "7ef0f3b2ed30023297840d365cf94dcf81b7ee6d2be62fff14730e9eb7b59c00"; }; # PyPI tarball does not include tests/ directory From e2354002674c4d9529c7829f602bb5b64ccf8dce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 159/467] python: pyjwkest: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/pyjwkest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 4460105f6174..3c5b96af2ad0 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyjwkest"; - version = "1.4.0"; + version = "1.4.2"; meta = { description = "Implementation of JWT, JWS, JWE and JWK"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "128e3c81d02993ac4cd7e29ef7aac767d91daa59380e6883ae589092945e4aad"; + sha256 = "5560fd5ba08655f29ff6ad1df1e15dc05abc9d976fcbcec8d2b5167f49b70222"; }; buildInputs = [ pytest ]; From 6e685483119622ff5a9f08fe7bdda80873211c8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 160/467] python: PyMuPDF: 1.16.2 -> 1.16.5 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 749fe413de6f..f6c1cc61ebb4 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.2"; + version = "1.16.5"; src = fetchPypi { inherit pname version; - sha256 = "1bidybzkjsc0kdd18xnhz97p70br8xh8whzwydp3a5m411cm00mg"; + sha256 = "9909b1db81952abb09a2c17cca8ffa17f4a05a864653d6e702ce86bfa70c6a23"; }; patchPhase = '' From 9faf549ca3674741872f6e977d4a745400cc70be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 161/467] python: pyro-ppl: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 5211b1377ac7..f0d5b2ee32a5 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.3"; + version = "0.3.4"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "e980e2aa5a029e2f133d422a9154a21c9cca96c417c230ddde858e41aa43687b"; + sha256 = "42d8b8d2f992ad94cf7cf6d4b4dd2aa2ef85c0f83b9fffb0856db65f8225db73"; }; propagatedBuildInputs = [ From d25872847bb9b5c80eec1a426e90115521a30f90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 162/467] python: pyroute2: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index d99a703b173c..3563edce792e 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.6"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "deae0e6191a04c3ee213c6fae6ed779602ef5da5ca5e2fa533f27bc04326bfbe"; + sha256 = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98"; }; # requires root priviledges From 63b914378442617e9d42bc3f4a353e436f82d851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 163/467] python: pysmbc: 1.0.16 -> 1.0.18 --- pkgs/development/python-modules/pysmbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index b6068a65fbd3..18ee419e8e5a 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.16"; + version = "1.0.18"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "62199b5cca02c05d5f3b9edbc9a864fb8a2cbe47a465c0b9461642eb3b6f5aca"; + sha256 = "5da8aef1e3edaaffb1fbe2afe3772ba0a5f5bf666a28ae5db7b59ef96e465bdf"; }; nativeBuildInputs = [ pkgconfig ]; From 1856412da058d3be0be1a66e8142f499d61130ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 164/467] python: pyspark: 2.4.3 -> 2.4.4 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 45c84d167539..dd83e87d724b 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.3"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "6839718ce9f779e81153d8a14a843a5c4b2d5e6574f3c916aec241022d717cb2"; + sha256 = "13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694"; }; # pypandoc is broken with pandoc2, so we just lose docs. From d987f993bfd3d308b1c86aedfeff7ae21d83fdbc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 165/467] python: pytest-annotate: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/pytest-annotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 12a7baa55bf5..c21ae854c9a7 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.2"; + version = "1.0.3"; pname = "pytest-annotate"; src = fetchPypi { inherit pname version; - sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3"; + sha256 = "1ef5924aca93a7b47edaf46a38284fb5a173eed5e3b1a93ec00c8e35f0dd76ab"; }; buildInputs = [ From f965c710b2d09fcb66796704e3b0131d9813d2b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 166/467] python: pytest-mypy: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 09d79b337919..b3ee359f3cec 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "acc653210e7d8d5c72845a5248f00fd33f4f3379ca13fe56cfc7b749b5655c3e"; + sha256 = "917438af835beb87f14c9f6261137f8e992b3bf87ebf73f836ac7ede03424a0f"; }; propagatedBuildInputs = [ pytest mypy ]; From 8f23d09c9dc26ce4e6b9d48e82774ee9370ebccd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 167/467] python: pytest-relaxed: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/pytest-relaxed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index bd92577d5bac..fb050a425752 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "1.1.4"; + version = "1.1.5"; pname = "pytest-relaxed"; src = fetchPypi { inherit pname version; - sha256 = "511ac473252baa67d5451f7864516e2e8f1acedf0cef71f79d2ed916ee04e146"; + sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; propagatedBuildInputs = [ pytest six decorator ]; From a0f93e177e72e4b786cd5a9d8f66963648cb33fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 168/467] python: pytest-remotedata: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/pytest-remotedata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index 2bf3a7f6cac4..7d801a2789c5 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "15b75a38431da96a4da5e48b20a18e4dcc40d191abc199b17cb969f818530481"; + sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; }; propagatedBuildInputs = [ From 9bc0ce53f094db490c79860ee3a93bb38b01fc16 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 169/467] python: pytest-testmon: 0.9.18 -> 0.9.19 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 17fb56a0588b..ed1b754a9968 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "0.9.18"; + version = "0.9.19"; src = fetchPypi { inherit pname version; - sha256 = "05648f9b22aeeda9d32e61b46fa78c9ff28f217d69005b3b19ffb75d5992187e"; + sha256 = "f622fd9d0f5a0df253f0e6773713c3df61306b64abdfb202d39a85dcba1d1f59"; }; buildInputs = [ pytest ]; From 2ea05d40d4c760abf9a9a056a19c8d3dd188d599 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:13 +0200 Subject: [PATCH 170/467] python: pytest: 4.6.5 -> 4.6.6 --- pkgs/development/python-modules/pytest/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 7a43a2e2517b..a3beae4e0cf2 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.5"; + version = "4.6.6"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; + sha256 = "692d9351353ef709c1126266579edd4fd469dcf6b5f4f583050f72161d6f3592"; }; checkInputs = [ hypothesis mock ]; From 8041b6ee9cc812f0354647024266127b9f5a44ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 171/467] python: python-binance: 0.7.1 -> 0.7.4 --- pkgs/development/python-modules/python-binance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 9ed165f93b11..62aa11749a8a 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -3,12 +3,12 @@ , autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: buildPythonPackage rec { - version = "0.7.1"; + version = "0.7.4"; pname = "python-binance"; src = fetchPypi { inherit pname version; - sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7"; + sha256 = "7d0b81a9d395fd071581d275af09a31f0c5ae3ecb25a3f47faaaf1eff779de3f"; }; doCheck = false; # Tries to test multiple interpreters with tox From bd4bd7173af7a0b75deb9d58160f98f2debe8700 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 172/467] python: python-dbusmock: 0.18.1 -> 0.18.3 --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index bee0cab0a3f5..1cad161de365 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.18.1"; + version = "0.18.3"; src = fetchPypi { inherit pname version; - sha256 = "1hj02p65cic4jdc6a5xf1hx8j5icwy7dcrm5kg91lkjks4gwpg5h"; + sha256 = "994a178268b6d74aeb158c0f155cd141e9a0cfae14226a764cd022c4949fe242"; }; prePatch = '' From df6687efc2dda360857907a7f3f595a22a9a6fb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 173/467] python: python-oauth2: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/python-oauth2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index e8c71bff18b2..4361b0a108dd 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-oauth2"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b24da812837c19183df1924e80a22ba0a1869582dea8b04a9ecd807b04dbc525"; + sha256 = "d7a8544927ac18215ba5317edd8f640a5f1f0593921bcf3ce862178312c8c9a4"; }; # attempts to run mysql doCheck = false; From 248fee55d2576e6f2134341b9c8f836881f6b1cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 174/467] python: python-ptrace: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/python-ptrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index ad0a17da2ac8..e9fafd9b99a6 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "019jlpya2d2b3vbg037hnj4z0f564r7ibygayda7bm7qbpw0sa4g"; + sha256 = "9885e9003e4a99c90b3bca1be9306181c9b40a33fc6e17b81027709be5e5cb87"; }; # requires distorm, which is optionally From 785096eff987c31bf2e7375562b57beb5c57a17a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 175/467] python: python-slugify: 3.0.2 -> 3.0.6 --- pkgs/development/python-modules/python-slugify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 699d370af757..5c4c0ad2f56b 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "3.0.2"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758"; + sha256 = "8653d589308c91c67fe5c97a2afda0cfac9492061e69c0db90d1aef68fcd2332"; }; propagatedBuildInputs = [ text-unidecode ]; From 8e55c4b4bf2e358c76aeb0b04eaa70f7838aedbe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 176/467] python: PyYAML: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/pyyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 9663d9ab04bf..a5cf530a3003 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955"; + sha256 = "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4"; }; # force regeneration using Cython From 710dac2e032e6becc9a971190014bd2f37d1e676 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 177/467] python: pyzmq: 18.0.1 -> 18.0.2 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 40273cce8887..bc9024f4079a 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "18.0.1"; + version = "18.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0k3y6k3l9dmih3qmc4vrw26dpjggdk5c6r6806qhgjgpyq2rhccb"; + sha256 = "31a11d37ac73107363b47e14c94547dbfc6a550029c3fe0530be443199026fc2"; }; checkInputs = [ pytest tornado ]; From ab2cdf6827ab6ab5fd9fbbcb5c455cd83f548e02 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 178/467] python: redis: 3.3.4 -> 3.3.11 --- pkgs/development/python-modules/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 62a1177054b9..2da7470a8387 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "redis"; - version = "3.3.4"; + version = "3.3.11"; src = fetchPypi { inherit pname version; - sha256 = "18n6k113izfqsm8yysrw1a5ba6kv0vsgfz6ab5n0k6k65yvr690z"; + sha256 = "8d0fc278d3f5e1249967cba2eb4a5632d19e45ce5c09442b8422d15ee2c22cc2"; }; # tests require a running redis From a81a8407ea0797c8ec5e3efc3b2f11772be39f2e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 179/467] python: reportlab: 3.5.21 -> 3.5.28 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index eba47a3b2d19..879c5630aa41 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.21"; + version = "3.5.28"; src = fetchPypi { inherit pname version; - sha256 = "08e6e63a4502d3a00062ba9ff9669f95577fbdb1a5f8c6cdb1230c5ee295273a"; + sha256 = "7195c6ea096d10c91cc470f9f0ced3ad74470d9c0fd97923b5e764597dd13671"; }; checkInputs = [ glibcLocales ]; From 68d816d6a223180ec97008dd3e77ea51a7856aa8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 180/467] python: rpyc: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/rpyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5fbfba39ddc2..374900f077c3 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rpyc"; - version = "4.1.1"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0rhmwq1jra2cs0j09z2ks4vnv0svi8lj21nq9qq50i52x4ml4yb7"; + sha256 = "0df276076891797bbaaff322cc6debb02e10817426bba00a9beca915053a8a91"; }; propagatedBuildInputs = [ nose plumbum ]; From 0c39d3e13f71206ed1b2a6bd77c324df62d39838 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 181/467] python: ruamel.ordereddict: 0.4.13 -> 0.4.14 --- .../development/python-modules/ruamel_ordereddict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index 7dec5bb54cae..ee329a651661 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ruamel.ordereddict"; - version = "0.4.13"; + version = "0.4.14"; disabled = isPy3k || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "bf0a198c8ce5d973c24e5dba12d3abc254996788ca6ad8448eabc6aa710db149"; + sha256 = "281051d26eb2b18ef3d920e1e260716a52bd058a6b1a2f324102fc6a15cb8d4a"; }; meta = with stdenv.lib; { From 3df2293ca6d3ac6d81040cc5031d58185f1d9231 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 182/467] python: ruamel.yaml: 0.15.96 -> 0.15.100 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index a4ac86302cf8..8b3530e88036 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.96"; + version = "0.15.100"; src = fetchPypi { inherit pname version; - sha256 = "343ace5ffbab036536a3da65e4cfd31b8292388a389f6305744984581a479b2a"; + sha256 = "8e42f3067a59e819935a2926e247170ed93c8f0b2ab64526f888e026854db2e4"; }; # Tests cannot load the module to test From eb8c1d55ac71946af0917834b282fd937d75202b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:14 +0200 Subject: [PATCH 183/467] python: runway-python: 0.4.0 -> 0.4.3 --- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 958b1ee45b33..a90d88720e70 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.4.0"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "cd23550211aa8542d9c06516e25c32de3963fff50d0793d94def271a4e2b4514"; + sha256 = "25e68f371f89815b0b7b21a9b8eb0229cd9634c09aedc1c2c5a307bc62239eec"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; From 020cae94b2757e7e65365806fbe4ffea7579e983 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 184/467] python: s3transfer: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0c227bc6377b..3020ab68ec76 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; + sha256 = "6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d"; }; outputs = [ "out" "dev" ]; From 147860eea828e094f2189c82f6db77d260a1444b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 185/467] python: scikit-image: 0.14.2 -> 0.14.5 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index e2ba35e0438c..5200ffecb7de 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.14.2"; + version = "0.14.5"; src = fetchPypi { inherit pname version; - sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f"; + sha256 = "1f064315cd6fb048560ac6eb03e41969aab68f9df5c145fefaece3b6823e5919"; }; buildInputs = [ cython ]; From 79ec117b3675f81027daabdd13a0634d1b5f8035 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 186/467] python: semantic_version: 2.8.1 -> 2.8.2 --- pkgs/development/python-modules/semantic-version/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index 4fcc19e57fc1..f4cf61fbb4d8 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "1lnnpxmf3z1rcfr5n562vbraq236s13wlj8fmw2kwr2mrq7lqb8r"; + sha256 = "71c716e99086c44d068262b86e4775aa6db7fabee0743e4e33b00fbf6f672585"; }; # ModuleNotFoundError: No module named 'tests' From 286eb5960d6a59a45b2fdab3f47b5b7c5459ed0c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 187/467] python: sentry-sdk: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index c3cc1baaf43f..21fb2fd7571b 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965"; + sha256 = "f137cfb8bf709f69fa4634a7debd13284a3a590c374846285875be41d1fe87a8"; }; checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ]; From 0c1e8c7a7b6cb2cb6c3f60bc57492a9ea5f1e082 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 188/467] python: serverlessrepo: 0.1.8 -> 0.1.10 --- pkgs/development/python-modules/serverlessrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index c6795f172064..90be965c4f2d 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "serverlessrepo"; - version = "0.1.8"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "533389d41a51450e50cc01405ab766550170149c08e1c85b3a1559b0fab4cb25"; + sha256 = "671f48038123f121437b717ed51f253a55775590f00fbab6fbc6a01f8d05c017"; }; propagatedBuildInputs = [ From fc23abb5fe65d852e384ec67b365323206b02fb5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 189/467] python: sharedmem: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/sharedmem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index d3222ac7d140..42277fc00c59 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "sharedmem"; - version = "0.3.6"; + version = "0.3.7"; src = fetchPypi { inherit pname version; - sha256 = "c351ab3f6a4fe9fe0c692ab6a8c88013e625845b31a168ff12d16254ed4154d5"; + sha256 = "483e414b8c5d03093a02baf548449f1d8426a88855556fa42102bba82b86b2a8"; }; propagatedBuildInputs = [ numpy ]; From eb72e7cb44e59f5aa884b2c2c6fd625026721914 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 190/467] python: sounddevice: 0.3.13 -> 0.3.14 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 2094aa7793d6..e538875da2b5 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.13"; + version = "0.3.14"; src = fetchPypi { inherit pname version; - sha256 = "01x2hm3xxzhxrjcj21si4ggmvkwmy5hag7f6yabqlhwskws721cd"; + sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; From 55312220102ef974df9f279226598809c88c6842 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 191/467] python: spyder-kernels: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 206b0799b4a0..86daec23d954 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "7e124fad5203b748005e952cf33b44695dbb9d92f5e0dc5443e7ca0db817f400"; + sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; }; propagatedBuildInputs = [ From fcdc273d2bc07109649f36a5b10fe22a6598926d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 192/467] python: SQLAlchemy: 1.3.8 -> 1.3.10 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 960d2d7c8e41..29fa9986aa83 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.8"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "106digcgx7nwvykdvmnwf3vfxvfkdv6ykwk7sd325afklikgb3rg"; + sha256 = "0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c"; }; checkInputs = [ From dd5acf7e8e4375a4d48d081438f66ab820937e44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 193/467] python: sqlmap: 1.3.5 -> 1.3.10 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 40eefc1db56b..74d73638b1ea 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.5"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "84e0da1a3d846df2f7c886540828f374b357924207e915c8885e0472acdf68dd"; + sha256 = "3f045e8e9ee1293e2d0ab4396950deed71f095a7762f063f3e5f54a839b8d5b4"; }; # No tests in archive From 97266b80656725f6cbf4fa47a14f3ccc835d0ac9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 194/467] python: starfish: 0.1.3 -> 0.1.7 --- pkgs/development/python-modules/starfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index d7989d80e8e0..5cb3c9a6db40 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.3"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "19bec2a869affbca0a7e3fc0aee1b9978ff7f0f1a2a8551c2d4ae148a7ddc251"; + sha256 = "a88ce43fb2999f1219a43b8104d49334d19b2b31fd28f8710696b16768544d37"; }; propagatedBuildInputs = [ From 016ff457e921a65600a052803f35568ee8c3e2ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 195/467] python: starlette: 0.12.7 -> 0.12.10 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 756e95eb1668..1ccb8bcaf703 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.12.7"; + version = "0.12.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zf7nwma801a9hvwwq4xy3rrkca9vydj30s3bnngmm4dvkk575c4"; + sha256 = "e41ef52e711a82ef95c195674e5d8d41c75c6b1d6f5a275637eedd4cc2150a7f"; }; propagatedBuildInputs = [ From 8558d913fcfc4d33ccc22ae9d4a8734681fc370a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:15 +0200 Subject: [PATCH 196/467] python: strictyaml: 1.0.3 -> 1.0.5 --- pkgs/development/python-modules/strictyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 1f580de0b821..496ed66c1ac5 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.5"; pname = "strictyaml"; src = fetchPypi { inherit pname version; - sha256 = "05masza4jvvnh2msswpx4l29w1pv92zpy473yd2ndwcclcrk3rli"; + sha256 = "aad8d90c4d300c5bfa7678b9680ce456406319859c7279e98110548b596b5ae7"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; From 36ae9efb3d38ddd4a06f2cdc1dd783f1029d47f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 197/467] python: tabulate: 0.8.3 -> 0.8.5 --- pkgs/development/python-modules/tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 7321848afd02..956a10b6b047 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.3"; + version = "0.8.5"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943"; + sha256 = "d0097023658d4dea848d6ae73af84532d1e86617ac0925d1adf1dd903985dac3"; }; checkInputs = [ nose ]; From 943da915170f27fe211a9d7a83ec9a727c24cabb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 198/467] python: tldextract: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 88b417931808..07865a6b4b83 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tldextract"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1lcywabjy7vpm6awl2cw4m6rk6h85qnbql0j33xcfryy2dhfyaxp"; + sha256 = "9aa21a1f7827df4209e242ec4fc2293af5940ec730cde46ea80f66ed97bfc808"; }; propagatedBuildInputs = [ requests requests-file idna ]; From e4d0255af4c6187c6d881f2ef87d95abecf2bc3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 199/467] python: tomlkit: 0.5.7 -> 0.5.8 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 71c250020847..72e6e0aca632 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.5.7"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "18820ga5z3if1w8dvykxrfm000akracq01ic402xrbljgbn5grn4"; + sha256 = "32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269"; }; propagatedBuildInputs = From 4dfe66e19f6d545ba7923448cf6c27c6a3a9c41e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 200/467] python: traitlets: 4.3.2 -> 4.3.3 --- pkgs/development/python-modules/traitlets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 0f18c6693869..0342abdfefe0 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "traitlets"; - version = "4.3.2"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; + sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7"; }; checkInputs = [ glibcLocales pytest mock ]; From 010cfb8fb73108fd80c591cb5ff862ae680bea45 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 201/467] python: typing: 3.7.4 -> 3.7.4.1 --- pkgs/development/python-modules/typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 51e634d2439b..c6351690f5ee 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.7.4"; + version = "3.7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk"; + sha256 = "91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' From c3bc29cd77f0c68e91e7a76a7b6429550e028711 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 202/467] python: u-msgpack-python: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/u-msgpack-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 144f9299c6eb..8fd8eaf8329d 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "6c02a0654a5e11f8fad532ed634109ed49cdc929f7b972848773e4e0ce52f30c"; + sha256 = "09c85a8af77376034396681e76bf30c249a4fd8e5ebb239f8a468d3655f210d0"; }; LC_ALL="en_US.UTF-8"; From 5cf54a42bcbe39323f9beb4efa64350aeff52714 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 203/467] python: uamqp: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/uamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index fc6c2b777945..af1e2dc6de39 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0wmyw2l2pha5s6khih96lkfa90zyfy2mqsg8cx6vplmrmpx2s52i"; + sha256 = "9d15cb12d61a6481f7de412c2d53a99f87650e0d1e5394b047aeee5514964fb8"; }; buildInputs = [ From 84754b7c0a419d58baa446f03419998b74ec7c1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 204/467] python: uncompyle6: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 65542cd758bf..0c6cf05e93fd 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0w4m0jywjb0w1y73nkb05zmjxb4plpfi3w2g1rgrf45afa2aqm8z"; + sha256 = "fc856677f41843ed8577dad4d0cf95e8be017b11c2501fad1b39209eb26a41aa"; }; checkInputs = [ nose pytest hypothesis six ]; From 9a3c3f4a50b048e24fc9827a113fe540a7936947 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 205/467] python: uproot-methods: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 54dfc5c112cc..b0caaf3d96a7 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "0awxd4p8yr27k4iayc0phw99bxgw04dnd3lb372hj9wjvldm0hzr"; + sha256 = "d7bfcc84c28a0b61669232ad43b86bbb944504f6bf4612fd395f4e5cc45d0ba5"; }; propagatedBuildInputs = [ numpy awkward ]; From d6d65acbe3b28047f2676c6bb89c727d5964a58e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 206/467] python: uproot: 3.10.0 -> 3.10.6 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 3d20c31b9be5..508b9014a212 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.0"; + version = "3.10.6"; src = fetchPypi { inherit pname version; - sha256 = "1ir3gxgfidw0lx0d2x1lmmxg9brb5fam3ncfihba2b0bvyq9bqzd"; + sha256 = "bbebae0c8d8e22ca6cfcddf26a3e383841c865fc6e9b1cec38151a8cbab72d07"; }; nativeBuildInputs = [ pytestrunner ]; From cd5efb76e8a5f26af2695efbbcfe3a36a9680330 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 207/467] python: vmprof: 0.4.13 -> 0.4.15 --- pkgs/development/python-modules/vmprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 4d80bb3da68c..a9eb492c01e4 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.13"; + version = "0.4.15"; pname = "vmprof"; src = fetchPypi { inherit pname version; - sha256 = "b6121f3d989fe48c2fb7242acded5f1e2e86d25d05d73c41257f236fd9badb2c"; + sha256 = "a2d872a40196404386d1e0d960e97b37c86c3f72a4f9d5a2b5f9ca1adaff5b62"; }; propagatedBuildInputs = [ requests six]; From bc9305b487c69617577c78a688bc1fa86de62a6d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 208/467] python: Werkzeug: 0.15.5 -> 0.15.6 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index b3d397b97b41..ab584bf19d26 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.5"; + version = "0.15.6"; src = fetchPypi { inherit pname version; - sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6"; + sha256 = "0a24d43be6a7dce81bae05292356176d6c46d63e42a0dd3f9504b210a9cfaa43"; }; propagatedBuildInputs = [ itsdangerous ]; From b651e0d504dd3dd3f13ef9fd41b1e7b768799b0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:16 +0200 Subject: [PATCH 209/467] python: whitenoise: 4.1.2 -> 4.1.4 --- pkgs/development/python-modules/whitenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index b7812b42e66d..8d5f8b8813af 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "4.1.2"; + version = "4.1.4"; src = fetchPypi { inherit pname version; - sha256 = "42133ddd5229eeb6a0c9899496bdbe56c292394bf8666da77deeb27454c0456a"; + sha256 = "22f79cf8f1f509639330f93886acaece8ec5ac5e9600c3b981d33c34e8a42dfd"; }; # No tests From 14214145dfdb8d530b43b5489497dda65559d4b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 210/467] python: widgetsnbextension: 3.5.0 -> 3.5.1 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index b2329f4f9633..f0aee6b80586 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.5.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "8c9b4d73e388f2484296be18432d3cc0b8d59de243079a0db16a56c5571e1f86"; + sha256 = "079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7"; }; propagatedBuildInputs = [ notebook ]; From 246f876ce9bef5826a3632c37fdbc9e0ad570b91 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 211/467] python: wrapt: 1.11.1 -> 1.11.2 --- pkgs/development/python-modules/wrapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 9247a7c77576..5ef9dd075089 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.11.1"; + version = "1.11.2"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"; + sha256 = "565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1"; }; meta = { From c7139afafa9e82c07125548076693977a79b20f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 212/467] python: xxhash: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/xxhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 993a59baf9f0..a1d6eaea6003 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "1wgx83lpf8rq95784afj5y9jfcrs1mf6k3pjfyp4a9zigz1zhnkb"; + sha256 = "82cdc67b41da904aa2921107e9877814079d9b067a99f19852b5d85e8a40555d"; }; meta = with stdenv.lib; { From 33340f7f2d59f0d19cd5c73e34eb97854ab70b95 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 213/467] python: zeroc-ice: 3.7.2 -> 3.7.3 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 978f8749d3b3..c7342bbfa553 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.2"; + version = "3.7.3"; src = fetchPypi { inherit version pname; - sha256 = "1bs7h3k9nd1gls2azgp8gz9407cslxbi2x1gspab8p87a61pjim8"; + sha256 = "1adec3b54c77c46acfc8a99d6336ce9a0223a7016852666358133cbe37d99744"; }; buildInputs = [ openssl bzip2 ]; From 08770a8c8bb984a10ff30f55765fc09ab50439e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 214/467] python: zetup: 0.2.52 -> 0.2.64 --- pkgs/development/python-modules/zetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index dcebf7d4ecf9..eb3c5ff135ca 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zetup"; - version = "0.2.52"; + version = "0.2.64"; src = fetchPypi { inherit pname version; - sha256 = "9ce97276acf0425499251c5eb700f6a3820adc52859df1e03c6d0f0b88a452cd"; + sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; # Python 3.7 compatibility From 8d79920ab825100dbde4bb1460e25911c8407bfb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 215/467] python: zipp: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 29153b068fca..e0593dcc21d7 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3"; + sha256 = "4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a"; }; nativeBuildInputs = [ setuptools_scm ]; From b8dd3a1b682700af3012b9818e5c8434fa32f074 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 11:43:17 +0200 Subject: [PATCH 216/467] python: zope.proxy: 4.3.1 -> 4.3.2 --- pkgs/development/python-modules/zope_proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 08932c1cba19..e08973ecdeab 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.1"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "563c2454b2d0f23bca54d2e0e4d781149b7b06cb5df67e253ca3620f37202dd2"; + sha256 = "ab6d6975d9c51c13cac828ff03168de21fb562b0664c59bcdc4a4b10f39a5b17"; }; propagatedBuildInputs = [ zope_interface ]; From faf8cfba4ecd86186bb2d965f6d6386a08aba6a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 16:37:27 +0200 Subject: [PATCH 217/467] python: pluggy: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/pluggy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 331ba8673dd6..d094a2a26fc7 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc"; + sha256 = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34"; }; checkPhase = '' From b74344c07550ad56d5c8288ac686ae5eaffff919 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 16:38:50 +0200 Subject: [PATCH 218/467] python: attrs: 18.2.0 -> 19.3.0 --- pkgs/development/python-modules/attrs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 0fe8241c2159..e3691a5dc328 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "attrs"; - version = "18.2.0"; + version = "19.3.0"; src = fetchPypi { inherit pname version; - sha256 = "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69"; + sha256 = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"; }; # macOS needs clang for testing From 603af4d2af569c0b8780b7deb2ae94753688acde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 16:49:16 +0200 Subject: [PATCH 219/467] pythonPackages.docutils: 0.14 -> 0.15.2 --- .../python-modules/docutils/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index b84535c21124..31dd58cdf6a9 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,18 +1,19 @@ { stdenv , lib -, fetchurl +, fetchPypi , buildPythonPackage , isPy3k +, isPy38 , python }: buildPythonPackage rec { pname = "docutils"; - version = "0.14"; + version = "0.15.2"; - src = fetchurl { - url = "mirror://sourceforge/docutils/${pname}.tar.gz"; - sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji"; + src = fetchPypi { + inherit pname version; + sha256 = "168s5v7bff5ar9jspr6wn823q1sbn0jhnbp9clk41nl8j09fmbm2"; }; # Only Darwin needs LANG, but we could set it in general. @@ -30,6 +31,10 @@ buildPythonPackage rec { done ''; + # Four tests are broken with 3.8. + # test_writers.test_odt.DocutilsOdtTestCase + doCheck = !isPy38; + meta = { description = "Docutils -- Python Documentation Utilities"; homepage = http://docutils.sourceforge.net/; From e07237a1b00cca3df135f7c4a81bae2d3b86bdef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 16:49:30 +0200 Subject: [PATCH 220/467] pythonPackages.hypothesis: 4.7.3 -> 4.41.0 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9c105ffe3fbe..818f9995bbf6 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "4.7.3"; + version = "4.41.0"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "03l4hp0p7i2k04arnqkav0ygc23ml46dy3cfrlwviasrj7yzk5hc"; + sha256 = "09bpwp4kdywkmzci969m57w0yy8c31kzwg60vg4mvrmmgyi2cfzv"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From 1272561be8e2983f6f565633789fcf5b04c3f060 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 16:49:41 +0200 Subject: [PATCH 221/467] pythonPackages.ptrace: add missing six dep --- pkgs/development/python-modules/python-ptrace/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index e9fafd9b99a6..426b956880ad 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -15,6 +16,8 @@ buildPythonPackage rec { # requires distorm, which is optionally doCheck = false; + propagatedBuildInputs = [ six ]; + meta = with stdenv.lib; { description = "Python binding of ptrace library"; homepage = https://github.com/vstinner/python-ptrace; From be8939dbd78e7c477cdb5350149837f1861dfebf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:50 +0200 Subject: [PATCH 222/467] python: dask: 2.2.0 -> 2.6.0 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ba8c06f73f2e..d55595d456f1 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dask"; - version = "2.2.0"; + version = "2.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0wkiqkckwy7fv6m86cs3m3g6jdikkkw84ki9hiwp60xpk5xngnf0"; + sha256 = "81c7891f0d2e7ac03d1f7fabf1f639360a1db52c03a7155ba9b08e9ee6280f2b"; }; checkInputs = [ pytest ]; From c47a71b512f881588c38b8c542cffcd91141b9c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:50 +0200 Subject: [PATCH 223/467] python: ipython: 7.6.1 -> 7.8.0 --- 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 14b083ab500c..d0ea0b6ac929 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.6.1"; + version = "7.8.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "11067ab11d98b1e6c7f0993506f7a5f8a91af420f7e82be6575fcb7a6ca372a0"; + sha256 = "dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1"; }; prePatch = lib.optionalString stdenv.isDarwin '' From dba59456b704d31a62f01702296b767990aeab82 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:50 +0200 Subject: [PATCH 224/467] python: jupyter_core: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/jupyter_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 112e680ea9a5..8e014e6e1432 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.5.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic"; + sha256 = "85103cee6548992780912c1a0a9ec2583a4a18f1ef79a248ec0db4446500bce3"; }; checkInputs = [ pytest mock glibcLocales ]; From e97b9934c27ecb5def5a4a17f2409c22f13bd9c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 225/467] python: llvmlite: 0.29.0 -> 0.30.0 --- pkgs/development/python-modules/llvmlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index e70438a8817d..29dfe3320d64 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.29.0"; + version = "0.30.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "3adb0d4c9a17ad3dca82c7e88118babd61eeee0ee985ce31fa43ec27aa98c963"; + sha256 = "4eaa398d4cafb76e2d8f30ca6ab875039a1023c91e7a690c6ddec20e58bb9a07"; }; nativeBuildInputs = [ llvm ]; From 55206804be23568899235314fc9b4319c2f9a74a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 226/467] python: nbconvert: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 2f0090b5967d..965d3df0e91b 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "138381baa41d83584459b5cfecfc38c800ccf1f37d9ddd0bd440783346a4c39c"; + sha256 = "427a468ec26e7d68a529b95f578d5cbf018cb4c1f889e897681c2b6d11897695"; }; checkInputs = [ nose pytest glibcLocales ]; From 69e80896e636ec82d006caa85a461d47ca8cc616 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 227/467] python: notebook: 5.7.8 -> 6.0.1 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index d081a5a92fbe..8a49f761ced2 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.8"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; + sha256 = "660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d"; }; LC_ALL = "en_US.utf8"; From 949caaec2e50e3c0ec02bae94396a821434e85b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 228/467] python: numba: 0.45.1 -> 0.46.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 5eddde4b1af4..f452b7fae738 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.45.1"; + version = "0.46.0"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "41376e8635fa43743ca7ff9b4fb503c0c3315a9243d523b5870207d6199bdfd9"; + sha256 = "c2cbaeae60f80805290fff50175028726fae12692404a36babd3326730fbceee"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 6b636a3ed5c28d433b70551c80664dc4143f384b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 229/467] python: tqdm: 4.32.2 -> 4.36.1 --- 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 f6038acc1cab..e2f34343763b 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.32.2"; + version = "4.36.1"; src = fetchPypi { inherit pname version; - sha256 = "25d4c0ea02a305a688e7e9c2cdc8f862f989ef2a4701ab28ee963295f5b109ab"; + sha256 = "abc25d0ce2397d070ef07d8c7e706aede7920da163c64997585d42d3537ece3d"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; From 03f641e39655d8c80e908fef918447185d757235 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 230/467] python: twine: 1.15.0 -> 2.0.0 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 3fdc11e440e0..a84ab273a4bf 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "twine"; - version = "1.15.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11rpd653zcgzkq3sgwkzs3mpxl3r5rij59745ni84ikv8smjmlm3"; + sha256 = "9fe7091715c7576df166df8ef6654e61bada39571783f2fd415bdcba867c6993"; }; propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; From 024ec3cb963483c73e3edde12db13b341d455080 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:00:51 +0200 Subject: [PATCH 231/467] python: xarray: 0.12.3 -> 0.14.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index de4be0620013..58f54aa15b9f 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.12.3"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "9310e610af988acb57a2627b10025a250bcbe172e66d3750a6dd3b3c5357da56"; + sha256 = "a8b93e1b0af27fa7de199a2d36933f1f5acc9854783646b0f1b37fed9b4da091"; }; checkInputs = [ pytest ]; From 977964a768d8f8cc653191319994decbf5ee14c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:10:00 +0200 Subject: [PATCH 232/467] python: defusedxml: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/defusedxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 328195365006..581a6cce9b2a 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "defusedxml"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; + sha256 = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5"; }; } From 568c2b9e5fc28bfa38043e4dc4fdc43477ce8401 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 17:22:00 +0200 Subject: [PATCH 233/467] pythonPackages.pathpy: disable a test for 3.8 --- .../development/python-modules/path.py/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index d3c3206fabaf..272c34df429e 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -2,11 +2,12 @@ , buildPythonPackage , fetchPypi , setuptools_scm -, pytest +, pytestCheckHook , pytest-flake8 , glibcLocales , packaging , isPy27 +, isPy38 , backports_os , importlib-metadata , fetchpatch @@ -21,7 +22,7 @@ buildPythonPackage rec { sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; }; - checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; + checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ importlib-metadata @@ -36,10 +37,11 @@ buildPythonPackage rec { license = lib.licenses.mit; }; - checkPhase = '' - # ignore performance test which may fail when the system is under load - py.test -v -k 'not TestPerformance' - ''; + # ignore performance test which may fail when the system is under load + # test_version fails with 3.8 https://github.com/jaraco/path.py/issues/172 + disabledTests = [ "TestPerformance" ] ++ lib.optionals isPy38 [ "test_version"]; + + dontUseSetuptoolsCheck = true; patches = [ (fetchpatch { From fe0e2b268c2dd0af8ad4b21fb0e80bc48c733609 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:03:37 +0200 Subject: [PATCH 234/467] python: pyzmq: 18.0.2 -> 18.1.0 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index bc9024f4079a..bb9aeaf32017 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "18.0.2"; + version = "18.1.0"; src = fetchPypi { inherit pname version; - sha256 = "31a11d37ac73107363b47e14c94547dbfc6a550029c3fe0530be443199026fc2"; + sha256 = "93f44739db69234c013a16990e43db1aa0af3cf5a4b8b377d028ff24515fbeb3"; }; checkInputs = [ pytest tornado ]; From 6b4902afdef769dd01a07b45644b16f7929122cc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:11:34 +0200 Subject: [PATCH 235/467] pythonPackages.ipykernel: 5.1.1 -> 5.1.2 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 4bdd9011d1e8..22a61281af26 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.1"; + version = "5.1.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "173nm29g85w8cac3fg40b27qaq26g41wgg6qn79ql1hq4w2n5sgh"; + sha256 = "04jx6ihj3zpj4c7acqa14gl37mpdnbgmfm4nvv97xkjc1cz920xm"; }; checkInputs = [ pytest nose ]; From caf70f40bbf15a8aa4f3cd9de8aa2bec047d8f13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:11:45 +0200 Subject: [PATCH 236/467] pythonPackages.hypothesis: fixup --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 818f9995bbf6..ec9c5ecefa0f 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, isPy3k, attrs, coverage, enum34 +, isPy3k, attrs, coverage, enum34, pexpect , doCheck ? true, pytest, pytest_xdist, flaky, mock }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; - checkInputs = [ pytest pytest_xdist flaky mock ]; + checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' From 949fd1f486db7ba57557f8eb3666cbe17f93ae87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:11:56 +0200 Subject: [PATCH 237/467] pythonPackages.jupyter_core: fixup --- pkgs/development/python-modules/jupyter_core/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 8e014e6e1432..e629e77aa32d 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -6,6 +6,7 @@ , glibcLocales , mock , pytest +, nose }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "85103cee6548992780912c1a0a9ec2583a4a18f1ef79a248ec0db4446500bce3"; }; - checkInputs = [ pytest mock glibcLocales ]; + checkInputs = [ pytest mock glibcLocales nose ]; propagatedBuildInputs = [ ipython traitlets ]; patches = [ ./tests_respect_pythonpath.patch ]; From 46f7f9c24b766135e8879c8e79f29237269dee6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:38:49 +0200 Subject: [PATCH 238/467] pythonPackages.pytest-relaxed: fix build --- pkgs/development/python-modules/pytest-relaxed/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index fb050a425752..4de823c2c870 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -15,10 +15,13 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; - propagatedBuildInputs = [ pytest six decorator ]; + buildInputs = [ pytest ]; + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ six decorator ]; patchPhase = '' - sed -i "s/pytest>=3,<3.3/pytest/g" setup.py + sed -i "s/pytest>=3,<5/pytest/g" setup.py ''; # skip tests due to dir requirements From e995f04ac9afef3613820ef06aac4707ce3eddbf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 14 Oct 2019 21:13:49 -0700 Subject: [PATCH 239/467] pythonPackages.docker: 4.0.2 -> 4.1.0 --- pkgs/development/python-modules/docker/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index d82cc0d3f6b8..1e5ddc3ed96a 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -9,19 +9,19 @@ }: buildPythonPackage rec { - version = "4.0.2"; pname = "docker"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0r1i46h8x1vfvadayyvmh5hc6mpzgv3vvp6pv4g1wavamya2wnyc"; + sha256 = "1hdgics03fz2fbhalzys7a7kjj54jnl5a37h6lzdgym41gkwa1kf"; }; propagatedBuildInputs = [ - six - requests - websocket_client paramiko + requests + six + websocket_client ] ++ stdenv.lib.optional isPy27 backports_ssl_match_hostname; checkInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An API client for docker written in Python"; - homepage = https://github.com/docker/docker-py; + homepage = "https://github.com/docker/docker-py"; license = licenses.asl20; maintainers = with maintainers; [ jonringer ]; }; From 16c01cc3d25e903059c575967968bc635d3aeaaf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Oct 2019 18:40:58 +0200 Subject: [PATCH 240/467] python: commonmark: 0.8.1 -> 0.9.1 --- pkgs/development/python-modules/commonmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 93eb03272863..0f381d502610 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "commonmark"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "abcbc854e0eae5deaf52ae5e328501b78b4a0758bf98ac8bb792fce993006084"; + sha256 = "452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"; }; preCheck = '' From 7eed62d51d0082618e40b317c17b92f0bd944cf8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 09:34:20 -0700 Subject: [PATCH 241/467] pythonPackages.importlib-meta: 0.18 -> 0.23 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 59fdb35be125..bae5d232d0e9 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.18"; + version = "0.23"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"; + sha256 = "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a"; }; nativeBuildInputs = [ setuptools_scm ]; From 5cc8fdb5d7c983ec9f6dae7fe9fcb7e0fc986768 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 23:16:09 -0700 Subject: [PATCH 242/467] pythonPackages.pyjwt: fix tests --- pkgs/development/python-modules/pyjwt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 10bfb0d72b6f..e91fbe2b3e46 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -19,6 +19,11 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" ''; + # ecdsa changed internal behavior + checkPhase = '' + pytest tests -k 'not ec_verify_should_return_false_if_signature_invalid' + ''; + meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; From 14f78c36d052821ff46e837960707a75a984af61 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 23:38:55 -0700 Subject: [PATCH 243/467] pythonPackages.tables: freeze at 3.5.2 --- .../development/python-modules/tables/3.5.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/tables/3.5.nix diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix new file mode 100644 index 000000000000..4cca72aa313a --- /dev/null +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -0,0 +1,58 @@ +{ stdenv, lib, fetchPypi, python, buildPythonPackage +, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: + +with stdenv.lib; + +buildPythonPackage rec { + version = "3.5.2"; + pname = "tables"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hikrki0hx94ass31pn0jyz9iy0zhnkjacfk86m21cxsc8if685j"; + }; + + buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; + propagatedBuildInputs = [ numpy numexpr six mock ]; + + # The setup script complains about missing run-paths, but they are + # actually set. + setupPyBuildFlags = [ + "--hdf5=${getDev hdf5}" + "--lzo=${getDev lzo}" + "--bzip2=${getDev bzip2}" + "--blosc=${getDev c-blosc}" + ]; + # Run the test suite. + # It requires the build path to be in the python search path. + # These tests take quite some time. + # If the hdf5 library is built with zlib then there is only one + # test-failure. That is the same failure as described in the following + # github issue: + # https://github.com/PyTables/PyTables/issues/269 + checkPhase = '' + ${python.interpreter} < Date: Wed, 16 Oct 2019 23:40:21 -0700 Subject: [PATCH 244/467] python37Packages.tables: 3.5.2 -> 3.6.0 --- pkgs/development/python-modules/tables/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 4cca72aa313a..444901d9aaf2 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage +{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPy38 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: with stdenv.lib; buildPythonPackage rec { - version = "3.5.2"; + version = "3.6.0"; pname = "tables"; + disabled = isPy38; # unable to build, remove with next bump. src = fetchPypi { inherit pname version; - sha256 = "1hikrki0hx94ass31pn0jyz9iy0zhnkjacfk86m21cxsc8if685j"; + sha256 = "0k9xc0b49j311r6yayw7wzjay6ch3jznijhzc4x33yv490hqhd6v"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; From fa3287ec79ec3618db689ad7fbf585813b410fd9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 23:52:28 -0700 Subject: [PATCH 245/467] pythonPackages.networkx: freeze at 2.2 --- .../python-modules/networkx/2.2.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/networkx/2.2.nix diff --git a/pkgs/development/python-modules/networkx/2.2.nix b/pkgs/development/python-modules/networkx/2.2.nix new file mode 100644 index 000000000000..a4c66048953b --- /dev/null +++ b/pkgs/development/python-modules/networkx/2.2.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, decorator +, setuptools +}: + +buildPythonPackage rec { + pname = "networkx"; + # upgrade may break sage, please test the sage build or ping @timokau on upgrade + version = "2.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ decorator setuptools ]; + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3ec44aefc72..954473592fc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5732,7 +5732,9 @@ in { parsimonious = callPackage ../development/python-modules/parsimonious { }; - networkx = callPackage ../development/python-modules/networkx { }; + networkx = if isPy3k then callPackage ../development/python-modules/networkx { } + else + callPackage ../development/python-modules/networkx/2.2.nix { }; ofxclient = callPackage ../development/python-modules/ofxclient {}; From 5725366c88ace6ecf78afacba2553970457cb74e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 23:53:19 -0700 Subject: [PATCH 246/467] python3Packages.networkx: 2.2 -> 2.4 --- pkgs/development/python-modules/networkx/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index a4c66048953b..6075daf58467 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , nose +, pytest , decorator , setuptools }: @@ -9,16 +10,18 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.2"; + version = "2.4"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5"; + sha256 = "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ decorator setuptools ]; + checkInputs = [ nose pytest]; + checkPhase = '' + pytest + ''; meta = { homepage = "https://networkx.github.io/"; From 8a37580fc7ce51bc376f68ea39dda99594e69f49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:19:21 +0200 Subject: [PATCH 247/467] pythonPackages.multidict: disable tests for 3.8 --- pkgs/development/python-modules/multidict/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 76a494230066..1539592dc6be 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pytest, pytestrunner, pytestcov , isPy3k +, isPy38 }: buildPythonPackage rec { @@ -17,6 +18,8 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov ]; disabled = !isPy3k; + # pickle files needed for 3.8 https://github.com/aio-libs/multidict/pull/363 + doCheck = !isPy38; meta = with lib; { description = "Multidict implementation"; From a6604df8fdef36aec085bf4351001577904d7f9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:24:37 +0200 Subject: [PATCH 248/467] pythonPackages.arpeggio: fix build --- pkgs/development/python-modules/arpeggio/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 65cbd577e35f..42d1ce0a219a 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , glibcLocales +, pytestrunner +, pytestCheckHook }: buildPythonPackage rec { @@ -17,6 +19,14 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ "test_examples" "test_issue_22" ]; + + dontUseSetuptoolsCheck = true; + meta = { description = "Packrat parser interpreter"; license = lib.licenses.mit; From 5738b5405ef6b5b121572c7db175baf505ea563f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:27:42 +0200 Subject: [PATCH 249/467] python: astroid: 2.2.5 -> 2.3.1 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 591726ea1ace..8f5a9175f65d 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.2.5"; + version = "2.3.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1x5c8fiqa18frwwfdsw41lpqsyff3w4lxvjx9d5ccs4zfkhy2q35"; + sha256 = "b7546ffdedbf7abcfbff93cd1de9e9980b1ef744852689decc5aeada324238c6"; }; # From astroid/__pkginfo__.py From a23e098bf9ab56638dc24715877d64756b3383bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:28:38 +0200 Subject: [PATCH 250/467] python: lazy-object-proxy: 1.3.1 -> 1.4.2 --- pkgs/development/python-modules/lazy-object-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 430e43a129b3..132e90eb775a 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a"; + sha256 = "fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1"; }; buildInputs = [ pytest ]; From 5533eaa2d4c9855b132062973e494188e0090451 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:30:20 +0200 Subject: [PATCH 251/467] pythonPackages.lazy-object-proxy: fixup build --- .../development/python-modules/lazy-object-proxy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 132e90eb775a..e0381642715a 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytest +, setuptools_scm }: buildPythonPackage rec { @@ -13,7 +14,9 @@ buildPythonPackage rec { sha256 = "fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest ]; checkPhase = '' py.test tests ''; From 4af94d0f5a73fab5009319b7bda0b303236195cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:33:37 +0200 Subject: [PATCH 252/467] ansible: drop boto dependency Does not seem to be needed. Hasn't been updated in over a year either. --- pkgs/development/python-modules/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index fab3c0df58c5..fcc984faf8c2 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - pycrypto paramiko jinja2 pyyaml httplib2 boto + pycrypto paramiko jinja2 pyyaml httplib2 six netaddr dnspython jmespath dopy ] ++ lib.optional windowsSupport pywinrm; From b4ef5c479f56f306c10b6f475cb5756dba1f14d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:36:07 +0200 Subject: [PATCH 253/467] python: Pillow: 5.4.1 -> 6.2.0 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index e0791248e266..7fea42f98079 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.4.1"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f"; + sha256 = "4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df"; }; doCheck = !stdenv.isDarwin && !isPyPy; From fd5e7da1f8e59eaf9f804c48928e261ae8876362 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:41:52 +0200 Subject: [PATCH 254/467] python: pylint: 2.3.1 -> 2.4.2 --- .../python-modules/pylint/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 4faeb05280d0..44614e82e2a2 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,20 +1,20 @@ { stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, - isort, mccabe, pytest, pytestrunner }: + isort, mccabe, pytestCheckHook, pytestrunner }: buildPythonPackage rec { pname = "pylint"; - version = "2.3.1"; + version = "2.4.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1wgzq0da87m7708hrc9h4bc5m4z2p7379i4xyydszasmjns3sgkj"; + sha256 = "7edbae11476c2182708063ac387a8f97c760d9cfe36a5ede0ca996f90cf346c8"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ astroid isort mccabe ]; @@ -23,17 +23,15 @@ buildPythonPackage rec { rm -vf pylint/test/test_functional.py ''; - checkPhase = '' - pytest pylint/test -k "not ${lib.concatStringsSep " and not " ( - # Broken tests - [ "member_checks_py37" "iterable_context_py36" ] ++ - # Disable broken darwin tests - lib.optionals stdenv.isDarwin [ - "test_parallel_execution" - "test_py3k_jobs_option" - ] - )}" - ''; + disabledTests = [ + # https://github.com/PyCQA/pylint/issues/3198 + "test_by_module_statement_value" + ] ++ lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ]; + + dontUseSetuptoolsCheck = true; postInstall = '' mkdir -p $out/share/emacs/site-lisp From c8b017c289f494d730cb8f8f2547f1d55873ddaf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 09:45:02 +0200 Subject: [PATCH 255/467] python: text-unidecode: 1.2 -> 1.3 --- pkgs/development/python-modules/text-unidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix index 94aebc595123..ff5d24255932 100644 --- a/pkgs/development/python-modules/text-unidecode/default.nix +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "text-unidecode"; - version = "1.2"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d"; + sha256 = "bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"; }; checkInputs = [ pytest ]; From 76c2bde6d1b86c62d9e1bd715605b2b32460a014 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:10:33 +0200 Subject: [PATCH 256/467] pythonPackages.joblib: 0.13.2 -> 0.14.0 --- .../python-modules/joblib/default.nix | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 08957304312f..8881dcf55996 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , stdenv , numpydoc , pytest @@ -13,30 +12,13 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.13.2"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524"; + sha256 = "1zwkl6hgi8wbygcc6ql6yk1if665hwk43sa9shglb2afrfm5gk3g"; }; - # python-lz4 compatibility - # https://github.com/joblib/joblib/pull/847 - patches = [ - (fetchpatch { - url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch; - sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h"; - }) - (fetchpatch { - url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch; - sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba"; - }) - (fetchpatch { - url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch; - sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d"; - }) - ]; - checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 setuptools ]; From 95b8b57627fb73dacd7521a8b5844e9444350c83 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:13:50 +0200 Subject: [PATCH 257/467] pythonPackages.approvaltests: 0.2.4 -> 0.2.6 --- .../python-modules/approvaltests/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index de64f86d7282..2cf9bf1f1777 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: buildPythonPackage rec { - version = "0.2.4"; + version = "0.2.6"; pname = "approvaltests"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = version; - sha256 = "05lj5i13zpkgw1wdc1v81wj4zqj8bpzqiwycdnwlg08azcy7k7j1"; + sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9"; }; propagatedBuildInputs = [ pyperclip ]; @@ -19,16 +19,6 @@ buildPythonPackage rec { --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" ''; - # Tests fail on Python 3.7 - # https://github.com/approvals/ApprovalTests.Python/issues/36 - doCheck = !isPy37; - - # Disable Linux failing test, because tries to use darwin/windows specific reporters - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - substituteInPlace tests/test_genericdiffreporter.py \ - --replace "test_find_working_reporter" "_find_working_reporter" - ''; - meta = with stdenv.lib; { description = "Assertion/verification library to aid testing"; homepage = https://github.com/approvals/ApprovalTests.Python; From 21e178a1fe24bc97dbf3692af4eccebfd389879f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:18:32 +0200 Subject: [PATCH 258/467] pythonPackages.dbus-python: 1.2.4 -> 1.2.12 --- pkgs/development/python-modules/dbus/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 262c93878d3f..855ee930b772 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy +{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy , ncurses, pygobject3 }: -if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { +buildPythonPackage rec { pname = "dbus-python"; - version = "1.2.4"; + version = "1.2.12"; format = "other"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz"; - sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; + src = fetchPypi { + inherit pname version; + sha256 = "0q7jmldv0bxxqnbj63cd7i81vs6y85xys4r0n63z4n2y9wndxm6d"; }; patches = [ ./fix-includedir.patch ]; + disabled = isPyPy; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] # My guess why it's sometimes trying to -lncurses. From b5623ef56f34fd4402b1695cee0eec80004ed4c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:22:32 +0200 Subject: [PATCH 259/467] awscli: 1.16.215 -> 1.16.261 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7e3e0c9fff05..268ffb5f9eea 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.261"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8"; + sha256 = "1mg4xhz6cpc52hpflqvbhq7ldwvg8kzixv9aj9w6gv60xvarwnm5"; }; # No tests included From dcdcb66b2f56f8e8bb7d6727f6461ca8213cf81e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:39:15 +0200 Subject: [PATCH 260/467] python: botocore: 1.12.250 -> 1.12.251 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 60856836a502..03a4308c23e5 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.250"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.251"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "ef3257f05efb5b54e447bfeae9802f7e82d0477ee26be8601a1e3611b317aba5"; + sha256 = "887a57b3dcfb1d29ae11e504a486cd8dbe1af4f5678980a804dbf02b36d1c4f8"; }; outputs = [ "out" "dev" ]; From 365098e092ba6971b6aa9be7edffbb4526512153 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 10:47:06 +0200 Subject: [PATCH 261/467] awscli and aws_shell: use the same python version with deps We need this python version with its custom dependencies for aws_shell. --- pkgs/tools/admin/aws_shell/default.nix | 9 +++------ pkgs/tools/admin/awscli/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index c319c47ea7e4..53a39f500018 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -1,13 +1,9 @@ { stdenv -, buildPythonPackage -, fetchPypi , awscli -, prompt_toolkit -, boto3 -, configobj -, pygments }: +with awscli.python.pkgs; + buildPythonPackage rec { pname = "aws-shell"; version = "0.2.0"; @@ -24,6 +20,7 @@ buildPythonPackage rec { boto3 configobj pygments + pyyaml ]; #Checks are failing due to missing TTY, which won't exist. diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 268ffb5f9eea..4956767f091e 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec { # No tests included doCheck = false; - pythonPath = with py.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ botocore bcdoc s3transfer @@ -63,6 +63,8 @@ in py.pkgs.buildPythonApplication rec { rm $out/bin/aws.cmd ''; + passthru.python = py; # for aws_shell + meta = with lib; { homepage = https://aws.amazon.com/cli/; description = "Unified tool to manage your AWS services"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 055209a3bc42..d8a3d8c1aaef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -692,7 +692,7 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws_shell = callPackage ../tools/admin/aws_shell { }; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; From 8ae6fb066e99bba0798b6993315fdcd9ae558212 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 00:28:04 -0700 Subject: [PATCH 262/467] python3Packages.pybind11: 2.3.0 -> 2.4.3 --- .../python-modules/pybind11/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 37e55617023c..94a25b2858ee 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,27 +12,15 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.3.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf"; + sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"; }; - patches = [ - (fetchpatch { - url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch; - sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka"; - }) - (fetchpatch { - name = "pytest-4-excinfo-fix.patch"; - url = https://github.com/pybind/pybind11/commit/9fd4712121fdbb6202a35be4c788525e6c8ab826.patch; - sha256 = "07jjv8jlbszvr2grpm5xqxjac7jb0y68lgb1jcbb93k9vyp1hr33"; - }) - ]; - dontUseCmakeConfigure = true; checkInputs = [ pytest cmake ] From 762be1cfc72a90fe47fb96a3c5bfa28f8d82b181 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 00:34:49 -0700 Subject: [PATCH 263/467] python3Packages.numpydoc: 0.8.0 -> 0.9.1 --- .../python-modules/numpydoc/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 0e6fa25bd537..e965f332fc95 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -1,22 +1,21 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, sphinx +{ lib, buildPythonPackage, fetchPypi , jinja2 +, nose +, pytest +, sphinx }: buildPythonPackage rec { pname = "numpydoc"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname; inherit version; - sha256 = "61f4bf030937b60daa3262e421775838c945dcdd671f37b69e8e4854c7eb5ffd"; + sha256 = "09x6l1a4dcvj7001bvcmcayg1nwqwhaxlwbp6kzj9qrk57lqx3z0"; }; - checkInputs = [ nose ]; + checkInputs = [ nose pytest ]; propagatedBuildInputs = [ sphinx jinja2 ]; meta = { @@ -24,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/numpy/numpydoc"; license = lib.licenses.free; }; -} \ No newline at end of file +} From d59337e8060fe94bdb52f155cbfdeb20d68f1e0a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 01:45:15 -0700 Subject: [PATCH 264/467] python3Packages.aiohttp: 3.5.4 -> 3.6.2 --- .../python-modules/aiohttp/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 049ceb124ea0..6ac46b744a52 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -19,29 +19,41 @@ , pytest-mock , trustme , brotlipy +, freezegun }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.5.4"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf"; + sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5"; }; disabled = pythonOlder "3.5"; checkInputs = [ pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist - pytest-mock pytestcov trustme brotlipy + pytest-mock pytestcov trustme brotlipy freezegun ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; + # disable tests which attempt to do loopback connections checkPhase = '' - pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms" + cd tests + pytest -k "not get_valid_log_format_exc \ + and not test_access_logger_atoms \ + and not aiohttp_request_coroutine \ + and not server_close_keepalive_connection \ + and not connector \ + and not client_disconnect \ + and not handle_keepalive_on_closed_connection \ + and not partially_applied_handler \ + and not middleware" \ + --ignore=test_connector.py ''; meta = with lib; { From 53056758612481e80dbdaab9f9fa96ead8e3ec57 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 01:59:13 -0700 Subject: [PATCH 265/467] python3Packages.uarray: 0.4 -> 0.5.1 --- .../development/python-modules/uarray/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index fad2dee2d165..f0b42e6609f7 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , matchpy , numpy , astunparse @@ -16,24 +17,18 @@ buildPythonPackage rec { pname = "uarray"; - version = "0.4"; - format = "flit"; - # will have support soon see - # https://github.com/Quansight-Labs/uarray/pull/64 - disabled = isPy37; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4ec88f477d803a914d58fdf83aeedfb1986305355775cf55525348c62cce9aa4"; + sha256 = "0j2pin54pwm1vdgza8irxcjb2za7h41c0ils04afssdn59cixslx"; }; + doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1 checkInputs = [ pytest nbval pytestcov numba ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ]; - checkPhase = '' - ${python.interpreter} extract_readme_tests.py - pytest - ''; + pythonImportsCheck = [ "uarray" ]; meta = with lib; { description = "Universal array library"; From 46515fbadaf0c9bd92baad91cee33e354edb7be8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 02:44:43 -0700 Subject: [PATCH 266/467] pythonPackages.pybind11: expose headers --- pkgs/development/python-modules/pybind11/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 94a25b2858ee..2df360dfaabb 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ pytest cmake ] + nativeBuildInputs = [ cmake ]; + checkInputs = [ pytest ] ++ (lib.optional (numpy != null) numpy) ++ (lib.optional (eigen != null) eigen) ++ (lib.optional (scipy != null) scipy); @@ -32,6 +33,11 @@ buildPythonPackage rec { make -j $NIX_BUILD_CORES pytest ''; + # re-expose the headers to other packages + postInstall = '' + ln -s $out/include/python${python.pythonVersion}m/pybind11/ $out/include/pybind11 + ''; + meta = { homepage = https://github.com/pybind/pybind11; description = "Seamless operability between C++11 and Python"; From 8a08ebd0ad33895f4197533584c2e957dc300973 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 02:45:45 -0700 Subject: [PATCH 267/467] python3Packages.trio: 0.11.0 -> 0.12.1 --- pkgs/development/python-modules/trio/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index bc9837dc23c8..b21157ec9486 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -12,19 +12,20 @@ , stdenv , jedi , pylint +, astor }: buildPythonPackage rec { pname = "trio"; - version = "0.11.0"; + version = "0.12.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3"; + sha256 = "0wnnrs36arvimrfgrlbpjw3nx7lppx43yvk2b380ivv69h52i6hl"; }; - checkInputs = [ pytest pyopenssl trustme jedi pylint ]; + checkInputs = [ astor pytest pyopenssl trustme jedi pylint ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' From 039f36ac55af5e5a0f9cce2f025cb2f89d8c938f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 11:00:44 +0200 Subject: [PATCH 268/467] python: Twisted: 18.9.0 -> 19.7.0 --- pkgs/development/python-modules/twisted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 249ddb4be863..1a78e3afd0d5 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "18.9.0"; + version = "19.7.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395"; + sha256 = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; From b65dc2ef5492f4104cb0c25967757b2950c11333 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 11:10:58 +0200 Subject: [PATCH 269/467] python: zope.testrunner: 4.9.2 -> 5.0 --- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index fd2cf470e6f0..ffb4878661b7 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "4.9.2"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "f2aa89531db6b7546e46be9d6113ac835a075f4dcb26e32c7276f4f30d4b14a5"; + sha256 = "0d8a27e214033b6f1e557556e61bff9568ae95676dfcc8a032483fdeeee792c3"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From 3787c2d931022508bd56484a009a31cd8dc630b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 11:42:15 +0200 Subject: [PATCH 270/467] python: zope.i18n: 4.6.2 -> 4.7.0 --- pkgs/development/python-modules/zope_i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index 3fb967099c20..81558a214461 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.i18n"; - version = "4.6.2"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621"; + sha256 = "9fcc1adb4e5f6188769ab36f6f40a59b567bb5eef91f714584e0dfd0891be5d0"; }; propagatedBuildInputs = [ pytz zope_component ]; From 31acc6bacfd9bdd6f6ed0c29e3c7121fac03a341 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 12:35:51 +0200 Subject: [PATCH 271/467] pythonPackages.zope-deferredimport: disable tests relies on zope-testrunner. Import fails, likely because of how zope-testrunner functions. --- pkgs/development/python-modules/zope-deferredimport/default.nix | 2 ++ pkgs/development/python-modules/zope_testrunner/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index f447d29f2804..26d8255c03b2 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { zope-testrunner --test-path=src [] ''; + doCheck = false; + meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; homepage = https://github.com/zopefoundation/zope.deferredimport; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index ffb4878661b7..53b39577c39a 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; - doCheck = !stdenv.isDarwin; + doCheck = false; # custom test modifies sys.path meta = with stdenv.lib; { description = "A flexible test runner with layer support"; From 3a9fb15046ab209e263abe0b31074a224fe800e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 17:46:05 +0200 Subject: [PATCH 272/467] python: numpy: 1.17.2 -> 1.17.3 --- 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 41064c6b36c7..f5ce093cb495 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.2"; + version = "1.17.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "73615d3edc84dd7c4aeb212fa3748fb83217e00d201875a47327f55363cef2df"; + sha256 = "a0678793096205a4d784bd99f32803ba8100f639cf3b932dc63b21621390ea7e"; }; nativeBuildInputs = [ gfortran pytest ]; From 4b5e0831e11a99f100f0b6e423b2081caf14bee1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 08:30:58 -0700 Subject: [PATCH 273/467] pythonPackages.notebook: disable for python2 notebook>=6 no longer supports python2 --- pkgs/development/python-modules/notebook/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 8a49f761ced2..d196b6a69479 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { pname = "notebook"; version = "6.0.1"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; From ad0b21e0b17a614e151efe1accd435b012e592a5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 08:36:13 -0700 Subject: [PATCH 274/467] pythonPackages.manuel: disable for python2 zope_testing will no longer correctly collect the tests --- pkgs/development/python-modules/manuel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index f9fa3a090ebe..e08c61140d6c 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , six , zope_testing }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "manuel"; version = "1.10.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 22739639404e0919562650ed495150f3f12bccbc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 08:42:51 -0700 Subject: [PATCH 275/467] pythonPackages.azure-cli-telemetry: fix build --- .../python-modules/azure-cli-telemetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix index 5c1732cc0c42..202e0a013b98 100644 --- a/pkgs/development/python-modules/azure-cli-telemetry/default.nix +++ b/pkgs/development/python-modules/azure-cli-telemetry/default.nix @@ -28,10 +28,10 @@ buildPythonPackage rec { # Remove overly restrictive version contraints and obsolete namespace setup prePatch = '' substituteInPlace setup.py \ - --replace "applicationinsights>=0.11.1,<0.11.8" "applicationinsights" \ - --replace "portalocker==1.2.1" "portalocker" + --replace "applicationinsights>=0.11.1,<0.12" "applicationinsights" substituteInPlace setup.cfg \ --replace "azure-namespace-package = azure-cli-nspkg" "" + rm azure_bdist_wheel.py # we'll fix PEP420 namespacing ''; # Prevent these __init__'s from violating PEP420, only needed for python2 From a1a8c96d8f0d05cb6824a34e2b42c254a825c930 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 08:48:08 -0700 Subject: [PATCH 276/467] pythonPackages.twisted: disable python2 ruamel* dependencies no longer have correct namespacing for python2 --- pkgs/development/python-modules/twisted/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 1a78e3afd0d5..1c91dfc2b48f 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , python +, isPy27 , zope_interface , incremental , automat @@ -17,6 +18,7 @@ buildPythonPackage rec { pname = "Twisted"; version = "19.7.0"; + disabled = isPy27; # ruamel namespace now conflicts in python27 src = fetchPypi { inherit pname version; From cd517668c7807886ed41d5fa899041a0c2d00975 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 08:59:01 -0700 Subject: [PATCH 277/467] pythonPackages.protobuf: disable tests for python2 setupwheels>=41.4 no longer collects the tests correctly --- pkgs/development/python-modules/protobuf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index d5ff4b04c595..73216f63f82b 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchpatch, python, buildPythonPackage, isPy37 -, protobuf, google_apputils, pyext, libcxx +, protobuf, google_apputils, pyext, libcxx, isPy27 , disabled, doCheck ? true }: with stdenv.lib; buildPythonPackage { inherit (protobuf) name src version; - inherit disabled doCheck; + inherit disabled; + doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 NIX_CFLAGS_COMPILE = # work around python distutils compiling C++ with $CC From 9055fd25352677c958ffa756db6d15ed2d8d6b34 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 09:03:13 -0700 Subject: [PATCH 278/467] pythonPackages.google-api-core: disable for python2 google.* namespace no longer works --- pkgs/development/python-modules/google_api_core/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 5cb027eef460..ef18aae8b6c2 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,9 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 , google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; version = "1.7.0"; + disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; From 8ef8be70b05a372b86095fb60b2174869313ee88 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 09:17:05 -0700 Subject: [PATCH 279/467] pythonPackages.green: 2.13.1 -> 3.0.0 --- .../python-modules/green/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 1493c78df834..a1167f24035d 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -1,18 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }: +{ lib, buildPythonPackage, fetchPypi, isPy3k +, colorama +, coverage +, termstyle +, lxml +, unidecode +, mock +, backports_shutil_get_terminal_size +}: buildPythonPackage rec { pname = "green"; - version = "2.13.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d"; + sha256 = "17cfgq0s02p5cjrsvcicqxiq6kflahjsd9pm03f054x7lpvqi5cv"; }; propagatedBuildInputs = [ - colorama coverage termstyle unidecode + colorama coverage termstyle unidecode lxml ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ]; + # let green run it's own test suite + checkPhase = '' + $out/bin/green green + ''; + meta = with lib; { description = "Python test runner"; homepage = https://github.com/CleanCut/green; From 192e73f7a14ffc3c2465e5be9674b046e4c19f83 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 14:43:38 -0700 Subject: [PATCH 280/467] poppler: 0.79.0 -> 0.81.0 --- pkgs/development/libraries/poppler/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bfe7d6dd4b48..3e1b0672a02a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.79.0"; + version = "0.81.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,19 +16,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr"; + sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91"; }; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { - name = "CVE-2019-9959.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch"; - sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1"; - }) - ]; - buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs From 641148260cdde296ea67fea4b6d979bd87d577a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 14:44:05 -0700 Subject: [PATCH 281/467] pythonPackages.pycurl: fix tests --- pkgs/development/python-modules/pycurl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 066e849f0aab..ce11b8497cfe 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -41,7 +41,8 @@ buildPythonPackage rec { and not test_keyfunction_bogus_return \ and not test_libcurl_ssl_gnutls \ and not test_libcurl_ssl_nss \ - and not test_libcurl_ssl_openssl" + and not test_libcurl_ssl_openssl" \ + --ignore=tests/getinfo_test.py ''; preConfigure = '' From d7acffb0b2e6cc9d595330339f85e71a83496c15 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 14:44:45 -0700 Subject: [PATCH 282/467] pythonPackages.aws-lambda-builds: 0.3.0 -> 0.4.0 --- .../python-modules/aws-lambda-builders/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 4554fe98c1b7..1e49edab25fe 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.3.0"; + version = "0.4.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1c3r3iz29s68mlmdsxbl65x5zqx25b89d40rir6729ck4gll4dyd"; + sha256 = "1z2l9qm6mxp90zl64i9j2cmlzn8n7sc8yfpqh14fi9ay887ayjs1"; }; # Package is not compatible with Python 3.5 @@ -35,7 +35,7 @@ buildPythonPackage rec { checkPhase = '' export PATH=$out/bin:$PATH - pytest tests/functional + pytest tests/functional -k 'not can_invoke_pip' ''; meta = with lib; { From 1e8150a26a3900c1539547d2c21cd4a8ae801455 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 14:45:52 -0700 Subject: [PATCH 283/467] aws-sam-cli: 0.16.1 -> 0.22.0 --- .../development/tools/aws-sam-cli/default.nix | 23 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 0e511271e1c1..67abd284952d 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,21 +5,26 @@ let py = python.override { packageOverrides = self: super: { - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "6.7"; + + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.14.0"; src = oldAttrs.src.override { inherit version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + sha256 = "1cghn1m7ana9s8kyg61dwp9mrism5l04vy5rj1wnmksz8vzmnq9w"; }; }); - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.10.0"; + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.1.1"; src = oldAttrs.src.override { inherit version; - sha256 = "0e1fa094c6791b233f5e73f2f0803ec6e0622f2320ec5a969f0986855221b92b"; + sha256 = "0grwi50v3vahvcijlw6g6q55yc5jyj0p1cmiq3rkycxnfr16i81g"; }; + nativeBuildInputs = [ super.setuptools_scm ]; + propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [ pyrsistent attrs importlib-metadata ]; + doCheck = false; }); + }; }; @@ -29,11 +34,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.16.1"; + version = "0.22.0"; src = fetchPypi { inherit pname version; - sha256 = "2dd68800723c76f52980141ba704e105d77469b6ba465781fbc9120e8121e76c"; + sha256 = "1flbvqlj5llz7nrszmcf00v2a1pa36alv90r1l8lwn8zid5aabkn"; }; # Tests are not included in the PyPI package @@ -55,8 +60,10 @@ buildPythonApplication rec { six ]; + # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.22.0" + substituteInPlace requirements/base.txt --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0" substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8a3d8c1aaef..09cf9b0dc9e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -694,7 +694,7 @@ in aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; From 3161b8b914d65ee204c282ff4285c7c3d56758e8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 14:57:48 -0700 Subject: [PATCH 284/467] pythonPackages.coloredlogs: disable impure tests --- pkgs/development/python-modules/coloredlogs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 48eb4520b169..f27cf5abe751 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { }); checkPhase = '' - PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format" + PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ + and not test_auto_install" ''; checkInputs = [ pytest mock utillinux ]; From a5f7791bcfe0df7229a8044743c1aaa2929b9785 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:06:58 -0700 Subject: [PATCH 285/467] pythonPackages.cerberus: fix tests --- pkgs/development/python-modules/cerberus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 81f6ef1e8371..3773e6a834ce 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; + checkPhase = '' + pytest -k 'not nested_oneofs' + ''; + meta = with stdenv.lib; { homepage = http://python-cerberus.org/; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; From 3f2af8219bc4406f760e5bd7f9477d3c15b261a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:07:16 -0700 Subject: [PATCH 286/467] pythonPackages.eve: fix dependency bounds --- pkgs/development/python-modules/eve/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 2e913edf03a9..73813d34c5a3 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -19,6 +19,11 @@ buildPythonPackage rec { werkzeug ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "werkzeug==0.15.4" "werkzeug" + ''; + # tests call a running mongodb instance doCheck = false; From debf4f9e13aea0c0bf18d09389fd80d66495d93c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:40:18 -0700 Subject: [PATCH 287/467] pythonPackages.keras-preprocessing: 1.0.9 -> 1.1.0 --- .../python-modules/keras-preprocessing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 96c38f3cd89d..01a0cf0dfb74 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.9"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac"; + sha256 = "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as"; }; propagatedBuildInputs = [ From 7045cc833674346dbb6f3d1e300089801bd32033 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:43:16 -0700 Subject: [PATCH 288/467] pythonPackages.diff_cover: 1.0.2 -> 2.3.0 --- .../python-modules/diff_cover/default.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 57f0a1ef2381..120a59670f8e 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,10 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments, - six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git, - pylint, pydocstyle, fetchpatch, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi +, inflect +, jinja2 +, jinja2_pluralize +, pygments +, six +# test dependencies +, coverage +, flake8 +, mock +, nose +, pycodestyle +, pyflakes +, pylint +, pytest +}: buildPythonPackage rec { pname = "diff_cover"; - version = "1.0.2"; + version = "2.3.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -12,20 +25,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1wbp0kfv2mjxwnq2jlqmwvb71fywwc4x4azxi7ll5dll6nhjyd61"; + sha256 = "1kfv5icvnljh9c97i3fykh0zlba1zjz0rb3p9x06hdwh25n81915"; }; - patches = [ - (fetchpatch { - name = "tests-fix.patch"; - url = "https://github.com/Bachmann1234/diff-cover/commit/85c30959c8ed2aa3848f400095a2418f15bb7777.patch"; - sha256 = "0xni4syrxww9kdv8495f416vqgfdys4w2hgf5rdi35hy3ybfslh0"; - }) - ]; - propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; - checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git glibcLocales ]; + checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; + + # ignore tests which try to write files + checkPhase = '' + pytest -k 'not added_file_pylint_console and not file_does_not_exist' + ''; meta = with stdenv.lib; { description = "Automatically find diff lines that need test coverage"; From dd5522ad538f9fbd4d6a12eb0dfcc19392f59085 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:51:05 -0700 Subject: [PATCH 289/467] pythonPackages.paste: 3.0.8 -> 3.2.2 --- pkgs/development/python-modules/paste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 21e5a04c3916..210996123a36 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "paste"; - version = "3.0.8"; + version = "3.2.2"; src = fetchPypi { pname = "Paste"; inherit version; - sha256 = "05w1sh6ky4d7pmdb8nv82n13w22jcn3qsagg5ih3hjmbws9kkwf4"; + sha256 = "15p95br9x7zjy0cckdy6xmhfg61cg49rhi75jd00svrnz234s7qb"; }; propagatedBuildInputs = [ six ]; From 4ba99e2361a193115453ea9a539bc2c9c9479aaf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:51:31 -0700 Subject: [PATCH 290/467] pythonPackages.webtest: disable for python2 python2 tries to import paste.deploy, which is no longer valid --- pkgs/development/python-modules/webtest/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index f3d60253ae47..d97d58b2e5d2 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , nose , webob , six @@ -15,6 +16,7 @@ buildPythonPackage rec { version = "2.0.32"; pname = "webtest"; + disabled = isPy27; # paste.deploy is not longer a valid import src = fetchPypi { pname = "WebTest"; From ded0a4b6c02b56f66099d6016dc1895e4e111a6d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 15:54:18 -0700 Subject: [PATCH 291/467] pythonPackages.astor: disable for python2 The setup.py is no longer valid with setuptools>=41.4.0 --- pkgs/development/python-modules/astor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 903b892f3222..ecbbaa3824f8 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest }: buildPythonPackage rec { pname = "astor"; version = "0.8.0"; + disabled = isPy27; # setup.py is no longer valid with setuptools>=41.4 src = fetchPypi { inherit pname version; From 5ea783a60cc7a271abaef3388a42472d2a72add5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 16:03:40 -0700 Subject: [PATCH 292/467] pythonPackages.factory_boy: fix python2 dependencies --- .../python-modules/factory_boy/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0c87f309489e..becf1cc19726 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -1,8 +1,10 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 , faker , python +, ipaddress }: buildPythonPackage rec { @@ -14,16 +16,12 @@ buildPythonPackage rec { sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; }; - propagatedBuildInputs = [ faker ]; + propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; # tests not included with pypi release doCheck = false; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "A Python package to create factories for complex objects"; homepage = https://github.com/rbarrois/factory_boy; license = licenses.mit; From 96ea386418109ed17415445d0475858497d42141 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 16:04:09 -0700 Subject: [PATCH 293/467] pythonPackages.faker: 1.0.8 -> 2.0.3 --- .../python-modules/faker/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 7aed501a8105..6de5c25c7333 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -10,26 +10,28 @@ , pytestrunner , random2 , ukpostcodeparser + , validators }: assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.8"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "6886d58f3c24d8ecdaa3740b138121614197ffd3e0adfb0cb02ca4e71e292dfe"; + sha256 = "19zdcdmc11syjbmnbq98yny3dwb5jqw8cxcbq9g2scwzc5f7b32y"; }; - buildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytestrunner ]; checkInputs = [ email_validator freezegun pytest random2 ukpostcodeparser + validators ] ++ lib.optionals (pythonOlder "3.3") [ mock ] ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; @@ -38,18 +40,10 @@ buildPythonPackage rec { dateutil six text-unidecode - ] ++ lib.optional (pythonOlder "3.3") ipaddress; + ]; postPatch = '' substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" - - # see https://github.com/joke2k/faker/pull/911, fine since we pin correct - # versions for python2 - substituteInPlace setup.py --replace "more-itertools<6.0.0" "more-itertools" - - # https://github.com/joke2k/faker/issues/970 - substituteInPlace setup.py --replace "random2==1.0.1" "random2>=1.0.1" - substituteInPlace setup.py --replace "freezegun==0.3.11" "freezegun>=0.3.11" ''; meta = with lib; { From c2b43fa65769c951828545fdb62b6a29802e64ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 17 Oct 2019 17:02:23 -0700 Subject: [PATCH 294/467] pythonPackages.astor: fix packaging --- pkgs/development/python-modules/astor/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index ecbbaa3824f8..6343b9eb8e46 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,15 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }: buildPythonPackage rec { pname = "astor"; version = "0.8.0"; - disabled = isPy27; # setup.py is no longer valid with setuptools>=41.4 src = fetchPypi { inherit pname version; sha256 = "0qkq5bf13fqcwablg0nk7rx83izxdizysd42n26j5wbingcfx9ip"; }; + # fix packaging for setuptools>=41.4 + patches = [ + ( fetchpatch { + url = "https://github.com/berkerpeksag/astor/pull/163/commits/c908d1136cdfb058f5e9d81b4d3687931aa1ebfb.patch"; + sha256 = "06mrx3qxfjyx9v76kxsj2b7zyqwrwlyd5z1fh77jbb8yl6m0nacd"; + }) + ]; + # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 checkInputs = [ pytest ]; checkPhase = '' From 6a9de0eb7905a265b8313c8c34a5cf8d6170405f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Oct 2019 12:41:53 +0200 Subject: [PATCH 295/467] python.pkgs.bootstrapped-pip: 19.3 -> 19.3.1 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 29695ddbbc82..d9deaf19c6c1 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "19.3"; + version = "19.3.1"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "e100a7eccf085f0720b4478d3bb838e1c179b1e128ec01c0403f84e86e0e2dfb"; + sha256 = "6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7"; }; dontUseSetuptoolsBuild = true; From 445c68a1f745b4145d0d68991144a9d5ec0dfc9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Oct 2019 12:42:06 +0200 Subject: [PATCH 296/467] python.pkgs.pip: 19.3 -> 19.3.1 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 535489c65252..ef61e7eb676e 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pip"; - version = "19.3"; + version = "19.3.1"; format = "other"; src = fetchPypi { inherit pname version; - sha256 = "324d234b8f6124846b4e390df255cacbe09ce22791c3b714aa1ea6e44a4f2861"; + sha256 = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7"; }; nativeBuildInputs = [ bootstrapped-pip ]; From 9199729df44d01385159776fd9e315b3789524f0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Aug 2019 13:58:33 -0500 Subject: [PATCH 297/467] openssh: 7.9p1 -> 8.1p1 https://www.openwall.com/lists/oss-security/2019/04/18/1 --- pkgs/tools/networking/openssh/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index bb51e3153e13..e2fd4e3e1ff1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,16 +13,16 @@ let gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "d80ebbf028196b2478beebf5a290b97f35e1eed9" + + "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae" + "/debian/patches/gssapi.patch"; - sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv"; + sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv"; }; in with stdenv.lib; stdenv.mkDerivation rec { pname = "openssh"; - version = if hpnSupport then "7.8p1" else "7.9p1"; + version = if hpnSupport then "7.8p1" else "8.1p1"; src = if hpnSupport then fetchurl { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; - sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; + sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82"; }; patches = @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch + ./ssh-keysign.patch + ] ++ optional hpnSupport # CVE-2018-20685, can probably be dropped with next version bump # See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt # for details @@ -50,9 +52,6 @@ stdenv.mkDerivation rec { url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch; sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds"; }) - - ./ssh-keysign.patch - ] ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = From 6db7c9cf1d6c1c1fdc365a1214e6bbbb36a2acb8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 May 2019 03:24:47 -0500 Subject: [PATCH 298/467] nixos: add release note for openssh upgrade \o/ --- nixos/doc/manual/release-notes/rl-2003.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index bdf56acd5451..f4962420fcb0 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -88,6 +88,14 @@ SD images are now compressed by default using bzip2. + + + OpenSSH has been upgraded from 7.9 to 8.1, improving security and adding features + but with potential incompatibilities. Consult the + + release announcement for more information. + + From e6d641d957c8bc63c470d08ca43f111377a8693e Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 4 Sep 2019 21:00:11 +0000 Subject: [PATCH 299/467] openssh: mark hpnSupport as broken We're hoping to deprecate HPN support, given that as far as we can tell, nobody is using it, and the patches seem rather unmaintained. --- pkgs/tools/networking/openssh/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index e2fd4e3e1ff1..d592d6da8f2b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -110,5 +110,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; + broken = hpnSupport; }; } From 9bfec806dfcc0f0ae43f17ab5a139c5a45aaf5e0 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 20 Jun 2019 17:15:33 +0000 Subject: [PATCH 300/467] openssh: don't let configure override SSH_KEYSIGN While 9fe10288f01984963faf47e21bf1bae4d7d37962 ensured that the ssh-keysign path is searched for in PATH if not absolute, it doesn't prevent the configure script from defaulting to an absolute path in $out/libexec, making the whole effort rather pointless. --- pkgs/tools/networking/openssh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d592d6da8f2b..2a1122029c12 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -88,6 +88,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; + buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; + enableParallelBuilding = true; hardeningEnable = [ "pie" ]; From 0a8ac3b6bea6aae97c34aec64431b3a5e18db8a7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 20 Oct 2019 05:51:45 +0000 Subject: [PATCH 301/467] gtk3: Enable separated debug info on Linux When debugging gtk3 errors or errors in applications that use gtk, it can be useful to have full debuginfo. This adds debug information in a separate output so it will not bloat normal systems. --- pkgs/development/libraries/gtk/3.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 0e4fddaa010f..e0810766ee58 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { ./patches/3.0-darwin-x11.patch ]; + separateDebugInfo = stdenv.isLinux; + mesonFlags = [ "-Dtests=false" ]; From baf549433058e844ac3b8a402c1255f67c014ccb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 18 Oct 2019 13:13:01 +0200 Subject: [PATCH 302/467] python37Packages.cryptography: 2.7 -> 2.8 Changelog: https://cryptography.io/en/latest/changelog/#v2-8 Important changes: - Deprecated support for OpenSSL 1.0.1. Support will be removed in cryptography 2.9. - cryptography no longer depends on asn1crypto. - Added support for Python 3.8. --- .../python-modules/cryptography/default.nix | 13 ++----------- .../python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 2a5d4fa47573..82d0b43bc350 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -5,7 +5,6 @@ , openssl , cryptography_vectors , darwin -, asn1crypto , packaging , six , pythonOlder @@ -22,11 +21,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.7"; # Also update the hash in vectors.nix + version = "2.8"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76"; + sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw"; }; outputs = [ "out" "dev" ]; @@ -34,7 +33,6 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ - asn1crypto packaging six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 @@ -55,13 +53,6 @@ buildPythonPackage rec { py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' ''; - patches = [ - (fetchpatch { - url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch"; - sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp"; - }) - ]; - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index ea24ed908016..86cc195b05b3 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi"; + sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc"; }; # No tests included From 5118f12a07b5bb839806d364e0a0ed9f7aa5cc40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 17:02:48 +0200 Subject: [PATCH 303/467] Revert "poppler: 0.79.0 -> 0.81.0" Reverting because this breaks texlive.bin. This reverts commit 192e73f7a14ffc3c2465e5be9674b046e4c19f83. --- pkgs/development/libraries/poppler/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3e1b0672a02a..bfe7d6dd4b48 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.81.0"; + version = "0.79.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,11 +16,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91"; + sha256 = "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr"; }; outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "CVE-2019-9959.patch"; + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch"; + sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1"; + }) + ]; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs From 1fca2ab52dacc18bb0e7a152709924c585760737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 17:33:43 +0200 Subject: [PATCH 304/467] python: zope.testrunner: 5.0 -> 5.1 --- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 53b39577c39a..f6bf7f96a767 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.0"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "0d8a27e214033b6f1e557556e61bff9568ae95676dfcc8a032483fdeeee792c3"; + sha256 = "354a65f6c6fe6c0584e2fcf06d7318e90dc7f7de1b7008d8913733e299317870"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From 56727dc1ff430bc2d39b08601e03094de4ab189e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 15:33:35 +0200 Subject: [PATCH 305/467] Python: setuptools/wheel/pip now bootstrap from source Since wheel support was introduced in 2015 we always relied on pre-built wheels for bootstrapping. Now, we can bootstrap directly from the sources of these packages in git. The `bootstrapped-pip` packages is used to build `pip`, `setuptools` and `wheel`, after which those packages are used to build everything else. Note that when building `bootstrapped-pip` some errors are shown. These are not important, the build actually does succeed and work as intended. --- .../bootstrapped-pip/default.nix | 75 +++++++++---------- .../python-modules/pip/default.nix | 13 ++-- .../python-modules/setuptools/default.nix | 35 +++++++-- .../python-modules/wheel/default.nix | 11 ++- 4 files changed, 79 insertions(+), 55 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index d9deaf19c6c1..8bb713b76416 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,35 +1,19 @@ { stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook , pipInstallHook , setuptoolsBuildHook - +, wheel, pip, setuptools }: -let - wheel_source = fetchPypi { - pname = "wheel"; - version = "0.33.6"; - format = "wheel"; - sha256 = "f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28"; - }; - setuptools_source = fetchPypi { - pname = "setuptools"; - version = "41.4.0"; - format = "wheel"; - sha256 = "8d01f7ee4191d9fdcd9cc5796f75199deccb25b154eba82d44d6a042cf873670"; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "pip"; - version = "19.3.1"; + inherit (pip) version; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; - src = fetchPypi { - inherit pname version; - format = "wheel"; - sha256 = "6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7"; - }; + srcs = [ wheel.src pip.src setuptools.src ]; + sourceRoot = "."; dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; # Should be propagatedNativeBuildInputs propagatedBuildInputs = [ @@ -38,13 +22,6 @@ in stdenv.mkDerivation rec { (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) ]; - unpackPhase = '' - mkdir -p $out/${python.sitePackages} - unzip -d $out/${python.sitePackages} $src - unzip -d $out/${python.sitePackages} ${setuptools_source} - unzip -d $out/${python.sitePackages} ${wheel_source} - ''; - postPatch = '' mkdir -p $out/bin ''; @@ -52,18 +29,38 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ python ]; - installPhase = '' + buildPhase = ":"; - # install pip binary - echo '#!${python.interpreter}' > $out/bin/pip - echo 'import sys;from pip._internal import main' >> $out/bin/pip - echo 'sys.exit(main())' >> $out/bin/pip - chmod +x $out/bin/pip + installPhase = stdenv.lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 + '' + '' + # Give folders a known name + mv pip* pip + mv setuptools* setuptools + mv wheel* wheel + # Set up PYTHONPATH. The above folders need to be on PYTHONPATH + # $out is where we are installing to and takes precedence + export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel" - # wrap binaries with PYTHONPATH - for f in $out/bin/*; do - wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/ - done + echo "Building setuptools wheel..." + pushd setuptools + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + popd + + echo "Building wheel wheel..." + pushd wheel + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + popd + + echo "Building pip wheel..." + pushd pip + ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild . + popd ''; + meta = { + description = "Version of pip used for bootstrapping"; + license = stdenv.lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license); + homepage = pip.meta.homepage; + }; } diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index ef61e7eb676e..e1af281b9e91 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , bootstrapped-pip -, fetchPypi +, fetchFromGitHub , mock , scripttest , virtualenv @@ -17,9 +17,12 @@ buildPythonPackage rec { version = "19.3.1"; format = "other"; - src = fetchPypi { - inherit pname version; - sha256 = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7"; + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "079gz0v37ah1l4i5iwyfb0d3mni422yv5ynnxa0wcqpnvkc7sfnw"; + name = "${pname}-${version}-source"; }; nativeBuildInputs = [ bootstrapped-pip ]; @@ -34,7 +37,7 @@ buildPythonPackage rec { meta = { description = "The PyPA recommended tool for installing Python packages"; - license = lib.licenses.mit; + license = with lib.licenses; [ mit ]; homepage = https://pip.pypa.io/; priority = 10; }; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 5053a46f4bf8..9254e53d1428 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , python , wrapPython , unzip @@ -11,19 +11,40 @@ , setuptoolsBuildHook }: -buildPythonPackage rec { +let pname = "setuptools"; version = "41.4.0"; + + # Create an sdist of setuptools + sdist = stdenv.mkDerivation rec { + name = "${pname}-${version}-sdist.tar.gz"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = "v${version}"; + sha256 = "0asxfnsi56r81lm48ynqbfkmm3kvw2jwrlf2l9azn5w6xm30jvp5"; + name = "${pname}-${version}-source"; + }; + + buildPhase = '' + ${python.pythonForBuild.interpreter} bootstrap.py + ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar + ''; + + installPhase = '' + echo "Moving sdist..." + mv dist/*.tar.gz $out + ''; + }; +in buildPythonPackage rec { + inherit pname version; # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. # Instead, we override it to remove setuptools to avoid a circular dependency. # The same is done for pip and the pipInstallHook. format = "other"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d"; - }; + src = sdist; nativeBuildInputs = [ bootstrapped-pip diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 0ba5b19597ee..8b6aa35b1ac6 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -2,7 +2,7 @@ , setuptools , pip , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , pytestcov , coverage @@ -15,9 +15,12 @@ buildPythonPackage rec { version = "0.33.6"; format = "other"; - src = fetchPypi { - inherit pname version; - sha256 = "10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646"; + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "1bg4bxazsjxp621ymaykd8l75k7rvcvwawlipmjk7nsrl72l4p0s"; + name = "${pname}-${version}-source"; }; checkInputs = [ pytest pytestcov coverage ]; From 5b55013aa274c14df01982e4ed3e8c3c3581c744 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 11:14:16 +0200 Subject: [PATCH 306/467] python2: 2.7.16 -> 2.7.17 Co-authored-by: Dmitry Kalinkin --- .../interpreters/python/cpython/2.7/default.nix | 6 ------ .../python/cpython/2.7/python-2.7-distutils-C++.patch | 7 +++---- pkgs/development/interpreters/python/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 4e323898afbf..de980f1ca687 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,12 +79,6 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) - (fetchpatch { - url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch"; - name = "CVE-2018-20852.patch"; - sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb"; - }) - # Fix race-condition during pyc creation. Has a slight backwards # incompatible effect: pyc symlinks will now be overridden # (https://bugs.python.org/issue17222). Included in python >= 3.4, diff --git a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch index 90c21d5e60ca..78d9272d098a 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch @@ -93,8 +93,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SO', 'AR', - 'ARFLAGS') + (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ @@ -120,8 +120,7 @@ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] + cflags = cflags + ' ' + os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CXXFLAGS' in os.environ: + cxxflags = os.environ['CXXFLAGS'] diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4c22cdaca920..cf658cccfcda 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -52,10 +52,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "16"; + patch = "17"; suffix = ""; }; - sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; + sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd"; inherit (darwin) CF configd; inherit passthruFun; }; From 038e940717dafa9c030532a57a9a59177310a652 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 09:27:09 +0200 Subject: [PATCH 307/467] python: urllib3: 1.24.3 -> 1.25.6 --- pkgs/development/python-modules/urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index e50d90266bf6..57d5c160ef09 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.24.3"; + version = "1.25.6"; src = fetchPypi { inherit pname version; - sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"; + sha256 = "9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"; }; outputs = [ "out" "dev" ]; From 14bb6186c4f265eb7b2faa1dc57842535178a2f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 09:37:16 +0200 Subject: [PATCH 308/467] python: python-jenkins: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/python-jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 8f1893682aec..79e7efc514c4 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1h14hfcwichmppbgxf1k8njw29hchpav1kj574b4lly3j0n2vnag"; + sha256 = "0b11f7c1dffc48579afefa8a310cba5b1c98785b9132892ff8cf5312f32ebc90"; }; buildInputs = [ mock ]; From d5f03bab3b8907187b5d546647051060afd9a0ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 09:37:57 +0200 Subject: [PATCH 309/467] python: aenum: 2.1.4 -> 2.2.1 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index b3db5aa7b811..3861c9a4cb43 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.1.4"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0644e5d19627beaaf01ca1a8349371f9de962eeb63c2b2c28045b2e674975b8c"; + sha256 = "b12a7be3d89b270f266f8643aaa126404e5cdc0929bd6f09548b8eaed85e2aa1"; }; # For Python 3, locale has to be set to en_US.UTF-8 for From 5c388dcf85a44ef2825137cfcb283c99de89f530 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 09:41:02 +0200 Subject: [PATCH 310/467] python: dill: 0.2.9 -> 0.3.1.1 --- pkgs/development/python-modules/dill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index af24ad8ed04c..c1085255c2d2 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.9"; + version = "0.3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f"; + sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; }; # Messy test suite. Even when running the tests like tox does, it fails From 7391a7d584716f06e99c41d610c5c4306630b890 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 25 Jul 2019 12:34:22 +0200 Subject: [PATCH 311/467] buildRustPackage: support checkFlags and checkFlagsArray --- pkgs/build-support/rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 27601e481c68..8b41d992d1ef 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -149,8 +149,8 @@ stdenv.mkDerivation (args // { checkPhase = args.checkPhase or '' runHook preCheck - echo "Running cargo test" - cargo test + echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ''; From 2deef75624140ddf6d4dec59ab8e72098a026e44 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 25 Jul 2019 12:34:44 +0200 Subject: [PATCH 312/467] rust-cbindgen: skip expand tests The expand tests require unstable rust features. --- pkgs/development/tools/rust/cbindgen/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index d58b848c87e9..64b40bdecf34 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - # https://github.com/eqrion/cbindgen/issues/338 - RUSTC_BOOTSTRAP = 1; + checkFlags = [ + # https://github.com/eqrion/cbindgen/issues/338 + "--skip test_expand" + ]; meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; From f19920f75597c1cb73d481394bc1700483fe6b56 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 20 Oct 2019 03:04:23 +0200 Subject: [PATCH 313/467] rust-cbdindgen: 0.9.0 -> 0.9.1 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 64b40bdecf34..8e08e5e50eb8 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; + sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19"; }; - cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; + cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From b4f278a07c8ec97716eb67b843445cfb40bf8a71 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 21 Oct 2019 17:29:53 +0200 Subject: [PATCH 314/467] nss: 3.46 -> 3.46.1 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index b6b1d406eacd..ff72d87f3c39 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.46"; + version = "3.46.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb"; + sha256 = "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 61017517a34cfd7c542ba8b3a3d19ed8c2c120da Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 21 Oct 2019 17:34:20 +0200 Subject: [PATCH 315/467] sqlite: 3.28.0 -> 3.30.0 Also bumps sqlite3_analyze as those have to be kept in sync --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 3c5761b767ec..6de71d066ade 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.28.0"; + version = "3.30.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; - sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh"; + sha256 = "0d4i87q0f618pmrgax0mr5x7m8bywikrwjvixag3biyhgl5rx7fd"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 9ba5da0c910c..529b3ba9e71f 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.28.0"; + version = "3.30.0"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn"; + sha256 = "0n7w839y55dc3qqf2zv8xk6238cc6mpx24q4w5amwic7g96cza70"; }; outputs = [ "bin" "dev" "out" ]; From 1b2b4768f6807523c1d26f86f89f974ca3a8a0b3 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 21 Oct 2019 17:43:28 +0200 Subject: [PATCH 316/467] firefox: 69.0.2 -> 70.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index eabd3239586a..2b6949d4c344 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "69.0.2"; + ffversion = "70.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2ag1syrvlkch7vl151hkq8abf86p9v6b6gmgcbh26b8wfva1p1ss1x09h4w50zmcc6jq4q5mcxgf1sd9zna552jl90k1y4rqvrrzwl6"; + sha512 = "1rjji7w0rf4b7h6hyllwav1xcbaiv37jmf5s0n0c3cwf9b76yhf8nhygm1a97m26f6rvbmhcv0dx4l8bh06cz9mcbbxy4lhsn43sr62"; }; patches = [ From e1b6b9056d4001030b65ccea649b75b58c1e77d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 21 Oct 2019 08:57:20 -0700 Subject: [PATCH 317/467] pythonPackages.lxml: 4.3.3 -> 4.4.1 reduce closure size by not propagating native dependencies --- .../python-modules/lxml/default.nix | 32 +++++++++++-------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f054f26a527d..f2cc1663041e 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,28 +1,34 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ stdenv, buildPythonPackage, fetchFromGitHub +, cython , libxml2 , libxslt +, zlib }: buildPythonPackage rec { pname = "lxml"; - version = "4.3.5"; + version = "4.4.1"; - src = fetchPypi { - inherit pname version; - sha256 = "738862e9724d201f1aa8394cb666d8136d666198e97d6e1e5c9876ad884a86b3"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "1hkl3bhbwiwwfb57nq9lr24rkp782ymfvqrdf9x1wifc79ivlbxw"; }; - nativeBuildInputs = [ libxml2.dev libxslt.dev ]; - propagatedBuildInputs = [ libxml2 libxslt ]; + # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs + nativeBuildInputs = [ libxml2.dev libxslt.dev cython ]; + buildInputs = [ libxml2 libxslt zlib ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + # tests are meant to be ran "in-place" in the same directory as src + doCheck = false; - meta = { + pythonImportsCheck = [ "lxml" "lxml.etree" ]; + + meta = with stdenv.lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = https://lxml.de; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sjourdois ]; + license = licenses.bsd3; + maintainers = with maintainers; [ jonringer sjourdois ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34bfb5019aa5..adebb9ac392f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3707,7 +3707,7 @@ in { logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; - lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; + lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;}; lxc = callPackage ../development/python-modules/lxc { }; From 396190acb1e22d1dc523d7367f0619c113d8d11c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 21 Oct 2019 19:59:52 +0000 Subject: [PATCH 318/467] perlPackages: move CPAN libs to perl-packages.nix and non-CPAN libs out of perl-packages.nix --- .../perl-modules/BerkeleyDB/default.nix | 16 - .../Compress-Raw-Zlib/default.nix | 27 -- .../perl-modules/DBD-Oracle/default.nix | 20 - .../perl-modules/DBD-Pg/default.nix | 25 -- .../perl-modules/DBD-SQLite/default.nix | 32 -- .../perl-modules/DBD-mysql/default.nix | 18 - .../perl-modules/DBD-sybase/default.nix | 18 - .../perl-modules/DB_File/default.nix | 20 - .../perl-modules/Mozilla-LDAP/default.nix | 17 + .../perl-modules/Percona-Toolkit/default.nix | 20 + .../development/perl-modules/Po4a/default.nix | 36 ++ .../WWW-YoutubeViewer/default.nix | 31 ++ pkgs/development/perl-modules/ham/default.nix | 42 ++ .../perl-modules/net-amazon-ec2-ipv6.patch | 51 --- .../net-amazon-ec2-nova-compat.patch | 21 - .../strip-nondeterminism/default.nix | 33 ++ pkgs/top-level/perl-packages.nix | 373 +++++++++--------- 17 files changed, 358 insertions(+), 442 deletions(-) delete mode 100644 pkgs/development/perl-modules/BerkeleyDB/default.nix delete mode 100644 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix delete mode 100644 pkgs/development/perl-modules/DBD-Oracle/default.nix delete mode 100644 pkgs/development/perl-modules/DBD-Pg/default.nix delete mode 100644 pkgs/development/perl-modules/DBD-SQLite/default.nix delete mode 100644 pkgs/development/perl-modules/DBD-mysql/default.nix delete mode 100644 pkgs/development/perl-modules/DBD-sybase/default.nix delete mode 100644 pkgs/development/perl-modules/DB_File/default.nix create mode 100644 pkgs/development/perl-modules/Mozilla-LDAP/default.nix create mode 100644 pkgs/development/perl-modules/Percona-Toolkit/default.nix create mode 100644 pkgs/development/perl-modules/Po4a/default.nix create mode 100644 pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix create mode 100644 pkgs/development/perl-modules/ham/default.nix delete mode 100644 pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch delete mode 100644 pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch create mode 100644 pkgs/development/perl-modules/strip-nondeterminism/default.nix diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix deleted file mode 100644 index b23db8e1edfe..000000000000 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{buildPerlPackage, fetchurl, db}: - -buildPerlPackage { - pname = "BerkeleyDB"; - version = "0.61"; - - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz"; - sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; - }; - - preConfigure = '' - echo "LIB = ${db.out}/lib" > config.in - echo "INCLUDE = ${db.dev}/include" >> config.in - ''; -} diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix deleted file mode 100644 index 1163b6cb15b3..000000000000 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, buildPerlPackage, zlib, stdenv }: - -buildPerlPackage { - pname = "Compress-Raw-Zlib"; - version = "2.086"; - - src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz; - sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; - }; - - preConfigure = '' - cat > config.in < config.in < ( is => 'ro', isa => 'Str', required => 0 ); - has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); -+has 'dns_name_v6' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); - has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 ); - has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); - has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); -diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm ---- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm 2011-06-13 19:45:30.000000000 -0400 -+++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm 2011-10-27 17:25:29.000000000 -0400 -@@ -1691,6 +1691,7 @@ - my $self = shift; - my %args = validate( @_, { - InstanceId => { type => SCALAR | ARRAYREF, optional => 1 }, -+ Action => { default => "DescribeInstances" }, - }); - - # If we have a array ref of instances lets split them out into their InstanceId.n format -@@ -1703,7 +1704,8 @@ - } - } - -- my $xml = $self->_sign(Action => 'DescribeInstances', %args); -+ my $xml = $self->_sign(Action => $args{Action}, %args); -+ delete $args{Action}; - my $reservations; - - if ( grep { defined && length } $xml->{Errors} ) { -@@ -1791,6 +1793,7 @@ - my $running_instance = Net::Amazon::EC2::RunningInstances->new( - ami_launch_index => $instance_elem->{amiLaunchIndex}, - dns_name => $instance_elem->{dnsName}, -+ dns_name_v6 => $instance_elem->{dnsNameV6}, - image_id => $instance_elem->{imageId}, - kernel_id => $instance_elem->{kernelId}, - ramdisk_id => $instance_elem->{ramdiskId}, diff --git a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch deleted file mode 100644 index 5d9aef7f70d4..000000000000 --- a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm ---- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm 2010-02-02 02:26:58.000000000 +0100 -+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.861341300 +0200 -@@ -1552,6 +1552,8 @@ - $args{"InstanceId." . $count} = $instance_id; - $count++; - } -+ } else { -+ $args{"InstanceId.1"} = delete $args{InstanceId}; - } - - my $xml = $self->_sign(Action => 'DescribeInstances', %args); -@@ -3739,6 +3741,8 @@ - $args{"InstanceId." . $count} = $instance_id; - $count++; - } -+ } else { -+ $args{"InstanceId.1"} = delete $args{InstanceId}; - } - - my $xml = $self->_sign(Action => 'TerminateInstances', %args); diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix new file mode 100644 index 000000000000..3e638bfb1930 --- /dev/null +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -0,0 +1,33 @@ +{ lib, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio }: + +buildPerlPackage rec { + pname = "strip-nondeterminism"; + version = "1.0.0"; + + outputs = [ "out" "dev" ]; # no "devdoc" + + src = fetchFromGitLab { + owner = "reproducible-builds"; + repo = "strip-nondeterminism"; + domain = "salsa.debian.org"; + rev = version; + sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64"; + }; + + # stray test failure + doCheck = false; + + buildInputs = [ ArchiveZip ArchiveCpio file ]; + + perlPostHook = '' + # we don’t need the debhelper script + rm $out/bin/dh_strip_nondeterminism + rm $out/share/man/man1/dh_strip_nondeterminism.1.gz + ''; + + meta = with lib; { + description = "A Perl module for stripping bits of non-deterministic information"; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1ccdec9bcf3..35ed1d48580f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,8 +5,7 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, - buildPerl, shortenPerlShebang}: +{config, pkgs, fetchurl, stdenv, 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"; @@ -930,7 +929,20 @@ let }; }; - BerkeleyDB = callPackage ../development/perl-modules/BerkeleyDB { }; + BerkeleyDB = buildPerlPackage { + pname = "BerkeleyDB"; + version = "0.61"; + + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz"; + sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; + }; + + preConfigure = '' + echo "LIB = ${pkgs.db.out}/lib" > config.in + echo "INCLUDE = ${pkgs.db.dev}/include" >> config.in + ''; + }; BHooksEndOfScope = buildPerlPackage { pname = "B-Hooks-EndOfScope"; @@ -2724,7 +2736,31 @@ let }; }; - CompressRawZlib = callPackage ../development/perl-modules/Compress-Raw-Zlib { }; + CompressRawZlib = buildPerlPackage { + pname = "Compress-Raw-Zlib"; + version = "2.086"; + + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz; + sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; + }; + + preConfigure = '' + cat > config.in < config.in < Date: Sun, 11 Aug 2019 00:42:42 +0000 Subject: [PATCH 319/467] buildPerlPackage: remove postFixup It has no effect since system-wide $PERL5LIB removed more than an year ago --- pkgs/development/perl-modules/generic/builder.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 253e7e0bdc74..9b42401fc4dc 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -25,17 +25,6 @@ preConfigure() { perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } - -postFixup() { - # If a user installs a Perl package, she probably also wants its - # dependencies in the user environment (since Perl modules don't - # have something like an RPATH, so the only way to find the - # dependencies is to have them in the PERL5LIB variable). - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi -} - if test -n "$perlPreHook"; then eval "$perlPreHook" fi From 4db798cd548083da57a0d328ee7adbd4011be108 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:33 +0000 Subject: [PATCH 320/467] [cpan2nix] perlPackages.ApacheTest: 1.41 -> 1.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35ed1d48580f..c4f9d9007077 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -379,10 +379,10 @@ let ApacheTest = buildPerlPackage { pname = "Apache-Test"; - version = "1.41"; + version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.41.tar.gz; - sha256 = "065hka389fq8kq4623li519a6bqk84dmpiwg7c2ahmiisswn1krq"; + url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz; + sha256 = "1sxk7dmpg3ib1dkl58ddh7zffnv5danwba7qxp82k54agmyz1086"; }; doCheck = false; meta = { From ad1db615a79a8f5d67bcda52f4310ddd89ea1422 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:35 +0000 Subject: [PATCH 321/467] [cpan2nix] perlPackages.BerkeleyDB: 0.61 -> 0.63 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4f9d9007077..8cf573557508 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -931,11 +931,11 @@ let BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; - version = "0.61"; + version = "0.63"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz"; - sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; + url = mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz; + sha256 = "1lh2a75cy85hqxlridk862nwzhrp762h74vy27hcbfgb4a6r62by"; }; preConfigure = '' From 7e7c4ca65574dc6dd17e445d99a9d8f50719f49b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:36 +0000 Subject: [PATCH 322/467] [cpan2nix] perlPackages.CPANPerlReleases: 4.10 -> 4.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8cf573557508..191ad8ecf19e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3266,10 +3266,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "4.10"; + version = "4.14"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-4.10.tar.gz; - sha256 = "1dgijw8rpvhy79ff8jbly5bwh7gdb7d6mn6vx5mm6krjfybdprrk"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-4.14.tar.gz; + sha256 = "0ki6bc0wdc047nyx2j4byk8nsrnm18vn0nr1s1x9wh3xi0wasn7r"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From 2d3ff88f06ef7fb8de572cdcb828c88c4b06f599 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:37 +0000 Subject: [PATCH 323/467] [cpan2nix] perlPackages.CarpClan: 6.07 -> 6.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 191ad8ecf19e..a08b9d868a18 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1331,10 +1331,10 @@ let CarpClan = buildPerlPackage { pname = "Carp-Clan"; - version = "6.07"; + version = "6.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.07.tar.gz; - sha256 = "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"; + url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz; + sha256 = "0237xx3rqa72sr4vdvws9r1m453h5f25bl85mdjmmk128kir4py7"; }; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; From 93d10f2475a187033dbfa60b5625f3d30a445a87 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:41 +0000 Subject: [PATCH 324/467] [cpan2nix] perlPackages.CompressRawBzip2: 2.086 -> 2.087 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a08b9d868a18..0dde1a474f51 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2719,10 +2719,10 @@ let CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.086"; + version = "2.087"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.086.tar.gz; - sha256 = "16gkm5m5hr8129h93r0liyyqffvh820wrlvxal8cn8bdcx59bls6"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.087.tar.gz; + sha256 = "1yqcy26dlcgy5gkl6rvvj60f83kgd99y8qylynibjx84vbyhvfvp"; }; # Don't build a private copy of bzip2. From e92237906b1376610874370e45f1699024f68b3b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:41 +0000 Subject: [PATCH 325/467] [cpan2nix] perlPackages.CompressRawZlib: 2.086 -> 2.087 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0dde1a474f51..24aa0ce6a915 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2738,11 +2738,11 @@ let CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.086"; + version = "2.087"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz; - sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.087.tar.gz; + sha256 = "13gfbfhaw1iiz2vmgpjggrcd704czqx3jk5alw765cw6wghwk0cc"; }; preConfigure = '' From 1d1f0f1f352e1ba7ea9077e90f8642eede2f4ca3 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:42 +0000 Subject: [PATCH 326/467] [cpan2nix] perlPackages.ConfigSimple: 4.59 -> 4.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 24aa0ce6a915..d532bce100d6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2949,10 +2949,10 @@ let ConfigSimple = buildPerlPackage { pname = "Config-Simple"; - version = "4.59"; + version = "4.58"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz; - sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b"; + url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz; + sha256 = "1d7dhvis1i03xlj8z3g5l8mz88kf7dn13zngbjhq94qgdxq9b6fx"; }; meta = { description = "Simple configuration file class"; From 235843f26cc9691cd06ba002c484b916e6f78d86 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:42 +0000 Subject: [PATCH 327/467] [cpan2nix] perlPackages.CpanelJSONXS: 4.12 -> 4.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d532bce100d6..00f86c92fa15 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3184,10 +3184,10 @@ let CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.12"; + version = "4.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.12.tar.gz; - sha256 = "49417b118fb111607cc7d021443e5b32fd104c0bf59d1852c95923a4916ac658"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.14.tar.gz; + sha256 = "6e63bf65cd7e94f08fb8ae7ccd6f94fb3447852865882bba9aaa155c9eea5938"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From 8836c62bb67ae7d20dd93d4a58215eee66e04e2e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:45 +0000 Subject: [PATCH 328/467] [cpan2nix] perlPackages.DBFile: 1.851 -> 1.852 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00f86c92fa15..892b1b8bd822 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4829,11 +4829,11 @@ let DBFile = buildPerlPackage { pname = "DB_File"; - version = "1.851"; + version = "1.852"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.851.tar.gz"; - sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8"; + url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.852.tar.gz; + sha256 = "14c30xyqx9c1hxw40bqbzls41al8gmklxv5jbk2kknmn4dsrbdrs"; }; preConfigure = '' From 4b61d79314f7d8f5df9511892c1a1d270ac99568 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:48 +0000 Subject: [PATCH 329/467] [cpan2nix] perlPackages.DevelPPPort: 3.52 -> 3.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 892b1b8bd822..94f2ae4b1f3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4651,10 +4651,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.52"; + version = "3.54"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.52.tar.gz; - sha256 = "cf4963786ea6821fcb7fe8979229f1c1c69a624b1ef968a498460792e35ec390"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.54.tar.gz; + sha256 = "f30fbbef7bdd6fb12348caf39e795c19c1639b8156e2e2f2927205140e35b0a9"; }; meta = { description = "Perl/Pollution/Portability"; From 200fbde1bce1b53082d94a82cd611d7f334d0efb Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:52 +0000 Subject: [PATCH 330/467] [cpan2nix] perlPackages.Error: 0.17027 -> 0.17028 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94f2ae4b1f3c..96434925b149 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6169,10 +6169,10 @@ let Error = buildPerlModule { pname = "Error"; - version = "0.17027"; + version = "0.17028"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17027.tar.gz; - sha256 = "1gnkxf12dq2w1jmjpllp5f30ya4nll01jv2sfi24386zfn1arch7"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17028.tar.gz; + sha256 = "0q796nwwiarfc6pga97380c9z8xva5545632001qj75kb1g5rn1s"; }; }; From 8606d7a4eaa8ac247ef0e8e4134d3ef9e1f8fcd0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:53 +0000 Subject: [PATCH 331/467] [cpan2nix] perlPackages.ExtUtilsMakeMaker: 7.36 -> 7.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96434925b149..e6dcaf595d6e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6435,10 +6435,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.36"; + version = "7.38"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.36.tar.gz; - sha256 = "06cef6429315cdc6afa9b2dc6fbdfa33538b6f68c827f441294621858e28c558"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.38.tar.gz; + sha256 = "897d64af242331ebb69090f68a2b610091e1996952d02096ce7942072a35e02c"; }; meta = { description = "Create a module Makefile"; From 9fc8ef5e2f08850b8c6e0d2d2c77bc960ed6e7e2 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:56 +0000 Subject: [PATCH 332/467] [cpan2nix] perlPackages.FileNext: 1.16 -> 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 e6dcaf595d6e..65fc9a8698d6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6934,10 +6934,10 @@ let FileNext = buildPerlPackage { pname = "File-Next"; - version = "1.16"; + version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.16.tar.gz; - sha256 = "0nfp84p63a5xm6iwlckh3f6cy9bdpjw5fazplskhnb8k5ifg4rb9"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz; + sha256 = "1vy2dqpc1nbjrnga08xr2hcxxfzifc5s2lfam5lf3djya0wwn07r"; }; }; From a36f7a7dc73651be10caf84b90ccd6f5c323cd4f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:07:57 +0000 Subject: [PATCH 333/467] [cpan2nix] perlPackages.FileSlurp: 9999.27 -> 9999.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65fc9a8698d6..356bc0ee855c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7099,10 +7099,10 @@ let FileSlurp = buildPerlPackage { pname = "File-Slurp"; - version = "9999.27"; + version = "9999.28"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.27.tar.gz; - sha256 = "1x233kj1qifvii7j8d4wzarwhj5z11vnpxsqvdm98dsccr7qi79s"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.28.tar.gz; + sha256 = "1vkwh880lbyr2qcrfka7yb3z4yz9id4va52gfjgdnyfb1c0wx1q5"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; From aba98478f197c747ec64a0131d7c5526d807d20f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:00 +0000 Subject: [PATCH 334/467] [cpan2nix] perlPackages.GetoptLong: 2.50 -> 2.51 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 356bc0ee855c..ac3ca9506ede 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7441,10 +7441,10 @@ let GetoptLong = buildPerlPackage { pname = "Getopt-Long"; - version = "2.50"; + version = "2.51"; src = fetchurl { - url = mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.50.tar.gz; - sha256 = "0rsb7ri8210xv09mnxykw5asbcqivd0v38x0z4jkis3k5gdim210"; + url = mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz; + sha256 = "0r659i6rkz8zkfgdccbn29zmd4bk9lcdc4y20ng6w2glqaa3pd10"; }; }; From 70a9a31e79c99170abd20411932d9f400ab2f8bb Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:00 +0000 Subject: [PATCH 335/467] [cpan2nix] perlPackages.HTMLClean: 0.8 -> 1.4 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ac3ca9506ede..136cbecdd6cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8031,10 +8031,10 @@ let HTMLClean = buildPerlPackage { pname = "HTML-Clean"; - version = "0.8"; + version = "1.4"; src = fetchurl { - url = mirror://cpan/authors/id/L/LI/LINDNER/HTML-Clean-0.8.tar.gz; - sha256 = "1h0dzxx034hpshxlpsxhxh051d1p79cjgp4q5kg68kgx7aian85c"; + url = mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz; + sha256 = "01l7g2hr0kjbh1wk7cv03ijmpjlbm1vm661m99mkrz2ilyyllzd6"; }; meta = { description = "Cleans up HTML code for web browsers, not humans"; From 0cb5892a7b6da5592c669319cdea079e16676df3 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:11 +0000 Subject: [PATCH 336/467] [cpan2nix] perlPackages.MCE: 1.843 -> 1.862 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 136cbecdd6cd..bc008235d7a0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10208,10 +10208,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.843"; + version = "1.862"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.843.tar.gz; - sha256 = "0x1s4xxxc9jj46h6i8mr8sczz0qavhal5639img1n8b96nsj6cf7"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.862.tar.gz; + sha256 = "1drk3vmpf1cjn85kddnrm9x8b2na6rlcwffiq9gv6355ijb89x0j"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; From 69d32a62003c7fd769efa2bd8497e8bc3a64e87c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:16 +0000 Subject: [PATCH 337/467] [cpan2nix] perlPackages.Mojolicious: 8.22 -> 8.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 bc008235d7a0..e5117ff8c8ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11561,10 +11561,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.22"; + version = "8.25"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.22.tar.gz; - sha256 = "0m28yb1pbnbgdq0z7ykb44j93c1vwjzv7msm6vs7msysyx84mqw6"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.25.tar.gz; + sha256 = "0yr5vpgwg9x435npzc6v477y260dgbj2yl9lxdjimmr6n5jryv1n"; }; meta = { homepage = https://mojolicious.org; From d6309a2df81aa8ee685295e264a3d1f95b1a89ae Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:24 +0000 Subject: [PATCH 338/467] [cpan2nix] perlPackages.PerlTidy: 20190601 -> 20190915 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e5117ff8c8ab..62973348a8a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14065,10 +14065,10 @@ let PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; - version = "20190601"; + version = "20190915"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190601.tar.gz; - sha256 = "8f3d704b4eff457bf5bb70f9adf570690b2252dec31f75e8cb743392f1be338f"; + url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190915.tar.gz; + sha256 = "c236dfacbba115cfc3f2868006c8601e021fe97c13cd2170a49bf8d404cc701b"; }; meta = { description = "Indent and reformat perl scripts"; From 3eb290e2eee6f2df1d2b1e14319321683d346387 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:29 +0000 Subject: [PATCH 339/467] [cpan2nix] perlPackages.RoleTiny: 2.000007 -> 2.001003 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62973348a8a1..3ea90445a675 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15188,10 +15188,10 @@ let RoleTiny = buildPerlPackage { pname = "Role-Tiny"; - version = "2.000007"; + version = "2.001003"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Role-Tiny-2.000007.tar.gz; - sha256 = "33af02d79d5e9ae76172fd1b2a80230bd8cfde146e1b9327a094a6dfdec6fb56"; + url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001003.tar.gz; + sha256 = "6cef8d6371342a94a6a04c1be5bd7a3f2bd6ea36f1a21b4649b08d5b88b28eeb"; }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; From e54bbec2a4e0eee685bfaa3a6378ca924cc42e05 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:29 +0000 Subject: [PATCH 340/467] [cpan2nix] perlPackages.ScalarListUtils: 1.50 -> 1.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ea90445a675..936ef300a330 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15255,10 +15255,10 @@ let ScalarListUtils = buildPerlPackage { pname = "Scalar-List-Utils"; - version = "1.50"; + version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.50.tar.gz; - sha256 = "06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.52.tar.gz; + sha256 = "279d78cef84acae280da4dfb95eff0c9865d1611b1a3b026baddf42d1ba01de4"; }; meta = { description = "Common Scalar and List utility subroutines"; From 9f95ab8639bd1be02e72068126c0863ab6791612 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:42 +0000 Subject: [PATCH 341/467] [cpan2nix] perlPackages.TestSimple13: 1.302164 -> 1.302168 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 936ef300a330..e4631be76f28 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17996,10 +17996,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302164"; + version = "1.302168"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302164.tar.gz; - sha256 = "50277b613f09cd52eb87b02c69ce0517b80080be8a8d80e1eda609479b0d6615"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302168.tar.gz; + sha256 = "02f6132b2062abb23474b0fc02e70a0fbbf7bf581a6010e64c08891530447ffa"; }; meta = { description = "Basic utilities for writing tests"; From 54bfae7096dac2ad80f1b9b860cbcf35905b66a4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:44 +0000 Subject: [PATCH 342/467] [cpan2nix] perlPackages.TextCSV_XS: 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 e4631be76f28..249a694b92fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18385,10 +18385,10 @@ let TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.39.tgz; - sha256 = "aa4e424eaf68bea0d0e8c16b961c942b64926e6183ce1dbbc6c799eafb0a9ebd"; + url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz; + sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675"; }; meta = { description = "Comma-Separated Values manipulation routines"; From 4d5e1fbd796d265fc9e2342fc84e2dfc571f991a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:46 +0000 Subject: [PATCH 343/467] [cpan2nix] perlPackages.TextTrim: 1.02 -> 1.03 --- 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 249a694b92fa..6ea843fc0b6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18742,12 +18742,12 @@ let }; }; - TextTrim = buildPerlModule { + TextTrim = buildPerlPackage { pname = "Text-Trim"; - version = "1.02"; + version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/Text-Trim-1.02.tar.gz; - sha256 = "1bnwjl5n04w8nnrzrm75ljn4pijqbijr9csfkjcs79h4gwn9lwqw"; + url = mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz; + sha256 = "0ks9afvx9c1b6px98wwzhbyhd2y6hdg7884814fc9pnx8qfzrz50"; }; meta = { description = "Remove leading and/or trailing whitespace from strings"; From 7e1abb17a39e972123617370121fd2aa3421b4ec Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:53 +0000 Subject: [PATCH 344/467] [cpan2nix] perlPackages.YAMLLibYAML: 0.79 -> 0.80 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ea843fc0b6b..f35d9ccdcf98 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20234,10 +20234,10 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.79"; + version = "0.80"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.79.tar.gz; - sha256 = "0wwmk3f2q0qv229sjjl3vbypppa9wmaiqh2b0qlai33m476vl1c4"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.80.tar.gz; + sha256 = "1nhn4w52kpq757rxl052f61h36rdzsy416k740m3fy5ih7axhq4x"; }; }; From db1a60abbed75ca0bb0b8874c5b936982760c06e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:56 +0000 Subject: [PATCH 345/467] [cpan2nix] perlPackages.mod_perl2: 2.0.10 -> 2.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 f35d9ccdcf98..409a78fdf17b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11545,10 +11545,10 @@ let mod_perl2 = buildPerlPackage { pname = "mod_perl"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.10.tar.gz; - sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; + url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz; + sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; From f76f920a527a7c7e595ed75f25bcd2008868335c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:08:57 +0000 Subject: [PATCH 346/467] [cpan2nix] perlPackages.AnyEvent: 7.16 -> 7.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 409a78fdf17b..969b2606b6a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -235,10 +235,10 @@ let AnyEvent = buildPerlPackage { pname = "AnyEvent"; - version = "7.16"; + version = "7.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.16.tar.gz; - sha256 = "149fe8c3082dfb015fd15ad2b8fea5fb75e012238c790aa0398dcfaabfa0546c"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz; + sha256 = "50beea689c098fe4aaeb83806c40b9fe7f946d5769acf99f849f099091a4b985"; }; buildInputs = [ CanaryStability ]; meta = { From 6ccbfca1112680f263cec6ef83cf23232eae87be Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:01 +0000 Subject: [PATCH 347/467] [cpan2nix] perlPackages.DBDPg: 3.7.4 -> 3.10.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 969b2606b6a7..45edbebcd793 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4788,11 +4788,11 @@ let DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.7.4"; + version = "3.10.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.4.tar.gz"; - sha256 = "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz"; + url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.0.tar.gz; + sha256 = "102z22pfsbhi8gw6d9s7w2xnqi23yyjxp6v58cyqx0p2cf52c0z1"; }; buildInputs = [ pkgs.postgresql ]; From 600423c1b0f86d432857377f29327e5b956de5b8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:01 +0000 Subject: [PATCH 348/467] [cpan2nix] perlPackages.DBDSQLite: 1.62 -> 1.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 45edbebcd793..27af9174e4f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4721,11 +4721,11 @@ let DBDSQLite = buildPerlPackage { pname = "DBD-SQLite"; - version = "1.62"; + version = "1.64"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz; - sha256 = "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz; + sha256 = "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl"; }; propagatedBuildInputs = [ DBI ]; From 14f89c6f615e67dd801717914d8872edad4eedf2 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:01 +0000 Subject: [PATCH 349/467] [cpan2nix] perlPackages.DBDsybase: 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 27af9174e4f1..c42def8bcc1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4821,7 +4821,7 @@ let SYBASE = pkgs.freetds; - buildInputs = [ pkgs.freetds ] ; + buildInputs = [ pkgs.freetds ]; propagatedBuildInputs = [ DBI ]; doCheck = false; From 0ea96f5a6d9ce7e966d26b9daa9e2bd067c15825 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:04 +0000 Subject: [PATCH 350/467] [cpan2nix] perlPackages.FileFindObject: v0.3.2 -> 0.3.4 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c42def8bcc1d..829900bbf4be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6727,10 +6727,10 @@ let FileFindObject = buildPerlModule { pname = "File-Find-Object"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v0.3.2.tar.gz; - sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.4.tar.gz; + sha256 = "569fab52ab2bf9e0592d46575056c33c52aaba4ada3176f22f248e01d1273a79"; }; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { From 120a7b7755c6816bd48f741bb81f0ad16510bc43 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:08 +0000 Subject: [PATCH 351/467] [cpan2nix] perlPackages.MathBigIntGMP: 1.6006 -> 1.6007 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 829900bbf4be..c96189e42221 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10663,10 +10663,10 @@ let MathBigIntGMP = buildPerlPackage { pname = "Math-BigInt-GMP"; - version = "1.6006"; + version = "1.6007"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6006.tar.gz; - sha256 = "10dg3h5jgc30pb2800x8brz2ijicrpash0rwjahp82xnvysi1hhf"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz; + sha256 = "07y0akadx2nm1bsp17v12785s3ni1l5qyqkk4q3pxcyc41nmwwjx"; }; buildInputs = [ pkgs.gmp ]; doCheck = false; From 1da9c0e9d2dfbc6f6bcf0113df4811d699ac98b3 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:11 +0000 Subject: [PATCH 352/467] [cpan2nix] perlPackages.NetDNS: 1.20 -> 1.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 c96189e42221..9bc50f9cd628 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12861,10 +12861,10 @@ let NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.20.tar.gz; - sha256 = "7fd9692b687253baa8f2eb639f1dd7ff9c77fddd67167dc59b400bd25e4ce01b"; + url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz; + sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From 08730e29859490fdbad59e2daccdd90f96bdb525 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:13 +0000 Subject: [PATCH 353/467] [cpan2nix] perlPackages.TermTable: 0.013 -> 0.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 9bc50f9cd628..70ceb804fad6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16822,10 +16822,10 @@ let TermTable = buildPerlPackage { pname = "Term-Table"; - version = "0.013"; + version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.013.tar.gz; - sha256 = "ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.014.tar.gz; + sha256 = "167a0669e2ef8c6386ea4dd213495e445049493ce1d5097d5632c0e928b7426d"; }; propagatedBuildInputs = [ Importer ]; meta = { From e50e39238627e6186311f7ceed030a430760cb41 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:13 +0000 Subject: [PATCH 354/467] [cpan2nix] perlPackages.TestCompile: v2.2.2 -> v2.3.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 70ceb804fad6..478c09028438 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17080,10 +17080,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.2.2.tar.gz; - sha256 = "7853b44a9819eb3e6003260eedf904a1ad80035ea5254296ce014f96084b65d4"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.0.tar.gz; + sha256 = "f61549769e55a9b251f83617b901c0461659b1360243ef046d4f112f7f4e4a8f"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { From 66337b468c2a34d41f33683cf5ebbc3fd3ae5d7d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:15 +0000 Subject: [PATCH 355/467] [cpan2nix] perlPackages.TextAutoformat: 1.74 -> 1.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 478c09028438..4855e244266f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18287,10 +18287,10 @@ let TextAutoformat = buildPerlPackage { pname = "Text-Autoformat"; - version = "1.74"; + version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz; - sha256 = "07eb3c2b3515897340ca6e9377495bbe2e05ec80d7f3f146adab8e534a818d5e"; + url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.75.tar.gz; + sha256 = "9dd4f4ce3daec4b4dbf5b59dac4568a8946aed12c28b4e5988c8e8c602c6b771"; }; propagatedBuildInputs = [ TextReform ]; meta = { From 83f625539addb48e788f15d14e70ffaf138cba44 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:16 +0000 Subject: [PATCH 356/467] [cpan2nix] perlPackages.ack: v3.0.2 -> v3.1.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4855e244266f..878c08688d47 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -87,11 +87,11 @@ let ack = buildPerlPackage { pname = "ack"; - version = "3.0.2"; + version = "3.1.2"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.0.2.tar.gz; - sha256 = "0a4mriclnmwvm8rn9crkfr00qjy6ffgf0b0bg0qz46drpnyv7d33"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.1.2.tar.gz; + sha256 = "07141grc77y52zr706bpnc7pjaxvwpwwcq0fdxfq0bvs2lgw6i7s"; }; outputs = ["out" "man"]; From 5b393e65a3cb9ae0a772767b5fb3986d61354f6c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:18 +0000 Subject: [PATCH 357/467] [cpan2nix] perlPackages.Cairo: 1.106 -> 1.107 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 878c08688d47..572184d90912 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1204,10 +1204,10 @@ let Cairo = buildPerlPackage { pname = "Cairo"; - version = "1.106"; + version = "1.107"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz; - sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; + url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz; + sha256 = "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay"; }; buildInputs = [ pkgs.cairo ]; meta = { From de6d5a271b9f08a1a5a94ba0d17394991af49025 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:19 +0000 Subject: [PATCH 358/467] [cpan2nix] perlPackages.IOCompress: 2.086 -> 2.087 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 572184d90912..1333e96c321d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8863,10 +8863,10 @@ let IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.086"; + version = "2.087"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.086.tar.gz; - sha256 = "110a229aa02b701f9820f5e0c2e9c30db342ea241b2d01c03703ea4922b1ab53"; + url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.087.tar.gz; + sha256 = "94f792775d0496fffe862363c76637e74ff5b46c40cf47042547686d164e23cb"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { From a6190a0f3868257f0d83544b26e3987c25770872 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:20 +0000 Subject: [PATCH 359/467] [cpan2nix] perlPackages.CryptJWT: 0.024 -> 0.025 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1333e96c321d..1e98e8856622 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3391,10 +3391,10 @@ let CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.024"; + version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.024.tar.gz; - sha256 = "4fcb81992fa61c0dbeb7c3582e887a92746aca76a42609091d986350e91892c5"; + url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz; + sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { From 1dff062de86bfef023e0cca1598095d8504d93f4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:20 +0000 Subject: [PATCH 360/467] [cpan2nix] perlPackages.DBDOracle: 1.76 -> 1.80 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e98e8856622..dcc30b232577 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4772,13 +4772,13 @@ let version = "1.80"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz; - sha256 = "1wym2kc8b31qa1zb0dgyy3w4iqlk1faw36gy9hkpj895qr1pznxn"; + url = mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz; + sha256 = "1rza36dywbsaync99ibscpqdp53m0yg2748bbib16gbf4cl2apph"; }; ORACLE_HOME = "${pkgs.oracle-instantclient.lib}/lib"; - buildInputs = [ TestNoWarnings pkgs.oracle-instantclient ] ; + buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ]; propagatedBuildInputs = [ DBI ]; postBuild = stdenv.lib.optionalString stdenv.isDarwin '' From 68ea78220afc39618bf3e6fd4c00409d6525606f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:23 +0000 Subject: [PATCH 361/467] [cpan2nix] perlPackages.Glib: 1.329 -> 1.3291 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcc30b232577..aee38a82c282 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7535,10 +7535,10 @@ let Glib = buildPerlPackage { pname = "Glib"; - version = "1.329"; + version = "1.3291"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.329.tar.gz; - sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; + url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz; + sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"; }; buildInputs = [ pkgs.glib ]; doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 From d2bacf0459d58d0254034585649b766e430c3a7e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:24 +0000 Subject: [PATCH 362/467] [cpan2nix] perlPackages.IOPager: 0.40 -> 1.01 --- 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 aee38a82c282..43ffc06f5245 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8945,13 +8945,13 @@ let }; IOPager = buildPerlPackage { - version = "0.40"; + version = "1.01"; pname = "IO-Pager"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.40.tgz; - sha256 = "1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"; + url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz; + sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa"; }; - propagatedBuildInputs = [ pkgs.more FileWhich ]; # `more` used in tests + propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests }; IOPrompt = buildPerlModule { From 326fb9ea00e42aeff7f5c2c5f700a4f217cdbc79 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:29 +0000 Subject: [PATCH 363/467] [cpan2nix] perlPackages.TestTCP: 2.19 -> 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 43ffc06f5245..660a2c3c12c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18075,10 +18075,10 @@ let TestTCP = buildPerlPackage { pname = "Test-TCP"; - version = "2.19"; + version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-2.19.tar.gz; - sha256 = "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-TCP-2.22.tar.gz; + sha256 = "0mvv9rqwrwlcfh8qrs0s47p85rhlnw15d4gbpyi802bddp0c6lry"; }; meta = { description = "Testing TCP program"; From 6d3717687b3be5d456b592aa9931f57de613b080 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:32 +0000 Subject: [PATCH 364/467] [cpan2nix] perlPackages.CarpAssertMore: 1.18 -> 1.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 660a2c3c12c0..b1d09a842351 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1317,10 +1317,10 @@ let CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.18"; + version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.18.tar.gz; - sha256 = "0k7lpyb7mwck9w7vlqd4w3vw5r0qxlhzw8x6himy6p9aijwrdh4g"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz; + sha256 = "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5"; }; propagatedBuildInputs = [ CarpAssert ]; meta = { From 0e83e2f6788bf95d7023745cde97297a9ecd7536 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:33 +0000 Subject: [PATCH 365/467] [cpan2nix] perlPackages.DataCompare: 1.25 -> 1.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 b1d09a842351..3df8b46912d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3717,10 +3717,10 @@ let DataCompare = buildPerlPackage { pname = "Data-Compare"; - version = "1.25"; + version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz; - sha256 = "0wzasidg9yjcfsi2gdiaw6726ikqda7n24n0v2ngpaazakdkcjqx"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.26.tar.gz; + sha256 = "03g0z2w8hz7750x6wkl6zq7shk12fry44gkzrz7b904s5fmphl4p"; }; propagatedBuildInputs = [ FileFindRule ]; }; From 8ecc2cf3fe26dcf351f80e38447c7676d35072f3 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:33 +0000 Subject: [PATCH 366/467] [cpan2nix] perlPackages.ExtUtilsCppGuess: 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 3df8b46912d2..2d0e1b378f30 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6357,10 +6357,10 @@ let ExtUtilsCppGuess = buildPerlPackage { pname = "ExtUtils-CppGuess"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.19.tar.gz; - sha256 = "1lva59kq447wbpc5nnr0zvr6gczxrmi0r7l9r2kqx132nsx33ijc"; + url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.20.tar.gz; + sha256 = "0q9ynigk600fv95xac6aslrg2k19m6qbzf5hqfsnall8113r3gqj"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; From 520952c953e96f4637d8b53e5e7be2bb9dba6ebe Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:36 +0000 Subject: [PATCH 367/467] [cpan2nix] perlPackages.ServerStarter: 0.34 -> 0.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d0e1b378f30..1abbd3117ce3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15376,10 +15376,10 @@ let ServerStarter = buildPerlModule { pname = "Server-Starter"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.34.tar.gz; - sha256 = "96a20d4a1f341655bd1b26df5795d57c5d7498d9bcf8ca9d0d6e2ed743608f78"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz; + sha256 = "676dc0d6cff4648538332c63c32fb88ad09ed868213ea9e62e3f19fad41b9c40"; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { From 360e169b93639b2bb5f280bc9787b8660831c77b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:37 +0000 Subject: [PATCH 368/467] [cpan2nix] perlPackages.TestWarnings: 0.026 -> 0.027 --- 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 1abbd3117ce3..b0c93ec576e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18156,12 +18156,12 @@ let TestWarnings = buildPerlPackage { pname = "Test-Warnings"; - version = "0.026"; + version = "0.027"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz; - sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.027.tar.gz; + sha256 = "118dd9f48408557555f0af5478e0e873f9df0952cf5911f697a4ce5165880864"; }; - buildInputs = [ CPANMetaCheck ]; + buildInputs = [ CPANMetaCheck PadWalker ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; From 3a687019c8668cfb95649ec640369eabd57f4041 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:39 +0000 Subject: [PATCH 369/467] [cpan2nix] perlPackages.CGISimple: 1.21 -> 1.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 b0c93ec576e9..b5c3171ca831 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2090,10 +2090,10 @@ let CGISimple = buildPerlModule { pname = "CGI-Simple"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.21.tar.gz; - sha256 = "1wzc2igs4khmj7zfahvs87c24p9ks8hnqhhsyviyiix53xx2y6sg"; + url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz; + sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn"; }; propagatedBuildInputs = [ IOStringy ]; meta = { From bae54b08d740fee0adeb8c2bc0fe3ce5968a01d4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:39 +0000 Subject: [PATCH 370/467] [cpan2nix] perlPackages.CairoGObject: 1.004 -> 1.005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b5c3171ca831..6ec56656f3f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1220,10 +1220,10 @@ let CairoGObject = buildPerlPackage { pname = "Cairo-GObject"; - version = "1.004"; + version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.004.tar.gz; - sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; + url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz; + sha256 = "0l2wcz77ndmbgvxx34gdm919a3dxh9fixqr47p50n78ysx2692cd"; }; buildInputs = [ pkgs.cairo ]; meta = { From 67d222ca0fd58c2351d3e9b7b300d0502a949269 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:41 +0000 Subject: [PATCH 371/467] [cpan2nix] perlPackages.FileFindObjectRule: 0.0310 -> 0.0311 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ec56656f3f3..da1d22287485 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6741,10 +6741,10 @@ let FileFindObjectRule = buildPerlModule { pname = "File-Find-Object-Rule"; - version = "0.0310"; + version = "0.0311"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0310.tar.gz; - sha256 = "f1f1820ff44042f6b30e4d6be1db860b9e743b1a9836070ea656ad9829e4eca5"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0311.tar.gz; + sha256 = "038a92e4380920448d5627ec98fc9990dbc3223eb93bb554c9b09eef4a735f3e"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; # restore t/sample-data which is corrupted by patching shebangs From 72b6a23934a96457acf948d1533fbb5c1354bf89 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:46 +0000 Subject: [PATCH 372/467] [cpan2nix] perlPackages.Gtk2: 1.24992 -> 1.24993 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da1d22287485..9dc6a3d8bd33 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7782,12 +7782,12 @@ let Gtk2 = buildPerlPackage { pname = "Gtk2"; - version = "1.24992"; + version = "1.24993"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz; - sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz; + sha256 = "0ry9jfvfgdwzalxcvwsgr7plhk3agx7p40l0fqdf3vrf7ds47i29"; }; - buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ]; + buildInputs = [ pkgs.gtk2 ]; # https://rt.cpan.org/Public/Bug/Display.html?id=130742 # doCheck = !stdenv.isDarwin; doCheck = false; @@ -7796,6 +7796,7 @@ let description = "Perl interface to the 2.x series of the Gimp Toolkit library"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Pango ]; }; Gtk2GladeXML = buildPerlPackage { From 17686c62c6f7dd70cff3d28bdd6e7025fad37ce5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:47 +0000 Subject: [PATCH 373/467] [cpan2nix] perlPackages.RPCEPCService: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9dc6a3d8bd33..8a972549c919 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15200,14 +15200,13 @@ let }; }; - RPCEPCService = buildPerlPackage { + RPCEPCService = buildPerlModule { pname = "RPC-EPC-Service"; version = "0.0.11"; src = fetchurl { url = "mirror://cpan/authors/id/K/KI/KIWANAMI/RPC-EPC-Service-v0.0.11.tar.gz"; sha256 = "975f4134365258fb47fa921919053513adb9101f2bd420fcefe345f209128be3"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ AnyEvent DataSExpression ]; meta = { description = "An Asynchronous Remote Procedure Stack"; From 18c1e798d4bb93aa492a7bd2f14db6a0523a6821 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:47 +0000 Subject: [PATCH 374/467] [cpan2nix] perlPackages.SubQuote: 2.006003 -> 2.006006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a972549c919..5ebd9d96a928 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16226,10 +16226,10 @@ let SubQuote = buildPerlPackage { pname = "Sub-Quote"; - version = "2.006003"; + version = "2.006006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006003.tar.gz; - sha256 = "be1f3a6f773f351f203cdc8f614803ac492b77d15fd68d5b1f0cd3884be18176"; + url = mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz; + sha256 = "6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d"; }; buildInputs = [ TestFatal ]; meta = { From bbb85eb3004b4d76eb6c257b3e46964234a36d3d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:48 +0000 Subject: [PATCH 375/467] [cpan2nix] perlPackages.TestMockObject: 1.20180705 -> 1.20191002 --- 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 5ebd9d96a928..8bc6b6d80086 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17525,12 +17525,12 @@ let TestMockObject = buildPerlPackage { pname = "Test-MockObject"; - version = "1.20180705"; + version = "1.20191002"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20180705.tar.gz; - sha256 = "4516058d5d511155c1c462dab4027d762d6a474b99f73bf7da20b5ffbd024518"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20191002.tar.gz; + sha256 = "c76a4ccff1994a7668b4403df6c36d2539611076dac0afbc361c1e71a4191998"; }; - buildInputs = [ CGI TestException TestWarn ]; + buildInputs = [ TestException TestWarn ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; meta = { description = "Perl extension for emulating troublesome interfaces"; From 1b253452ed0eae40c80180090f3d5fb7ae29299b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:48 +0000 Subject: [PATCH 376/467] [cpan2nix] perlPackages.TestTrailingSpace: 0.0301 -> 0.0302 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8bc6b6d80086..59aed9bd10ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18115,10 +18115,10 @@ let TestTrailingSpace = buildPerlModule { pname = "Test-TrailingSpace"; - version = "0.0301"; + version = "0.0302"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0301.tar.gz; - sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz; + sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612"; }; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { From ebd8b6c67b8424ea4cf3e4df3f0cbe4f4227bc03 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:48 +0000 Subject: [PATCH 377/467] [cpan2nix] perlPackages.TextTemplate: 1.56 -> 1.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59aed9bd10ed..f00e800151e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18688,10 +18688,10 @@ let TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.56"; + version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.56.tar.gz; - sha256 = "09aaa095c562d22824daf849378a58632446093f397d8c7acb37c25a7f37e646"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz; + sha256 = "0c465757782c4bfb9b17335307a8286771fd36ea04d259bc454ac63355f2a287"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; From 227b26c4b7cec5ffb97571aa03d209301199cceb Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:49 +0000 Subject: [PATCH 378/467] [cpan2nix] perlPackages.ClassMethodModifiers: 2.12 -> 2.13 --- 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 f00e800151e0..38686555f6eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2421,12 +2421,12 @@ let ClassMethodModifiers = buildPerlPackage { pname = "Class-Method-Modifiers"; - version = "2.12"; + version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.12.tar.gz; - sha256 = "1j3swa212wh14dq5r6zjarm2lzpx6mrdfplpjy65px8b09ri0k74"; + url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz; + sha256 = "0qzx83mgd71hlc2m1kpw15dqsjzjq7b2cj3sdgg45a0q23vhfn5b"; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal TestNeeds ]; meta = { homepage = https://github.com/sartak/Class-Method-Modifiers/tree; description = "Provides Moose-like method modifiers"; From 102f0f08756d7a0b4b835c8d0f01a13954577748 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:50 +0000 Subject: [PATCH 379/467] [cpan2nix] perlPackages.Gnome2Canvas: 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 38686555f6eb..e2adfb1afb40 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7591,7 +7591,7 @@ let meta = { license = stdenv.lib.licenses.lgpl2Plus; }; - propagatedBuildInputs = [ Gtk2 Pango ]; + propagatedBuildInputs = [ Gtk2 ]; }; Gnome2VFS = buildPerlPackage { From 4e212c69c7366b3cd2d5449cd2716c35735527d0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:50 +0000 Subject: [PATCH 380/467] [cpan2nix] perlPackages.Gnome2Wnck: 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 e2adfb1afb40..8953725fa528 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7616,7 +7616,7 @@ let sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ Gtk2 Pango ]; + propagatedBuildInputs = [ Gtk2 ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; license = stdenv.lib.licenses.lgpl21Plus; From 688500c1fb51af4914d0c050f70850ff291d2738 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 381/467] [cpan2nix] perlPackages.GooCanvas: 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 8953725fa528..5b5d85b4bfc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7670,7 +7670,7 @@ let url = mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; - propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 Pango ]; + propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 ]; meta = { description = "Perl interface to the GooCanvas"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 84bd16b8212a4a8daf8cbcb3d4b96960099fea85 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 382/467] [cpan2nix] perlPackages.Gtk2GladeXML: 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 5b5d85b4bfc8..861d5206ab10 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7806,7 +7806,7 @@ let url = mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; - propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 Pango ]; + propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; meta = { description = "Create user interfaces directly from Glade XML files"; license = stdenv.lib.licenses.lgpl2Plus; From 45e4dea9b82f74f461edf73de50487bec11f8709 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 383/467] [cpan2nix] perlPackages.Gtk2ImageView: 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 861d5206ab10..ea9f7fc49308 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7851,7 +7851,7 @@ let sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; - propagatedBuildInputs = [ Gtk2 Pango ]; + propagatedBuildInputs = [ Gtk2 ]; # Tests fail due to no display server: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. # t/animview.t ........... From 7c3ed4a99c2669d8d98c12505bb4c980b60c850c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 384/467] [cpan2nix] perlPackages.Gtk2TrayIcon: 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 ea9f7fc49308..9b2088f84d17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7820,7 +7820,7 @@ let url = mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; - propagatedBuildInputs = [ pkgs.gtk2 Gtk2 Pango ]; + propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; meta = { license = stdenv.lib.licenses.gpl2; }; From 3b34e0014ebac2e4a0cf671b24d33697f71a473c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 385/467] [cpan2nix] perlPackages.Gtk2Unique: 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 9b2088f84d17..d2d4782d94cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7869,7 +7869,7 @@ let url = mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; - propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 Pango ]; + propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; meta = { description = "Use single instance applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3513f6e15465aa0e66f1df6da629d4cbd0a7d755 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:51 +0000 Subject: [PATCH 386/467] [cpan2nix] perlPackages.Gtk3: 0.035 -> 0.036 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d2d4782d94cd..40f208952abf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7878,10 +7878,10 @@ let Gtk3 = buildPerlPackage { pname = "Gtk3"; - version = "0.035"; + version = "0.036"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.035.tar.gz; - sha256 = "1zhr4ixjb93rjnxsbrjc3fg86qkx1fj4w21yg5q4swjvm6fxdfcg"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz; + sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { From fea4c7b3fd606f817e7cc5d15488576effc0946a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:52 +0000 Subject: [PATCH 387/467] [cpan2nix] perlPackages.PodMarkdown: 3.101 -> 3.200 --- 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 40f208952abf..119acba03846 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14816,10 +14816,10 @@ let PodMarkdown = buildPerlPackage { pname = "Pod-Markdown"; - version = "3.101"; + version = "3.200"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.101.tar.gz; - sha256 = "0h7hx4k1c3k00cfnlf226bkxnxaz01705m10vxm9cxh52xn6pzz8"; + url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz; + sha256 = "16dffpqwrdhi2s90ff2sgncrpnzqp81ydhl5pd78m725j60p2286"; }; buildInputs = [ TestDifferences ]; meta = { @@ -14827,6 +14827,7 @@ let description = "Convert POD to Markdown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ URI ]; }; PodMarkdownGithub = buildPerlPackage { From b674711bc8d12cd96152250a6a8c36a2b7c4137b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:54 +0000 Subject: [PATCH 388/467] [cpan2nix] perlPackages.ArchiveZip: 1.64 -> 1.67 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 119acba03846..91704dd497ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -667,10 +667,10 @@ let ArchiveZip = buildPerlPackage { pname = "Archive-Zip"; - version = "1.64"; + version = "1.67"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz; - sha256 = "0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz; + sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my"; }; buildInputs = [ TestMockModule ]; meta = { From f227ab79cb4c9d8798c53010e6610c5a74feba2e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:58 +0000 Subject: [PATCH 389/467] [cpan2nix] perlPackages.PDFAPI2: 2.034 -> 2.036 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91704dd497ba..ea3b232eae3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13901,10 +13901,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.034"; + version = "2.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.034.tar.gz; - sha256 = "8aa98818fb6e4bebd6f9096e222989dcdd5fd4c5fa2ad1c7f0149053fc68f1cc"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz; + sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; From d356883540923a9e7eafbfa2ebd063f07e19908d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:09:59 +0000 Subject: [PATCH 390/467] [cpan2nix] perlPackages.Test2Suite: 0.000122 -> 0.000126 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea3b232eae3c..b69809913c50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16900,10 +16900,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000122"; + version = "0.000126"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000122.tar.gz; - sha256 = "83828cf440ce2a7bfc2fe48f535931e44328e39810370b04c9e947db888a7442"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000126.tar.gz; + sha256 = "370db8171c9105480872ae8948745dbd798b9d751aacc8aa0fc36266eeda79e3"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From 7933312cb092ddd6a023a7ae578d6165377b8819 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:03 +0000 Subject: [PATCH 391/467] [cpan2nix] perlPackages.DateManip: 6.77 -> 6.78 --- 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 b69809913c50..a33e773dfb04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4216,10 +4216,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.77"; + version = "6.78"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.77.tar.gz; - sha256 = "0sw36dc224km06jnzkyxgpi6l4cavdn8gfxd3zb11mnf0y12phsi"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.78.tar.gz; + sha256 = "1faxj6gafrqir9hvy9r8q57s93n57b412s04qycrks7r0520hdnb"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -4229,7 +4229,7 @@ let meta = { description = "Date manipulation routines"; }; - buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; + buildInputs = [ TestInter ]; }; DateSimple = buildPerlPackage { From 9dd8df1e38cf06ca4ac745e2beee1585ac92f864 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:05 +0000 Subject: [PATCH 392/467] [cpan2nix] perlPackages.LocaleCodes: 3.61 -> 3.62 --- 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 a33e773dfb04..486651313810 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9907,16 +9907,16 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.61"; + version = "3.62"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.61.tar.gz; - sha256 = "9432c02674dd789da45fe5b778599b4c648f0a3433bf71cda203fc8a0cec501d"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz; + sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7"; }; meta = { description = "A distribution of modules to handle locale codes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; + buildInputs = [ TestInter ]; }; LocaleGettext = buildPerlPackage { From 665ef753d8ff29c52857f369462ad589fdae7426 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:07 +0000 Subject: [PATCH 393/467] [cpan2nix] perlPackages.DataICal: 0.22 -> 0.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 486651313810..17b504802ff9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3851,10 +3851,10 @@ let DataICal = buildPerlPackage { pname = "Data-ICal"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz; - sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720"; + url = mirror://cpan/authors/id/B/BP/BPS/Data-ICal-0.23.tar.gz; + sha256 = "937c23b30b07ff00243a739df1760b1992117a074ff31852ec33f9b009c556eb"; }; buildInputs = [ TestLongString TestNoWarnings TestWarn ]; propagatedBuildInputs = [ ClassReturnValue TextvFileasData ]; From 919b902f81fcde0cd12c62c66d74d544467610b1 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:08 +0000 Subject: [PATCH 394/467] [cpan2nix] perlPackages.HTMLScrubber: 0.17 -> 0.19 --- 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 17b504802ff9..039c6cb79c76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8281,13 +8281,13 @@ let HTMLScrubber = buildPerlPackage { pname = "HTML-Scrubber"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz; - sha256 = "06p7w4zd42b2yh541mlzyqj40lwmvvn3fyqi8big4mf34la7m2jm"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz; + sha256 = "1c9b4r9x96a8fbz2zy52fxgq7djp9dq38hiyqra92psnz1w5aa5f"; }; propagatedBuildInputs = [ HTMLParser ]; - buildInputs = [ PodCoverageTrustPod TestCPANMeta TestDifferences TestEOL TestKwalitee TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage ]; + buildInputs = [ TestDifferences TestMemoryCycle ]; }; HTMLTableExtract = buildPerlPackage { From 8ceb6ca4d6f62bfa479b1842c8af2139ae5ef0de Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:10 +0000 Subject: [PATCH 395/467] [cpan2nix] perlPackages.PerlPrereqScannerNotQuiteLite: 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 039c6cb79c76..4cdf22c007a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14583,10 +14583,10 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9906"; + version = "0.9908"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9906.tar.gz; - sha256 = "19b59zf69ayabkacifz36b5z3kfh4kbv5kn1a1habk46f6v7g9pj"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9908.tar.gz; + sha256 = "1akcmk74j8j01594ax4fq38bf6f03mbma96blzhcyzndfvqbxksf"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; From 3ef3f18dcdf6e8f16e735f48477f5935cb8a10a4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:11 +0000 Subject: [PATCH 396/467] [cpan2nix] perlPackages.Test2PluginNoWarnings: 0.07 -> 0.08 --- 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 4cdf22c007a9..442aa9b0b294 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16886,12 +16886,12 @@ let Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; - version = "0.07"; + version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.07.tar.gz; - sha256 = "1sxqcbklmpxpkysq3wbivs77n3c8mvasvfa38dzmyqz04ifaf7gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz; + sha256 = "122rcksn4qg0f99ap9ppmkvk0fvxcqa9jlqmq7wlk3q0ajylr4cy"; }; - buildInputs = [ CaptureTiny IPCRun3 Test2Suite ]; + buildInputs = [ IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; From 3e5b53f55c8bf6f3ff1e83e74d7b9160de8d6e93 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:12 +0000 Subject: [PATCH 397/467] [cpan2nix] perlPackages.DBDMock: 1.45 -> 1.49 --- 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 442aa9b0b294..aa81fadf941f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4710,13 +4710,13 @@ let DBDMock = buildPerlModule { pname = "DBD-Mock"; - version = "1.45"; + version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/D/DI/DICHI/DBD-Mock/DBD-Mock-1.45.tar.gz; - sha256 = "40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f"; + url = mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.49.tar.gz; + sha256 = "3c88bd9322d3d1a215b0c8dad8b27f06885a063f8f47fb8747f6e86f8b9d7116"; }; propagatedBuildInputs = [ DBI ]; - buildInputs = [ TestException ]; + buildInputs = [ ModuleBuildTiny TestException ]; }; DBDSQLite = buildPerlPackage { From d428d63e91083c535c0b3cdd47754ddaaed904f4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:16 +0000 Subject: [PATCH 398/467] [cpan2nix] perlPackages.ArchiveTarWrapper: 0.36 -> 0.37 --- 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 aa81fadf941f..e6f2d05ec16f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -653,16 +653,15 @@ let ArchiveTarWrapper = buildPerlPackage { pname = "Archive-Tar-Wrapper"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.36.tar.gz; - sha256 = "1s7i93qbimwygv07x5963vv90m09g2iiacnl3986smw4rpi5apwg"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz; + sha256 = "0b1hi3zfnq487kfg514kr595j9w8x6wxddy3zlpqcxgiv90zlv3y"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { description = "API wrapper around the 'tar' utility"; }; - buildInputs = [ Dumbbench ]; }; ArchiveZip = buildPerlPackage { From 4fb6d96b63764092e50df3e70d039db8f7c7c9aa Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:17 +0000 Subject: [PATCH 399/467] [cpan2nix] perlPackages.DataMessagePack: 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 e6f2d05ec16f..a1446a245a3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3893,7 +3893,7 @@ let url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.00.tar.gz"; sha256 = "c9f0eeaf56ee4dfd509eccba2dd838921aebdf186ba60de166443ffc4b0ba1a2"; }; - buildInputs = [ FileCopyRecursive TestRequires TestLeakTrace ]; + buildInputs = [ FileCopyRecursive TestRequires ]; meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; From 2e285c0d831d15ed46978c68bab5a14e6388474f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:19 +0000 Subject: [PATCH 400/467] [cpan2nix] perlPackages.PPIxQuoteLike: 0.007 -> 0.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1446a245a3b..8b1c41d91a2c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14377,10 +14377,10 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.007"; + version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.007.tar.gz; - sha256 = "040ma7763isxn9axsf9s8g00hm3ld6dajwp3nhq0nn4mz8cfaa3w"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz; + sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4"; }; propagatedBuildInputs = [ PPI ]; meta = { From 3240a8d273a1edde313388da6968df3874b8fac9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:21 +0000 Subject: [PATCH 401/467] [cpan2nix] perlPackages.MailBox: 3.007 -> 3.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b1c41d91a2c..48255f84a8dd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10454,11 +10454,11 @@ let }; MailBox = buildPerlPackage { - version = "3.007"; + version = "3.008"; pname = "Mail-Box"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.007.tar.gz; - sha256 = "1rqn9d6sjinbnl8a9ia4rqfmp899ad89y9h9hpzvmr8jxni7i19s"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz; + sha256 = "15yjq3ap1ch0k0pqa1zag50rqrjfqzf7cka1w41macxibna506mm"; }; doCheck = false; From d92ad6bb16fed2688a8022c4849f6cc890096d46 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:21 +0000 Subject: [PATCH 402/467] [cpan2nix] perlPackages.MailDKIM: 0.55 -> 0.57 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48255f84a8dd..739021db1535 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10499,10 +10499,10 @@ let MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "0.55"; + version = "0.57"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.55.tar.gz; - sha256 = "18nsh1ff6fkns4xk3y2ixmzmadgggydj11qkzj6nlnq2hzqxsafz"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.57.tar.gz; + sha256 = "0fmfhwn4sh98w62rc8j584l23vlhr7vii8glm2njx14f81a56lvb"; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; doCheck = false; # tries to access the domain name system From 14ec5a9d5d552a6e4d42238bd133ca23e6535e27 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:23 +0000 Subject: [PATCH 403/467] [cpan2nix] perlPackages.Specio: 0.43 -> 0.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 739021db1535..a9e43bda4eed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15605,10 +15605,10 @@ let Specio = buildPerlPackage { pname = "Specio"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.43.tar.gz; - sha256 = "07gsm4fssn9v27bnlgcxa7igb7ggrxwgpdqbbryi4134gfzxxl1w"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.44.tar.gz; + sha256 = "0vvdgcqkw4kxg9mxm683ykbyykkig1b6j7sfpkgx1cvp8my1fi5m"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; From b307c73bf3de787a1fc92a5f11bd5d3b2d22fabc Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:24 +0000 Subject: [PATCH 404/467] [cpan2nix] perlPackages.HTMLForm: 6.04 -> 6.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9e43bda4eed..b98d6f409dec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8081,10 +8081,10 @@ let HTMLForm = buildPerlPackage { pname = "HTML-Form"; - version = "6.04"; + version = "6.05"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.04.tar.gz; - sha256 = "100090bdsr5kapv8h0wxzwlzfbfqn57rq9gzrvg9i6hvnsl5gmcw"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz; + sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { From e0611267e13aafb3179e442cf492410a2878dd01 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:24 +0000 Subject: [PATCH 405/467] [cpan2nix] perlPackages.MojoliciousPluginStatus: 1.0 -> 1.01 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b98d6f409dec..3241f19c6c70 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11576,10 +11576,10 @@ let MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; - version = "1.0"; + version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.0.tar.gz; - sha256 = "14ypg679dk9yvgq67mp7lzs131cxhbgcmrpx5f4ddqcrs1bzq5rb"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz; + sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6"; }; propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; meta = { From 46ebd178422202b215b3fa58455230d2f9b9e6ef Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:25 +0000 Subject: [PATCH 406/467] [cpan2nix] perlPackages.SubName: 0.21 -> 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 3241f19c6c70..dd07a8e4d206 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16201,10 +16201,10 @@ let SubName = buildPerlPackage { pname = "Sub-Name"; - version = "0.21"; + version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz; - sha256 = "bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"; + url = mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz; + sha256 = "2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105"; }; buildInputs = [ BC DevelCheckBin ]; meta = { From da43b6dd13a35c3eb8f2146d705cc191b04171d9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:26 +0000 Subject: [PATCH 407/467] [cpan2nix] perlPackages.AlienBuild: 1.79 -> 1.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 dd07a8e4d206..fb787f9b2bc3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -158,10 +158,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "1.79"; + version = "1.89"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.79.tar.gz; - sha256 = "18qlizxa67ldnxw91ks6qffhn5iia83ygcfv3c0db331f8nr68ki"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.89.tar.gz; + sha256 = "1jr740v95hdhjxkj5kcpwb022y6iqzmsax50fa69qbiwnjjnzqzz"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; From 2620f1f9978ba3f107ada47e5d59ee9b27956ca5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:27 +0000 Subject: [PATCH 408/467] [cpan2nix] perlPackages.namespaceautoclean: 0.28 -> 0.29 --- 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 fb787f9b2bc3..2052bf710f3f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12659,12 +12659,12 @@ let namespaceautoclean = buildPerlPackage { pname = "namespace-autoclean"; - version = "0.28"; + version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz; - sha256 = "cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"; + url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz; + sha256 = "45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804"; }; - buildInputs = [ TestRequires ]; + buildInputs = [ TestNeeds ]; propagatedBuildInputs = [ SubIdentify namespaceclean ]; meta = { homepage = https://github.com/moose/namespace-autoclean; From c7663db085fef76d6832131f85e940d19406249f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:28 +0000 Subject: [PATCH 409/467] [cpan2nix] perlPackages.ArrayCompare: v3.0.2 -> v3.0.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 2052bf710f3f..9d4afafb19da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -571,10 +571,10 @@ let ArrayCompare = buildPerlModule { pname = "Array-Compare"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.2.tar.gz; - sha256 = "0ci8pb6nh73rmmwd8fvg6n2064v8nbraqyg1axsncfi28nfz522s"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz; + sha256 = "13hn913cj7vswh5yy7gxpmhzrwmwknkc73qn7bhw0x7gx757rav2"; }; buildInputs = [ TestNoWarnings ]; From f380c9a18d0113b1140ff938d2e196980af09a47 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:29 +0000 Subject: [PATCH 410/467] [cpan2nix] perlPackages.PPIxRegexp: 0.065 -> 0.067 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9d4afafb19da..1fb460fa81c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14391,10 +14391,10 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.065"; + version = "0.067"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.065.tar.gz; - sha256 = "eb4a56858c077d9e6a859c4f29d7659ed40ea588d21cfe7193dd91143a8e843e"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.067.tar.gz; + sha256 = "1aa8dee5bdefdfdbfedd3d829932cedc57502552572739766148c6ac6cc6c3f0"; }; propagatedBuildInputs = [ ListMoreUtils PPI ]; meta = { From 12bb6480d231d6a4c906a9358b77ab3cce8a764f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:31 +0000 Subject: [PATCH 411/467] [cpan2nix] perlPackages.ImageSane: 0.14 -> 4 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1fb460fa81c7..5959acb9bc59 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8727,10 +8727,10 @@ let ImageSane = buildPerlPackage { pname = "Image-Sane"; - version = "0.14"; + version = "4"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-0.14.tar.gz; - sha256 = "a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5"; + url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-4.tar.gz; + sha256 = "f970a0314e554f6fe29dcc651aec5bd45b32d547801d304434ae80b4b806896b"; }; buildInputs = [ pkgs.sane-backends ExtUtilsDepends ExtUtilsPkgConfig TestRequires TryTiny ]; propagatedBuildInputs = [ ExceptionClass Readonly ]; From 398f5953b2987856959aa87fd03617450c79b798 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:32 +0000 Subject: [PATCH 412/467] [cpan2nix] perlPackages.JSONValidator: 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 5959acb9bc59..35a4f8801289 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9405,7 +9405,7 @@ let sha256 = "ce14ed018b9843ef022c4c14e2171545d3da92e533c8f122b8e33f27444b2a6c"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ Mojolicious YAMLLibYAML DataValidateDomain DataValidateIP NetIDNEncode ]; + propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; meta = { homepage = "https://github.com/mojolicious/json-validator"; description = "Validate data against a JSON schema"; From c0f1bf753b16967e5f4d977768689bc446dfaca9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:32 +0000 Subject: [PATCH 413/467] [cpan2nix] perlPackages.DBDmysql: 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 35a4f8801289..348f625a78ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4758,7 +4758,7 @@ let sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; - buildInputs = [ pkgs.libmysqlclient DevelChecklib ] ; + buildInputs = [ pkgs.libmysqlclient DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; doCheck = false; From 076dc17149af60635d52621e3a2a341af046af2e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:35 +0000 Subject: [PATCH 414/467] [cpan2nix] perlPackages.XMLParser: 2.44 -> 2.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 348f625a78ca..19c9f3af97b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19961,10 +19961,10 @@ let XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.44"; + version = "2.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; - sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz; + sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' From 022c3d7da4a9105a0defcfbf9982e9fab8a7aa0b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:36 +0000 Subject: [PATCH 415/467] [cpan2nix] perlPackages.Mouse: v2.5.6 -> v2.5.9 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19c9f3af97b1..c7900cc6108d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12564,10 +12564,10 @@ let Mouse = buildPerlModule { pname = "Mouse"; - version = "2.5.6"; + version = "2.5.9"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz; - sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz; + sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; From 258720ebb8726785ff7ed98f051d093a4aa1386d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:41 +0000 Subject: [PATCH 416/467] [cpan2nix] perlPackages.CryptPBKDF2: 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 c7900cc6108d..34f125a35942 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3568,7 +3568,7 @@ let sha256 = "97dfa79a309a086e184a4e61047f8a10ffb3db051025e7d222a25f19130ba417"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ DigestHMAC DigestSHA3 Moo TryTiny TypeTiny namespaceautoclean strictures ]; + propagatedBuildInputs = [ DigestHMAC DigestSHA3 Moo TypeTiny namespaceautoclean strictures ]; meta = { homepage = "https://metacpan.org/release/Crypt-PBKDF2"; description = "The PBKDF2 password hash algorithm"; From 3fea2409ff6c2294515c6b99088899b30093d961 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:42 +0000 Subject: [PATCH 417/467] [cpan2nix] perlPackages.GitRepository: 1.323 -> 1.324 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34f125a35942..4a6d06371cc9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7505,10 +7505,10 @@ let GitRepository = buildPerlPackage { pname = "Git-Repository"; - version = "1.323"; + version = "1.324"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.323.tar.gz; - sha256 = "966575fcecc9f56ab8739ea451b3825e278bc9179d785a20a9ae52473f33683e"; + url = mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz; + sha256 = "814dfad104a9546349f9e0fd492c86137de827ebc284017a91a5267c120ad4f6"; }; buildInputs = [ TestRequiresGit ]; propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ]; From 8f8d6abe99dd2c52387d21f8a6b395576dd7f415 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:46 +0000 Subject: [PATCH 418/467] [cpan2nix] perlPackages.DeviceOUI: 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 4a6d06371cc9..923622dab582 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4699,7 +4699,7 @@ let }; buildInputs = [ TestException ]; patches = [ ../development/perl-modules/Device-OUI-1.04-hash.patch ]; - propagatedBuildInputs = [ ClassAccessorGrouped SubExporter LWP ]; + propagatedBuildInputs = [ ClassAccessorGrouped LWP SubExporter ]; meta = { description = "Resolve an Organizationally Unique Identifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f90fc907151d014a8ae334ac3620ae9b5f24b75f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:47 +0000 Subject: [PATCH 419/467] [cpan2nix] perlPackages.WWWMechanize: 1.91 -> 1.94 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 923622dab582..c54f86b5f242 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19626,10 +19626,10 @@ let WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "1.91"; + version = "1.94"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz; - sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.94.tar.gz; + sha256 = "00hh5iaxyfmfgh5irz23v5qpc40hff2v78jyi93assi7a4amfl68"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; From 4b12610b8d6cdb66d95593d4ea4b83609ae601e1 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:49 +0000 Subject: [PATCH 420/467] [cpan2nix] perlPackages.WebServiceLinode: 0.28 -> 0.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c54f86b5f242..1e3180f81903 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20243,10 +20243,10 @@ let WebServiceLinode = buildPerlModule { pname = "WebService-Linode"; - version = "0.28"; + version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz; - sha256 = "66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509"; + url = mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.29.tar.gz; + sha256 = "103aab245304f08e9e87ac7bc884ddb44a630de6bac077dc921f716d71154922"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ JSON LWPProtocolHttps ]; From d3fc6942468c7647438976bfe374339f816e7edf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:51 +0000 Subject: [PATCH 421/467] [cpan2nix] perlPackages.ModuleCPANTSAnalyse: 1.00 -> 1.01 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e3180f81903..0caf9b226049 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11250,10 +11250,10 @@ let ModuleCPANTSAnalyse = buildPerlPackage { pname = "Module-CPANTS-Analyse"; - version = "1.00"; + version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz; - sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz; + sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; }; propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; From 6036b6ddc82526f585caafbd036e22e124fdbb5c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:53 +0000 Subject: [PATCH 422/467] [cpan2nix] perlPackages.DateTimeTimeZone: 2.36 -> 2.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0caf9b226049..3bb830685a9c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4513,10 +4513,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.36"; + version = "2.37"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.36.tar.gz; - sha256 = "7e033a3cae17a62a0a4011b9e3dd900acf8b7614e05dc6595d1f55406ec6f6a7"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.37.tar.gz; + sha256 = "6c12dfa6ad190191d437a7661c644fc38aaf109001e1d958c95dbb0aa143c421"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; From c3e794a9a7fcee39ce1a9e86f3fc0dcf03dd0e75 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:53 +0000 Subject: [PATCH 423/467] [cpan2nix] perlPackages.MojoSQLite: 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 3bb830685a9c..7da48d909936 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11598,7 +11598,7 @@ let sha256 = "16dn0p14i6r4c8aspvkp7rfry3zy7kr2ffcmncj0pqygk62miinp"; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URI URIdb ]; + propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ]; meta = { homepage = "https://github.com/Grinnz/Mojo-SQLite"; description = "A tiny Mojolicious wrapper for SQLite"; From a007fe924832d6ea0a4830472942aa80bd38867c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:57 +0000 Subject: [PATCH 424/467] [cpan2nix] perlPackages.DateTimeLocale: 1.24 -> 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 7da48d909936..1a2555752acc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4484,10 +4484,10 @@ let DateTimeLocale = buildPerlPackage { pname = "DateTime-Locale"; - version = "1.24"; + version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.24.tar.gz; - sha256 = "d03aaa33126a13b1fe6591b9838f0a07395f1fea12b6e304566d7e39a5e5fb82"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz; + sha256 = "aa79746bd488b32aa4dbccccd05f1e5505642be013d8064a5d6f8a76a3c45d0b"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; From 587d899d76980e421092ea1794507bb7d11133d0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:57 +0000 Subject: [PATCH 425/467] [cpan2nix] perlPackages.AppClusterSSH: v4.13.2 -> 4.14 --- 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 1a2555752acc..f3110bbfe876 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -404,13 +404,13 @@ let AppClusterSSH = buildPerlModule { pname = "App-ClusterSSH"; - version = "4.13.2"; + version = "4.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-v4.13.2.tar.gz; - sha256 = "0rmk2p3f2wz1h092anidjclh212rv3gxyk0c641qk3frlrjnw6mp"; + url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz; + sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi"; }; - propagatedBuildInputs = [ ExceptionClass Tk TryTiny X11ProtocolOther ]; - buildInputs = [ CPANChanges FileSlurp FileWhich PerlTidy Readonly TestDifferences TestDistManifest TestPerlTidy TestPod TestPodCoverage TestTrap ]; + propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; + buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; preCheck = "rm t/perltidy.t t/manifest.t t/30cluster.t"; # do not run failing tests postInstall = '' mkdir -p $out/etc/bash_completion.d From c79742b6a86cd394b1d1b275e10434119315aa72 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:10:58 +0000 Subject: [PATCH 426/467] [cpan2nix] perlPackages.DateTimeCalendarJulian: 0.100 -> 0.101 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3110bbfe876..1ed5ee5cc6f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4260,10 +4260,10 @@ let DateTimeCalendarJulian = buildPerlPackage { pname = "DateTime-Calendar-Julian"; - version = "0.100"; + version = "0.101"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.100.tar.gz; - sha256 = "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx"; + url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.101.tar.gz; + sha256 = "1q7zflwv44yybyz5nd01bc69zw5m540qg4fnh4xlj2icbm3sf7br"; }; meta = { description = "Dates in the Julian calendar"; From cfe515080981a4f04c9c0729b35e9834195ea216 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:04 +0000 Subject: [PATCH 427/467] [cpan2nix] perlPackages.DateTimeFormatFlexible: 0.31 -> 0.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1ed5ee5cc6f5..cbb07adb2435 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4326,10 +4326,10 @@ let DateTimeFormatFlexible = buildPerlPackage { pname = "DateTime-Format-Flexible"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.31.tar.gz; - sha256 = "0daf62fe4af0b336d45e367143a580b5a34912a679eef788d54c4d5ad685c2d1"; + url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz; + sha256 = "50a7b9feb287bb14b27323a53c2324486181a3ab6cb3f4c7662d42be901ad8ee"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; meta = { From d43be13df5260643c5b92ed1e766ef0dc949307a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:12 +0000 Subject: [PATCH 428/467] [cpan2nix] perlPackages.MathPlanePath: 126 -> 127 dependencies: perlPackages.NumberFraction: init at 2.01 --- pkgs/top-level/perl-packages.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbb07adb2435..5dd82af91cc7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10776,13 +10776,13 @@ let MathPlanePath = buildPerlPackage { pname = "Math-PlanePath"; - version = "126"; + version = "127"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-126.tar.gz; - sha256 = "014gr79gg992paas6v1glciyycqp2hg7pg4y03kgfbxz1slc6zhq"; + url = mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz; + sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; - buildInputs = [ DataFloat MathBigIntLite ]; + buildInputs = [ DataFloat MathBigIntLite NumberFraction ]; }; MathRandomISAAC = buildPerlPackage { @@ -13310,6 +13310,20 @@ let }; }; + NumberFraction = buildPerlModule { + pname = "Number-Fraction"; + version = "2.01"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz; + sha256 = "1ysv5md4dmz95zc0gy8ivb21nhqxyv8vrc5lr2sgshsjrdqsi185"; + }; + propagatedBuildInputs = [ Moose ]; + meta = { + description = "Perl extension to model fractions"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NumberMisc = buildPerlModule { pname = "Number-Misc"; version = "1.2"; From ff2417cace839181d11b93d61b57593926895c22 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:12 +0000 Subject: [PATCH 429/467] [cpan2nix] perlPackages.DBIxClassInflateColumnSerializer: 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 5dd82af91cc7..40856017f618 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5012,7 +5012,7 @@ let sha256 = "6262b4871db6a6c45a0cbe7cde8f1b890b22c291add4ecc40caaeeab5a3a6f50"; }; buildInputs = [ DBDSQLite TestException ]; - propagatedBuildInputs = [ DBIxClass JSONMaybeXS YAML namespaceclean ]; + propagatedBuildInputs = [ DBIxClass JSONMaybeXS YAML ]; meta = { homepage = "https://metacpan.org/pod/DBIx::Class::InflateColumn::Serializer"; description = "Inflators to serialize data structures for DBIx::Class"; From e066beac510f6f97b87a703fc282d1b89285ea12 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:13 +0000 Subject: [PATCH 430/467] [cpan2nix] perlPackages.XMLRSS: 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 40856017f618..70d7f91ccd2c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20041,10 +20041,10 @@ let XMLRSS = buildPerlModule { pname = "XML-RSS"; - version = "1.60"; + version = "1.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.60.tar.gz; - sha256 = "4b3359878bb1a2bc06dae7ed17b00143a2b89c814b8b12f6e2780f35b1528677"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz; + sha256 = "fa6fe7ce5d31800a2bd414ef39da48c7f2b26b073a3c1f0d677bda26e840c90d"; }; propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { From a220383a49087604d50a48502f7b3dfaf1d4a159 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:15 +0000 Subject: [PATCH 431/467] [cpan2nix] perlPackages.DBICxTestDatabase: 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 70d7f91ccd2c..36005682e2a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4904,7 +4904,7 @@ let url = "mirror://cpan/authors/id/J/JR/JROCKWAY/DBICx-TestDatabase-0.05.tar.gz"; sha256 = "8e3bc2530b01216188c3aa65acdbd2f59c4e631f3ae085dfc439abd89f8f0acf"; }; - buildInputs = [ DBIxClass ]; + buildInputs = [ DBIxClass TestSimple13 ]; propagatedBuildInputs = [ DBDSQLite SQLTranslator ]; meta = { homepage = "https://metacpan.org/pod/DBICx::TestDatabase"; From e7f174c74321a4d61ead19c5a320a39b28d714ea Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:19 +0000 Subject: [PATCH 432/467] [cpan2nix] perlPackages.DeviceMAC: 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 36005682e2a7..4c6007d833ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4681,7 +4681,7 @@ let url = "mirror://cpan/authors/id/J/JA/JASONK/Device-MAC-1.00.tar.gz"; sha256 = "c42182a9a8489a314cbfe6e1c8452f32b3b626aa6c89fee1d8925e6dfb64fad5"; }; - buildInputs = [ TestMost TestDifferences TestException TestWarn TestDeep ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ DeviceOUI Moose ]; meta = { description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)"; From 67d7c75853c5ccd59bbca350ccf5cb9f81f3238d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:25 +0000 Subject: [PATCH 433/467] [cpan2nix] perlPackages.DBIxClassHelpers: 2.033004 -> 2.034000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c6007d833ad..e44ea9920395 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4990,10 +4990,10 @@ let DBIxClassHelpers = buildPerlPackage { pname = "DBIx-Class-Helpers"; - version = "2.033004"; + version = "2.034000"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.033004.tar.gz; - sha256 = "14bc7adda3b30867311717faa11a4534bceda3061229dc2533647c1906d8784c"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034000.tar.gz; + sha256 = "bf92b5495fddd50daa15126e015d5d210a44b6bb43baa8859b5adaa57cd96c59"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; From 211f70aecac3c595e2392a443540d98412dcbe92 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 07:11:28 +0000 Subject: [PATCH 434/467] [cpan2nix] perlPackages.Workflow: 1.46 -> 1.48 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e44ea9920395..e21cb1bdec3a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19709,10 +19709,10 @@ let Workflow = buildPerlModule { pname = "Workflow"; - version = "1.46"; + version = "1.48"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.46.tar.gz; - sha256 = "10zxp39yp11ry5j1c1krhx7s57rb2r8m48jf66k8f4jzm6f0w7pf"; + url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz; + sha256 = "0bz6gil9mygh5ikh8mf86ids9xb1dbgx9hqc1g68qn9ffsyb012f"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; From 7d359369d8932eb81ade16fffa77fbb7d5b4bbc5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 22 Oct 2019 05:51:01 +0000 Subject: [PATCH 435/467] perlPackages: post-upgrade fixes --- pkgs/top-level/perl-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e21cb1bdec3a..8fa9d9b92565 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -411,7 +411,7 @@ let }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; - preCheck = "rm t/perltidy.t t/manifest.t t/30cluster.t"; # do not run failing tests + preCheck = "rm t/30cluster.t"; # do not run failing tests postInstall = '' mkdir -p $out/etc/bash_completion.d mv $out/bin/clusterssh_bash_completion.dist \ @@ -4742,6 +4742,8 @@ let rm -rf $out/${perl.libPrefix}/*/*/auto/share ''; + preCheck = "rm t/65_db_config.t"; # do not run failing tests + meta = with stdenv.lib; { description = "Self Contained SQLite RDBMS in a DBI Driver"; license = with licenses; [ artistic1 gpl1Plus ]; @@ -11771,6 +11773,7 @@ let }; propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; buildInputs = [ Mo MooXCmd MooXLocaleTextDomainOO Moose TestTrap ]; + preCheck = "rm t/16-namespace_clean.t"; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942275 meta = { description = "Explicit Options eXtension for Object Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -16391,6 +16394,7 @@ let sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + doCheck = !stdenv.isAarch64; }; SysHostnameLong = buildPerlPackage { @@ -19622,6 +19626,7 @@ let ''; NIX_CFLAGS_COMPILE = "-DCURL_STRICTER"; doCheck = false; # performs network access + meta.broken = stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkgs.curl) "7.66"; # broken since "curl: 7.65.3 -> 7.66.0" }; WWWFormUrlEncoded = buildPerlModule { From 43bbecea5e1dd1cfc163b790c1f388a563442ed1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Oct 2019 14:45:17 +0200 Subject: [PATCH 436/467] pythonInterpreters.graalpython37: init Add an interpreter with package set for graalpython 3.7. --- .../interpreters/python/default.nix | 5 +++++ .../python/graalpython/default.nix | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/interpreters/python/graalpython/default.nix diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index cf658cccfcda..57ca7653721b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -200,4 +200,9 @@ in { ncurses = ncurses5; }; + graalpython37 = callPackage ./graalpython/default.nix { + self = pythonInterpreters.graalpython37; + inherit passthruFun; + }; + }) diff --git a/pkgs/development/interpreters/python/graalpython/default.nix b/pkgs/development/interpreters/python/graalpython/default.nix new file mode 100644 index 000000000000..b5d7d130b5a7 --- /dev/null +++ b/pkgs/development/interpreters/python/graalpython/default.nix @@ -0,0 +1,21 @@ +{ pkgs +, lib +, graalvm8 +, passthruFun +, packageOverrides ? (self: super: {}) +, self +}: + +let + passthru = passthruFun { + inherit self packageOverrides; + implementation = "graal"; + sourceVersion = graalvm8.version; + pythonVersion = "3.7"; + libPrefix = "graalvm"; + sitePackages = "jre/languages/python/lib-python/3/site-packages"; + executable = "graalpython"; + hasDistutilsCxxPatch = false; + pythonForBuild = pkgs.buildPackages.pythonInterpreters.graalpython37; + }; +in lib.extendDerivation true passthru graalvm8 From 2c33c2b9f0085df9091a1edc27e56c2c591fd402 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 23:27:28 -0700 Subject: [PATCH 437/467] harfbuzz: 2.6.1 -> 2.6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz/versions --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 3f7d1a2c3526..361ac4f27aa0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.6.1"; + version = "2.6.2"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "0kw4c04jd8c8ili3j1glgv0wsr207313fs3jh2rawf53m8zznlf6"; + sha256 = "097ncrkaawdzpgwlrpp4kwciq4z5pqz2n4f3yra5vc7jyxr6lk1v"; }; postPatch = '' From 6807f6b154e348de2f020e3b09f40a0b80009026 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 21:25:56 -0700 Subject: [PATCH 438/467] isocodes: 4.3 -> 4.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iso-codes/versions --- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 37d6c0643c73..1766abb2aac9 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; - sha256 = "11n3sccwapfr7npxad8m3xmc7w8i11kk70ffbz25gj82bn8rylvb"; + sha256 = "02x0wcz783ammkdrmrh31wsmww481xbkbz70vf766ivbnn5sfxn6"; }; patchPhase = '' From 64922cfde93431c2dc0023c3dc983dcb10578249 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 23:43:56 -0400 Subject: [PATCH 439/467] systemd: additional logind fixes See: https://github.com/NixOS/systemd/pull/33 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 468a34b0f5a5..5a2c5dd504e0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "ccec67cab6c0fda85a1762eee7aeea422a0dc15e"; - sha256 = "12nq2ah33amhyfma464a4ssf90wh2ai8c7w55j381cks8jliny40"; + rev = "d25cf413c6bff1b5a9d216a8830e3a90c9cad1de"; + sha256 = "0ilvrnh3m7g0yflxl16fk52gkb1z0fwwk9ba5gs4005nzpl0c7i0"; }; outputs = [ "out" "lib" "man" "dev" ]; From 703e44675c5e62b0dbbd37b76153383fc0b5ee47 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 21 Oct 2019 01:05:07 +0800 Subject: [PATCH 440/467] openssl: switch to linux-x86 and linux-x86_64 targets --- pkgs/development/libraries/openssl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0b026ae75f4e..7a1ef5574696 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -44,10 +44,12 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { - x86_64-darwin = "./Configure darwin64-x86_64-cc"; - x86_64-solaris = "./Configure solaris64-x86_64-gcc"; armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; + i686-linux = "./Configure linux-x86"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + x86_64-linux = "./Configure linux-x86_64"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" From d0c1ee588fb915387989c6e0bdfbae3269e3056f Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 6 Oct 2019 07:01:29 +0200 Subject: [PATCH 441/467] groff: 1.22.3 -> 1.22.4 --- pkgs/tools/text/groff/default.nix | 17 +++----- pkgs/tools/text/groff/look-for-ar.patch | 39 ------------------- pkgs/tools/text/groff/mdate-determinism.patch | 13 ------- 3 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 pkgs/tools/text/groff/look-for-ar.patch delete mode 100644 pkgs/tools/text/groff/mdate-determinism.patch diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index a3df96175675..4055c5c083d6 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -3,26 +3,23 @@ , psutils, netpbm #for html output , buildPackages , autoreconfHook +, pkgconfig +, texinfo }: stdenv.mkDerivation rec { pname = "groff"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; - sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; + sha256 = "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"; }; outputs = [ "out" "man" "doc" "info" "perl" ]; enableParallelBuilding = false; - patches = [ - ./look-for-ar.patch - ./mdate-determinism.patch - ]; - postPatch = stdenv.lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ --replace "psselect" "${psutils}/bin/psselect" @@ -38,7 +35,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ ghostscript psutils netpbm perl ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the @@ -62,11 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; - # Remove example output with (random?) colors and creation date - # to avoid non-determinism in the output. postInstall = '' - rm "$doc"/share/doc/groff/examples/hdtbl/*color*ps - find "$doc"/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' for f in 'man.local' 'mdoc.local'; do cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f" done diff --git a/pkgs/tools/text/groff/look-for-ar.patch b/pkgs/tools/text/groff/look-for-ar.patch deleted file mode 100644 index 3b4d09c260fa..000000000000 --- a/pkgs/tools/text/groff/look-for-ar.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 988a001f969262089579958827652da00fda096f -Author: Ben Gamari -Date: Tue Oct 17 16:15:20 2017 -0400 - - Look for AR - -diff --git a/Makefile.in b/Makefile.in -index bc156ce..cc02126 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -464,7 +464,7 @@ INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - INSTALL_INFO=@INSTALL_INFO@ - LN_S=@LN_S@ --AR=ar -+AR=@AR@ - ETAGS=etags - ETAGSFLAGS= - # Flag that tells etags to assume C++. -diff --git a/configure.ac b/configure.ac -index c779165..6d53f5e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,7 @@ AC_PREREQ([2.62]) - - AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin]) - AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_USE_SYSTEM_EXTENSIONS - -@@ -73,6 +74,7 @@ GROFF_PROG_YACC - GROFF_DOC_CHECK - GROFF_MAKEINFO - AC_PROG_RANLIB -+AC_CHECK_TOOL([AR], [ar], [ar]) - GROFF_INSTALL_SH - GROFF_INSTALL_INFO - AC_PROG_INSTALL diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/pkgs/tools/text/groff/mdate-determinism.patch deleted file mode 100644 index 1253d1133940..000000000000 --- a/pkgs/tools/text/groff/mdate-determinism.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.comm b/Makefile.comm -index 75efc22..b757000 100644 ---- a/Makefile.comm -+++ b/Makefile.comm -@@ -155,7 +155,7 @@ extraclean: distclean - -e "s|@MAN1EXT@|$(man1ext)|g" \ - -e "s|@MAN5EXT@|$(man5ext)|g" \ - -e "s|@MAN7EXT@|$(man7ext)|g" \ -- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \ -+ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \ - -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \ - -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \ - -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ From f15564d72b5be4630898c2ca83e623fba42cdba6 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 2 Oct 2019 22:47:24 +0200 Subject: [PATCH 442/467] libtiff: patch for CVE-2019-6128, CVE-2019-14973 CVE-2019-14973.patch is a manually backported of the upstream patch to work around some minor merge conflicts. --- .../libraries/libtiff/CVE-2019-14973.patch | 384 ++++++++++++++++++ .../development/libraries/libtiff/default.nix | 10 + 2 files changed, 394 insertions(+) create mode 100644 pkgs/development/libraries/libtiff/CVE-2019-14973.patch diff --git a/pkgs/development/libraries/libtiff/CVE-2019-14973.patch b/pkgs/development/libraries/libtiff/CVE-2019-14973.patch new file mode 100644 index 000000000000..1dc75246902e --- /dev/null +++ b/pkgs/development/libraries/libtiff/CVE-2019-14973.patch @@ -0,0 +1,384 @@ +diff -ru tiff-4.0.10-orig/libtiff/tif_aux.c tiff-4.0.10/libtiff/tif_aux.c +--- tiff-4.0.10-orig/libtiff/tif_aux.c 2017-12-02 16:21:47.305709555 +0100 ++++ tiff-4.0.10/libtiff/tif_aux.c 2019-10-02 22:35:17.392184463 +0200 +@@ -57,18 +57,57 @@ + return bytes; + } + ++tmsize_t ++_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where) ++{ ++ if( first <= 0 || second <= 0 ) ++ { ++ if( tif != NULL && where != NULL ) ++ { ++ TIFFErrorExt(tif->tif_clientdata, where, ++ "Invalid argument to _TIFFMultiplySSize() in %s", where); ++ } ++ return 0; ++ } ++ ++ if( first > TIFF_TMSIZE_T_MAX / second ) ++ { ++ if( tif != NULL && where != NULL ) ++ { ++ TIFFErrorExt(tif->tif_clientdata, where, ++ "Integer overflow in %s", where); ++ } ++ return 0; ++ } ++ return first * second; ++} ++ ++tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module) ++{ ++ if( val > (uint64)TIFF_TMSIZE_T_MAX ) ++ { ++ if( tif != NULL && module != NULL ) ++ { ++ TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); ++ } ++ return 0; ++ } ++ return (tmsize_t)val; ++} ++ + void* + _TIFFCheckRealloc(TIFF* tif, void* buffer, + tmsize_t nmemb, tmsize_t elem_size, const char* what) + { + void* cp = NULL; +- tmsize_t bytes = nmemb * elem_size; +- ++ tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL); + /* +- * XXX: Check for integer overflow. ++ * Check for integer overflow. + */ +- if (nmemb && elem_size && bytes / elem_size == nmemb) +- cp = _TIFFrealloc(buffer, bytes); ++ if (count != 0) ++ { ++ cp = _TIFFrealloc(buffer, count); ++ } + + if (cp == NULL) { + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, +diff -ru tiff-4.0.10-orig/libtiff/tiffiop.h tiff-4.0.10/libtiff/tiffiop.h +--- tiff-4.0.10-orig/libtiff/tiffiop.h 2018-11-03 15:28:37.748910968 +0100 ++++ tiff-4.0.10/libtiff/tiffiop.h 2019-10-02 22:35:17.396184535 +0200 +@@ -77,6 +77,9 @@ + #define FALSE 0 + #endif + ++#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) ++#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) ++ + typedef struct client_info { + struct client_info *next; + void *data; +@@ -258,7 +261,7 @@ + #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3) + #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y)) + +-/* Safe multiply which returns zero if there is an integer overflow */ ++/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */ + #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0) + + #define TIFFmax(A,B) ((A)>(B)?(A):(B)) +@@ -368,6 +371,8 @@ + + extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*); + extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*); ++extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*); ++extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*); + extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*); + extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*); + +diff -ru tiff-4.0.10-orig/libtiff/tif_getimage.c tiff-4.0.10/libtiff/tif_getimage.c +--- tiff-4.0.10-orig/libtiff/tif_getimage.c 2017-12-02 16:21:47.654716127 +0100 ++++ tiff-4.0.10/libtiff/tif_getimage.c 2019-10-02 22:35:17.393184481 +0200 +@@ -755,9 +755,8 @@ + uint32 leftmost_tw; + + tilesize = TIFFTileSize(tif); +- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize); ++ bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate"); + if (bufsize == 0) { +- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate"); + return (0); + } + +@@ -1019,9 +1018,8 @@ + uint16 colorchannels; + + stripsize = TIFFStripSize(tif); +- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize); ++ bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate"); + if (bufsize == 0) { +- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate"); + return (0); + } + +diff -ru tiff-4.0.10-orig/libtiff/tif_luv.c tiff-4.0.10/libtiff/tif_luv.c +--- tiff-4.0.10-orig/libtiff/tif_luv.c 2018-05-05 15:50:35.884596907 +0200 ++++ tiff-4.0.10/libtiff/tif_luv.c 2019-10-02 22:35:17.393184481 +0200 +@@ -1264,16 +1264,10 @@ + return (SGILOGDATAFMT_UNKNOWN); + } + +- +-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) +- + static tmsize_t + multiply_ms(tmsize_t m1, tmsize_t m2) + { +- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) +- return 0; +- return m1 * m2; ++ return _TIFFMultiplySSize(NULL, m1, m2, NULL); + } + + static int +diff -ru tiff-4.0.10-orig/libtiff/tif_pixarlog.c tiff-4.0.10/libtiff/tif_pixarlog.c +--- tiff-4.0.10-orig/libtiff/tif_pixarlog.c 2017-12-02 16:21:47.841162432 +0100 ++++ tiff-4.0.10/libtiff/tif_pixarlog.c 2019-10-02 22:36:01.223970118 +0200 +@@ -634,15 +634,10 @@ + return guess; + } + +-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) +- + static tmsize_t + multiply_ms(tmsize_t m1, tmsize_t m2) + { +- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) +- return 0; +- return m1 * m2; ++ return _TIFFMultiplySSize(NULL, m1, m2, NULL); + } + + static tmsize_t +diff -ru tiff-4.0.10-orig/libtiff/tif_read.c tiff-4.0.10/libtiff/tif_read.c +--- tiff-4.0.10-orig/libtiff/tif_read.c 2018-10-14 21:15:27.551093695 +0200 ++++ tiff-4.0.10/libtiff/tif_read.c 2019-10-02 22:41:09.387290927 +0200 +@@ -29,9 +29,6 @@ + #include "tiffiop.h" + #include + +-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) +- + int TIFFFillStrip(TIFF* tif, uint32 strip); + int TIFFFillTile(TIFF* tif, uint32 tile); + static int TIFFStartStrip(TIFF* tif, uint32 strip); +@@ -49,6 +46,8 @@ + #define THRESHOLD_MULTIPLIER 10 + #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD) + ++#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF) ++ + /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset' + * Returns 1 in case of success, 0 otherwise. */ + static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size, +@@ -734,23 +733,8 @@ + return ((tmsize_t)(-1)); + } + bytecount = td->td_stripbytecount[strip]; +- if ((int64)bytecount <= 0) { +-#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) +- TIFFErrorExt(tif->tif_clientdata, module, +- "%I64u: Invalid strip byte count, strip %lu", +- (unsigned __int64) bytecount, +- (unsigned long) strip); +-#else +- TIFFErrorExt(tif->tif_clientdata, module, +- "%llu: Invalid strip byte count, strip %lu", +- (unsigned long long) bytecount, +- (unsigned long) strip); +-#endif +- return ((tmsize_t)(-1)); +- } +- bytecountm = (tmsize_t)bytecount; +- if ((uint64)bytecountm!=bytecount) { +- TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow"); ++ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module); ++ if (bytecountm == 0) { + return ((tmsize_t)(-1)); + } + if (size != (tmsize_t)(-1) && size < bytecountm) +@@ -774,7 +758,7 @@ + if ((tif->tif_flags&TIFF_NOREADRAW)==0) + { + uint64 bytecount = td->td_stripbytecount[strip]; +- if ((int64)bytecount <= 0) { ++ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, + "Invalid strip byte count %I64u, strip %lu", +@@ -801,7 +785,7 @@ + (bytecount - 4096) / 10 > (uint64)stripsize ) + { + uint64 newbytecount = (uint64)stripsize * 10 + 4096; +- if( (int64)newbytecount >= 0 ) ++ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX ) + { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFWarningExt(tif->tif_clientdata, module, +@@ -1196,10 +1180,8 @@ + bytecount64 = td->td_stripbytecount[tile]; + if (size != (tmsize_t)(-1) && (uint64)size < bytecount64) + bytecount64 = (uint64)size; +- bytecountm = (tmsize_t)bytecount64; +- if ((uint64)bytecountm!=bytecount64) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); ++ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module); ++ if( bytecountm == 0 ) { + return ((tmsize_t)(-1)); + } + return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module)); +@@ -1221,7 +1203,7 @@ + if ((tif->tif_flags&TIFF_NOREADRAW)==0) + { + uint64 bytecount = td->td_stripbytecount[tile]; +- if ((int64)bytecount <= 0) { ++ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, + "%I64u: Invalid tile byte count, tile %lu", +@@ -1248,7 +1230,7 @@ + (bytecount - 4096) / 10 > (uint64)stripsize ) + { + uint64 newbytecount = (uint64)stripsize * 10 + 4096; +- if( (int64)newbytecount >= 0 ) ++ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX ) + { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFWarningExt(tif->tif_clientdata, module, +diff -ru tiff-4.0.10-orig/libtiff/tif_strip.c tiff-4.0.10/libtiff/tif_strip.c +--- tiff-4.0.10-orig/libtiff/tif_strip.c 2017-12-02 16:21:47.947867167 +0100 ++++ tiff-4.0.10/libtiff/tif_strip.c 2019-10-02 22:35:17.395184517 +0200 +@@ -129,15 +129,8 @@ + { + static const char module[] = "TIFFVStripSize"; + uint64 m; +- tmsize_t n; + m=TIFFVStripSize64(tif,nrows); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* +@@ -211,15 +204,8 @@ + { + static const char module[] = "TIFFStripSize"; + uint64 m; +- tmsize_t n; + m=TIFFStripSize64(tif); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* +@@ -330,14 +316,8 @@ + { + static const char module[] = "TIFFScanlineSize"; + uint64 m; +- tmsize_t n; + m=TIFFScanlineSize64(tif); +- n=(tmsize_t)m; +- if ((uint64)n!=m) { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* +@@ -366,15 +346,8 @@ + { + static const char module[] = "TIFFRasterScanlineSize"; + uint64 m; +- tmsize_t n; + m=TIFFRasterScanlineSize64(tif); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* vim: set ts=8 sts=8 sw=8 noet: */ +diff -ru tiff-4.0.10-orig/libtiff/tif_tile.c tiff-4.0.10/libtiff/tif_tile.c +--- tiff-4.0.10-orig/libtiff/tif_tile.c 2017-12-02 16:21:47.993972977 +0100 ++++ tiff-4.0.10/libtiff/tif_tile.c 2019-10-02 22:35:17.395184517 +0200 +@@ -181,15 +181,8 @@ + { + static const char module[] = "TIFFTileRowSize"; + uint64 m; +- tmsize_t n; + m=TIFFTileRowSize64(tif); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* +@@ -248,15 +241,8 @@ + { + static const char module[] = "TIFFVTileSize"; + uint64 m; +- tmsize_t n; + m=TIFFVTileSize64(tif,nrows); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* +@@ -272,15 +258,8 @@ + { + static const char module[] = "TIFFTileSize"; + uint64 m; +- tmsize_t n; + m=TIFFTileSize64(tif); +- n=(tmsize_t)m; +- if ((uint64)n!=m) +- { +- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow"); +- n=0; +- } +- return(n); ++ return _TIFFCastUInt64ToSSize(tif, m, module); + } + + /* diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 093d6a185443..c35923071b0b 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic"; }; + patches = [ + (fetchurl { + url = "https://gitlab.com/libtiff/libtiff/commit/0c74a9f49b8d7a36b17b54a7428b3526d20f88a8.patch"; + name = "CVE-2019-6128.patch"; + sha256 = "03yvsfq6dxjd3v8ypfwz6cpz2iymqwcbawqqlmkh40dayi7fgizr"; + }) + # Manual backport of https://gitlab.com/libtiff/libtiff/commit/1b5e3b6a23827c33acf19ad50ce5ce78f12b3773.patch + ./CVE-2019-14973.patch + ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ pkgconfig ]; From 63905a7b6f29f6c83e08dfffad514d80079d6d5f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 2 Oct 2019 21:56:40 +0200 Subject: [PATCH 443/467] gnupatch: rename patch files to match their CVE ids. This should be a behavior no-op, but it helps vulnix figure out that we are up to date regarding security patches. --- ...-13638.patch => CVE-2019-13638-and-CVE-2018-20969.patch} | 0 pkgs/tools/text/gnupatch/default.nix | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/tools/text/gnupatch/{CVE-2019-13638.patch => CVE-2019-13638-and-CVE-2018-20969.patch} (100%) diff --git a/pkgs/tools/text/gnupatch/CVE-2019-13638.patch b/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2019-13638.patch rename to pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index a046c5911157..b85d16ea4e92 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { name = "Allow_input_files_to_be_missing_for_ed-style_patches.patch"; sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64"; }) - (fetchurl { # CVE-2018-1000156 + (fetchurl { url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d; - name = "Fix_arbitrary_command_execution_in_ed-style_patches.patch"; + name = "CVE-2018-1000156.patch"; sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg"; }) # https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./CVE-2019-13636.patch # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0 - ./CVE-2019-13638.patch + ./CVE-2019-13638-and-CVE-2018-20969.patch ]; nativeBuildInputs = [ autoreconfHook ]; From 90a48bbfa95fdb7401e19eb0afb79943997b1822 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 Sep 2019 00:37:26 +0100 Subject: [PATCH 444/467] jbig2dec: 0.14 -> 0.16 --- pkgs/development/libraries/jbig2dec/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 04a165866faf..31c9c89d96fc 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, autoconf }: stdenv.mkDerivation rec { - name = "jbig2dec-0.14"; + name = "jbig2dec-0.16"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/${name}.tar.gz"; - sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/${name}.tar.gz"; + sha256 = "00h61y7bh3z6mqfzxyb318gyh0f8jwarg4hvlrm83rqps8avzxm4"; }; postPatch = '' patchShebangs test_jbig2dec.py ''; + buildInputs = [ autoconf ]; + checkInputs = [ python ]; - doCheck = false; # fails 1 of 4 tests + doCheck = true; meta = { homepage = https://www.jbig2dec.com/; From 6882778e26d7c9173de207897b9526780fa4fbf0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 Sep 2019 00:39:37 +0100 Subject: [PATCH 445/467] ghostscript: 9.26 -> 9.27 (security) --- pkgs/misc/ghostscript/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 5b80a5536259..60960ab789c5 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -10,8 +10,8 @@ assert cupsSupport -> cups != null; let version = "9.${ver_min}"; - ver_min = "26"; - sha512 = "0z2mvsh06qgnxl7p9isw7swg8jp8xcx3rnbqk727avw7ammvfh8785d2bn5i4fhz8y45ka3cpgp7b598m06yq5zawijhcnzkq187nrx"; + ver_min = "27"; + sha512 = "00m8pfvvg4dzvrzk66myr8kid76x44sgqk84m9562g4viv9zbw759l8q9qg64mgvbajzn78zpqfgdlgz9nwgcdb1vpwc08gm12ssrsy"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -47,21 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff - (fetchpatch { - name = "CVE-2019-6116"; - url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; - sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; - }) - (fetchpatch { - name = "CVE-2019-3839-part-1"; - url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=4ec9ca74bed49f2a82acb4bf430eae0d8b3b75c9"; - sha256 = "0gn1n9fq5msrxxzspidcnmykp1iv3yvx5485fddmgrslr52ngcf9"; - }) - (fetchpatch { - name = "CVE-2019-3839-part-2"; - url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=db24f253409d5d085c2760c814c3e1d3fa2dac59"; - sha256 = "1h6kpwc6ryr6jlxjr6bfnvmmf8x0kqmyjlx3hggqjs23n0wsr9p9"; - }) ]; outputs = [ "out" "man" "doc" ]; From 4bf03aa6168344ae5aded70ea0ed5378679c661a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 Sep 2019 00:40:04 +0100 Subject: [PATCH 446/467] ghostscript: add patches for CVE-2019-10216, CVE-2019-14811, CVE-2019-14812, CVE-2019-14813 and most of CVE-2019-14817 the latter's patch is only partially applied because it doesn't apply cleanly to 9.27, still the fixes that do apply work and are better than nothing --- pkgs/misc/ghostscript/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 60960ab789c5..ac410a229970 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -47,6 +47,24 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff + (fetchpatch { + name = "CVE-2019-10216.patch"; + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=5b85ddd19a8420a1bd2d5529325be35d78e94234"; + sha256 = "165svml4knq1xlysfvj7vc07h68bhv3rgvl83xrhxsxdzs1ign31"; + }) + (fetchpatch { + name = "CVE-2019-14811.CVE-2019-14812.CVE-2019-14813.patch"; + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=885444fcbe10dc42787ecb76686c8ee4dd33bf33"; + sha256 = "19928sr7xpx7iibk9gn127g0r1yv2lcfpwgk2ipzz4wgrs3f5j70"; + }) + (fetchpatch { + name = "CVE-2019-14817-partial.patch"; + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=cd1b1cacadac2479e291efe611979bdc1b3bdb19"; + # patch doesn't apply cleanly to all files, but at least partially applying it fixes + # *most* of the problematic sites. + excludes = ["Resource/Init/pdf_font.ps"]; + sha256 = "0f8qgdqpv7bldc9akvjj10af2h2876cvnz4q3nvg4a00rk5i05wn"; + }) ]; outputs = [ "out" "man" "doc" ]; From c4affdf92eb5706123ae24a0fd78c417747e2278 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 13:40:07 -0700 Subject: [PATCH 447/467] nspr: 4.21 -> 4.22 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nspr/versions --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index b62fa1cb704f..f5e4843a826e 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.21"; in +let version = "4.22"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm"; + sha256 = "0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69"; }; patches = [ From 24bfb5ba07831b3c5e484d5f0e775be21574930a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 09:29:04 -0700 Subject: [PATCH 448/467] libqmi: 1.22.6 -> 1.24.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libqmi/versions --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 4d365e5be367..6c78eb977c9c 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.22.6"; + version = "1.24.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1pnma62kib6zbs4wr7h5g53v3p81jb8cvyvqcvaidb1hlfibwnvm"; + sha256 = "0yccw97pqn8afy96k5ssk7qi6r3wjshcnxk14k77qikkqa89zdmf"; }; outputs = [ "out" "dev" "devdoc" ]; From 282f8d8c7390183d260b54ad43c19e118c75f10a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 08:50:43 -0700 Subject: [PATCH 449/467] libogg: 1.3.3 -> 1.3.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libogg/versions --- pkgs/development/libraries/libogg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 71a8e528771b..7b400918aa84 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libogg-1.3.3"; + name = "libogg-1.3.4"; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg"; + sha256 = "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1"; }; outputs = [ "out" "dev" "doc" ]; From eff7a160c229f2d93b41f5a9ef953d00cf582f75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 06:36:31 -0700 Subject: [PATCH 450/467] e2fsprogs: 1.45.3 -> 1.45.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/e2fsprogs/versions --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index ee3cce37bc7c..eb17e9fc60c3 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0gcqfnp9h7wgz1vq402kxd2w398vqaim26aq9i722v3lrgh5cm9s"; + sha256 = "0jsclghxfzj9qmdd3qqk0gdmkrgjv2gakf8qz9dba37qkj1nk776"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From ba8e6179d87790a58962d9831fb23f3c11f3abce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 18 Sep 2019 12:34:43 -0700 Subject: [PATCH 451/467] pythonPackages.certifi: 2019.6.16 -> 2019.9.11 --- pkgs/development/python-modules/certifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 935c0d600613..40e743285722 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.6.16"; + version = "2019.9.11"; src = fetchPypi { inherit pname version; - sha256 = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"; + sha256 = "0l0yw94ypd117bl7f0fx8sqw9wsnrpcsn92vr7nkxy54zq665wz4"; }; meta = { From 7f69e4f2e8905b59cf2661fbd5036ba53648ca16 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 3 Oct 2019 11:59:44 +0300 Subject: [PATCH 452/467] fribidi: 1.0.5 -> 1.0.7 --- pkgs/development/libraries/fribidi/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 9798347eaddf..859258f59565 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -10,23 +10,16 @@ stdenv.mkDerivation rec { pname = "fribidi"; - version = "1.0.5"; + version = "1.0.7"; outputs = [ "out" "devdoc" ]; - # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. + # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; + sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das"; }; - patches = [ - (fetchpatch { - url = "https://github.com/fribidi/fribidi/pull/88.patch"; - sha256 = "1n4l6333vhbxfckwg101flmvq6bbygg66fjp69ddcjqaqb6gh9k9"; - }) - ]; - postPatch = '' patchShebangs test ''; From 2d1a119ff8490a7274159cab786d54a93a934a82 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 2 Oct 2019 10:18:58 -0400 Subject: [PATCH 453/467] libglvnd: 1.0.0 -> 1.2.0 --- pkgs/development/libraries/libglvnd/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index b976c9c36b83..3d8272273a0b 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; + sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; @@ -32,17 +32,6 @@ stdenv.mkDerivation rec { # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; - # Upstream patch fixing use of libdl, should be in next release. - patches = [ - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; - sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch"; - sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2"; - }); outputs = [ "out" "dev" ]; # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. From 5b754c4a4ebe2871fcea6cf68e1782884297c976 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Aug 2019 14:28:01 -0500 Subject: [PATCH 454/467] libevdev: pname --- pkgs/development/libraries/libevdev/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index b0383b7f7428..ac6515fc40d2 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.7.0"; + pname = "libevdev"; + version = "1.7.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "0sg3lbjn68qaq3yz2k735h29kaf3fmx7b5m1x7rm2fnhn7rf3nqi"; }; From 34b3a314ca28b4f905bd1e4a21f2e59a83c78319 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Aug 2019 14:28:52 -0500 Subject: [PATCH 455/467] libevdev: 1.7.0 -> 1.8.0 --- pkgs/development/libraries/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index ac6515fc40d2..47d99f3d6c60 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sg3lbjn68qaq3yz2k735h29kaf3fmx7b5m1x7rm2fnhn7rf3nqi"; + sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0"; }; buildInputs = [ python ]; From 762a88d78ba510c63d6aaf073fc553502b8cd9d0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Oct 2019 03:03:49 -0500 Subject: [PATCH 456/467] recode: 3.7-gitrev -> 3.7.4, new home (#68045) * recode: pname-ify * recode: 3.7-* -> 3.7.2, new home gnu homepage still exists (for now), but links to the github repo we switch to :). * recode: use pre-generated tarball to avoid gen, fix * recode: 3.7.2 -> 3.7.4 https://github.com/rrthomas/recode/blob/v3.7.4/NEWS (3.7.3 notes as well) --- pkgs/tools/text/recode/default.nix | 34 ++++++++++-------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 3437400269c3..cb9e1a84a40e 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,34 +1,22 @@ -{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook -, texinfo, libiconv, libintl }: +{ stdenv, fetchurl, python, perl, intltool, flex, texinfo, libiconv, libintl }: -stdenv.mkDerivation { - name = "recode-3.7-2fd838565"; +stdenv.mkDerivation rec { + pname = "recode"; + version = "3.7.4"; - src = fetchFromGitHub { - owner = "pinard"; - repo = "Recode"; - rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd"; - sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; + # Use official tarball, avoid need to bootstrap/generate build system + src = fetchurl { + url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "0j9rjkgx4r8nah90d2vbi92k33gfmgaqlj72z1ni0vsiccpcgfc8"; }; - nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; + nativeBuildInputs = [ python python.pkgs.cython perl intltool flex texinfo libiconv ]; buildInputs = [ libintl ]; - preAutoreconf = '' - # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 - substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" "" - sed -i '/^AM_C_PROTOTYPES/d' configure.ac - substituteInPlace src/Makefile.am --replace "ansi2knr" "" - ''; - - doCheck = false; # fails 10 out of 16 tests - - preCheck = '' - checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs") - ''; + doCheck = true; meta = { - homepage = https://www.gnu.org/software/recode/; + homepage = https://github.com/rrthomas/recode; description = "Converts files between various character sets and usages"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; From c307ed817023086e278060c26f13ea57825472c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 20:28:50 -0700 Subject: [PATCH 457/467] go: 1.13.1 -> 1.13.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/go/versions --- pkgs/development/compilers/go/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index d0aeac135225..95c51e2e880b 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.1"; + version = "1.13.3"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0n4k42bbrj5g9b1kczkfsih049v43vqzaps7n69gmfa4jpk59wc1"; + sha256 = "1pz3423gw3z2zwcmk9l2c6v68w5is39gndq7502c9mbm8c226wag"; }; # perl is used for testing go vet From 12fd773ff058755237ebafe5f1c0bdd36f385eb6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 13 Aug 2019 17:57:46 -0700 Subject: [PATCH 458/467] bash-completion: 2.8 -> 2.9 --- pkgs/shells/bash/bash-completion/default.nix | 31 ++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 0476cbd1f3f7..d544114d2103 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,15 +1,36 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, python3Packages +, bashInteractive +}: stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.8"; + version = "2.9"; - src = fetchurl { - url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0"; + src = fetchFromGitHub { + owner = "scop"; + repo = "bash-completion"; + rev = version; + sha256 = "1813r4jxfa2zgzm2ppjhrq62flfmxai8433pklxcrl4fp5wwx9yv"; }; + nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; + checkInputs = [ + python3Packages.pexpect + python3Packages.pytest + bashInteractive + ]; + + # ignore ip_addresses because it tries to touch network + # ignore test_ls because impure logic + checkPhase = '' + pytest . \ + --ignore=test/t/unit/test_unit_ip_addresses.py \ + --ignore=test/t/test_ls.py + ''; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* From 4ca7e3d75f72d901667d18c491df213ee18126ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 22 Oct 2019 14:38:03 +0200 Subject: [PATCH 459/467] python.pkgs.sqlalchemy: support sqlite 3.30 --- .../python-modules/sqlalchemy/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index f1c570d34f94..e9e14b7da4d8 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,7 +1,8 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 , mock , pysqlite -, pytest +, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { @@ -14,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ - pytest + pytestCheckHook mock ] ++ lib.optional (!isPy3k) pysqlite; @@ -22,11 +23,23 @@ buildPythonPackage rec { sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; - checkPhase = if isPy35 then '' - pytest test -k 'not exception_persistent_flush_py3k' - '' else '' - pytest test - ''; + dontUseSetuptoolsCheck = true; + + disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]; + + patches = [ + # Two patches for sqlite 3.30 compatibility. + # https://github.com/sqlalchemy/sqlalchemy/pull/4921 + (fetchpatch { + url = https://github.com/sqlalchemy/sqlalchemy/commit/8b35ba54ab31aab13a34c360a31d014da1f5c809.patch; + sha256 = "065csr6pd7j1fjnv72wbz8s6xhydi5f161gj7nyqq86rxkh0nl0n"; + }) + (fetchpatch { + url = https://github.com/sqlalchemy/sqlalchemy/commit/e18534a9045786efdaf4963515222838c62e0300.patch; + sha256 = "0bwfwp5gmgg12qilvwdd2a5xi76bllzzapb23ybh1k34c5pla195"; + }) + + ]; meta = with lib; { homepage = http://www.sqlalchemy.org/; From f1d46d094a19e57dd0b20193ace5a51479285a3c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 22 Oct 2019 21:36:09 +0200 Subject: [PATCH 460/467] home-assistant: Fix the build after baf54943305 --- pkgs/servers/home-assistant/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f8eeb97849ad..ee07ff8ad463 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6 +{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -9,7 +9,16 @@ # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } # Applied after defaultOverrides -, packageOverrides ? self: super: { } +, packageOverrides ? self: super: { + # TODO: Remove this override after updating to cryptography 2.8: + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.asn1crypto ]; + patches = [ (fetchpatch { + url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch"; + sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp"; + }) ]; + }); +} # Skip pip install of required packages on startup , skipPip ? true }: @@ -30,7 +39,7 @@ let "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42") (mkOverride "pyjwt" "1.7.1" "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96") - (mkOverride "cryptography" "2.7" + (mkOverride "cryptography" "2.7" # TODO for 2.8: Remove the override above "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6") (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7 "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc") From 548b707584b350842e27e3ba4c8f751823721ccb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 22 Oct 2019 15:43:25 -0700 Subject: [PATCH 461/467] mesa: fix build latest versions (>=19.1.0), no longer need to delete {,e}gl.pc after install --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8b61dd535e60..caeb8dba8a63 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation { substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" # remove pkgconfig files for GL/EGL; they are provided by libGL. - rm $dev/lib/pkgconfig/{gl,egl}.pc + rm -f $dev/lib/pkgconfig/{gl,egl}.pc # Update search path used by pkg-config for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do From 061c6b80240e1ff4157e8964154e45c7258cf057 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 22 Oct 2019 15:17:14 +0200 Subject: [PATCH 462/467] bash-completion: do not change pkgconfig behaviour, fixes #71662 Since 2.9 bash-completion hardcodes paths in pkgconfig file. We want to be able to override certain paths, so this commit restores the original behaviour. https://github.com/NixOS/nixpkgs/issues/71662 --- ...cmake-pc-and-profile-variable-replac.patch | 86 +++++++++++++++++++ pkgs/shells/bash/bash-completion/default.nix | 4 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch diff --git a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch b/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch new file mode 100644 index 000000000000..c0d94a1a76d9 --- /dev/null +++ b/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch @@ -0,0 +1,86 @@ +From 398f44b4ed545fc1b6c13a057bf0900001f7958b Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Tue, 22 Oct 2019 15:07:05 +0200 +Subject: [PATCH] Revert "build: Do cmake, pc, and profile variable + replacements in Makefile" + +This reverts commit 81ba2c7e7dfbaefbafa1e8615727c9612e5fb314. +--- + Makefile.am | 12 ++++++++---- + bash-completion-config.cmake.in | 4 ++-- + bash-completion.pc.in | 4 ++-- + configure.ac | 3 +++ + 4 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 8f441185..53979529 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,8 +23,7 @@ cmakeconfig_DATA = bash-completion-config.cmake \ + -e 's|@VERSION[@]|$(VERSION)|' \ + <$(srcdir)/$@.in >$@ + +-CLEANFILES = bash_completion.sh bash-completion.pc \ +- bash-completion-config.cmake bash-completion-config-version.cmake ++CLEANFILES = bash_completion.sh bash-completion.pc + + EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ + .editorconfig README.md CONTRIBUTING.md pyproject.toml .perltidyrc \ +@@ -34,6 +33,11 @@ EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ + install-data-hook: + tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ + $(SED) -e 's|-/etc/bash_completion\.d|-$(compatdir)|' \ +- $(DESTDIR)$(pkgdatadir)/bash_completion >$$tmpfile && \ +- cat $$tmpfile >$(DESTDIR)$(pkgdatadir)/bash_completion && \ ++ $(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \ ++ cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \ ++ $(SED) -e 's|\$${prefix}|$(prefix)|' \ ++ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake \ ++ > $$tmpfile && \ ++ cat $$tmpfile > \ ++ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake && \ + rm $$tmpfile +diff --git a/bash-completion-config.cmake.in b/bash-completion-config.cmake.in +index d907b76c..ccc6e052 100644 +--- a/bash-completion-config.cmake.in ++++ b/bash-completion-config.cmake.in +@@ -5,7 +5,7 @@ set (BASH_COMPLETION_VERSION "@VERSION@") + + set (BASH_COMPLETION_PREFIX "@prefix@") + set (BASH_COMPLETION_COMPATDIR "@compatdir@") +-set (BASH_COMPLETION_COMPLETIONSDIR "@pkgdatadir@/completions") +-set (BASH_COMPLETION_HELPERSDIR "@pkgdatadir@/helpers") ++set (BASH_COMPLETION_COMPLETIONSDIR "@datarootdir@/@PACKAGE@/completions") ++set (BASH_COMPLETION_HELPERSDIR "@datarootdir@/@PACKAGE@/helpers") + + set (BASH_COMPLETION_FOUND "TRUE") +diff --git a/bash-completion.pc.in b/bash-completion.pc.in +index ea03fd75..bde217db 100644 +--- a/bash-completion.pc.in ++++ b/bash-completion.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + compatdir=@compatdir@ +-completionsdir=@pkgdatadir@/completions +-helpersdir=@pkgdatadir@/helpers ++completionsdir=@datarootdir@/@PACKAGE@/completions ++helpersdir=@datarootdir@/@PACKAGE@/helpers + + Name: bash-completion + Description: programmable completion for the bash shell +diff --git a/configure.ac b/configure.ac +index 1f3b37e8..a216d9b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,5 +13,8 @@ helpers/Makefile + test/Makefile + test/t/Makefile + test/t/unit/Makefile ++bash-completion.pc ++bash-completion-config.cmake ++bash-completion-config-version.cmake + ]) + AC_OUTPUT +-- +2.21.0 + diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index d544114d2103..562562df460c 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { bashInteractive ]; + patches = [ + ./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch + ]; + # ignore ip_addresses because it tries to touch network # ignore test_ls because impure logic checkPhase = '' From 120b6b06dfa860ed2d4412396679a1f3559fa76b Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 22 Oct 2019 21:28:15 +0200 Subject: [PATCH 463/467] pythonPackages.apsw: 3.22.0-r1 -> 3.29.0-r1 + sqlite fix Bumping version of apsw to be able to backport an upstream fix for SQLite >= 3.30.0 which fixes a failing test. --- pkgs/development/python-modules/apsw/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index fb22128b9288..9169b0d9ec3b 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch , sqlite, isPyPy }: buildPythonPackage rec { pname = "apsw"; - version = "3.22.0-r1"; + version = "3.29.0-r1"; disabled = isPyPy; @@ -11,11 +11,19 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak"; + sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb"; }; buildInputs = [ sqlite ]; + patches = [ + # Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275 + (fetchpatch { + url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff"; + sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv"; + }) + ]; + meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = https://github.com/rogerbinns/apsw; From e70c0170df4c8822825ed09feb53dacf22f0d14c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 11:26:47 +0200 Subject: [PATCH 464/467] python.pkgs.twisted: move twisted cache generation to postFixup The Python 2 build of twisted would fail when generating the cache. This failure started occuring since the change was introduced that builds setuptools as a wheel instead of as an egg, 90be4c2c7875c9487508d95b5c638d97e2903ada. Turns out moving this step to postFixup solves the issue. I suppose it is related to the order of site packages being evaluated, where PYTHONPATH introduced additional ones. --- pkgs/development/python-modules/twisted/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 1c91dfc2b48f..3b2c393b35b3 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -41,7 +41,9 @@ buildPythonPackage rec { # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for # details. - postInstall = "$out/bin/twistd --help > /dev/null"; + postFixup = '' + $out/bin/twistd --help > /dev/null + ''; checkPhase = '' ${python.interpreter} -m unittest discover -s twisted/test From 767c0b74feb6a2f26ec302405eaf5b044cccaa6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 12:49:45 +0200 Subject: [PATCH 465/467] Revert "pythonPackages.twisted: disable python2" Builds fine now. This reverts commit a1a8c96d8f0d05cb6824a34e2b42c254a825c930. --- pkgs/development/python-modules/twisted/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 3b2c393b35b3..a87cacdc29e2 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , python -, isPy27 , zope_interface , incremental , automat @@ -18,7 +17,6 @@ buildPythonPackage rec { pname = "Twisted"; version = "19.7.0"; - disabled = isPy27; # ruamel namespace now conflicts in python27 src = fetchPypi { inherit pname version; From af491cbb7d691b487bb9058338329913eac7d331 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 15:54:07 +0200 Subject: [PATCH 466/467] openssl: use old method for configuring on i686, fixes #71786 unbreaks pkgsi686Linux.openssl_1_0_2 --- pkgs/development/libraries/openssl/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7a1ef5574696..3ff156b9d2b1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -46,7 +46,6 @@ let configureScript = { armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; - i686-linux = "./Configure linux-x86"; x86_64-darwin = "./Configure darwin64-x86_64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; From 4a979b88718da624dae3b3a35bf9f8527fb22a7c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 16:40:51 +0200 Subject: [PATCH 467/467] python2Packages.notebook: restore as it is a dependency of sage. --- .../development/python-modules/notebook/2.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 +- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/notebook/2.nix diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix new file mode 100644 index 000000000000..d081a5a92fbe --- /dev/null +++ b/pkgs/development/python-modules/notebook/2.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, nose +, nose_warnings_filters +, glibcLocales +, isPy3k +, mock +, jinja2 +, tornado +, ipython_genutils +, traitlets +, jupyter_core +, jupyter_client +, nbformat +, nbconvert +, ipykernel +, terminado +, requests +, send2trash +, pexpect +, prometheus_client +}: + +buildPythonPackage rec { + pname = "notebook"; + version = "5.7.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; + }; + + LC_ALL = "en_US.utf8"; + + checkInputs = [ nose glibcLocales ] + ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); + + propagatedBuildInputs = [ + jinja2 tornado ipython_genutils traitlets jupyter_core send2trash + jupyter_client nbformat nbconvert ipykernel terminado requests pexpect + prometheus_client + ]; + + # disable warning_filters + preCheck = lib.optionalString (!isPy3k) '' + echo "" > setup.cfg + ''; + + postPatch = '' + # Remove selenium tests + rm -rf notebook/tests/selenium + + ''; + + checkPhase = '' + runHook preCheck + mkdir tmp + HOME=tmp nosetests -v ${if (stdenv.isDarwin) then '' + --exclude test_delete \ + --exclude test_checkpoints_follow_file + '' + else ""} + ''; + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + + meta = { + description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; + homepage = https://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fa03173ce1f..77c8c59373a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4015,7 +4015,8 @@ in { nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; - notebook = callPackage ../development/python-modules/notebook { }; + notebook = if isPy3k then callPackage ../development/python-modules/notebook { } + else callPackage ../development/python-modules/notebook/2.nix { }; notify = callPackage ../development/python-modules/notify { };