From 14cbd4d17a0c34f5f7d35b87edb82895db5a8f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 16 May 2018 22:57:45 -0300 Subject: [PATCH 001/362] xkeyboard-config: enable xkb rules symlink --- pkgs/servers/x11/xorg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07faa8d3cc7e..228c32a1fbb6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2476,6 +2476,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; + configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; From 0de0ce58939932aee786679a86d08b5227732fab Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 8 Jul 2018 15:59:57 +0000 Subject: [PATCH 002/362] substitute(): --subst-var was silently coercing to "" if the variable does not exist. --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 87465df1482a..19dbdf8848e0 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -661,6 +661,10 @@ substituteStream() { echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 return 1 fi + if [ -z ${!varName+x} ]; then + echo "substituteStream(): ERROR: variable \$$varName is unset" >&2 + return 1 + fi pattern="@$varName@" replacement="${!varName}" ;; From 2badf9a6f88e5620f428b55f3bdedfe041ebf76c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 30 Mar 2018 00:01:00 +0000 Subject: [PATCH 003/362] libffi: simplify using `checkInputs` --- pkgs/development/libraries/libffi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1c7c0715e75b..c35448066eea 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false +{ stdenv, fetchurl, fetchpatch , buildPlatform, hostPlatform, autoreconfHook +, doCheck ? true, dejagnu }: stdenv.mkDerivation rec { @@ -40,8 +41,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "info" ]; - buildInputs = stdenv.lib.optional doCheck dejagnu; - nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; configureFlags = [ @@ -54,6 +53,8 @@ stdenv.mkDerivation rec { NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} ''; + checkInputs = [ dejagnu ]; + inherit doCheck; dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. From acbee90e2becd4aa90412094df55c7a629da1435 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 30 Mar 2018 00:01:53 +0000 Subject: [PATCH 004/362] pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- pkgs/top-level/python-packages.nix | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index d5ee59ac2d92..83e369ec0fcd 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; }; - checkInputs = [ pytest pytest_xdist flaky mock ]; propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; + checkInputs = [ pytest pytest_xdist flaky mock ]; inherit doCheck; # https://github.com/DRMacIver/hypothesis/issues/300 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de4966ec9539..fd62c3adb949 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,11 +1923,8 @@ in { pytest = self.pytest_36; pytest_36 = callPackage ../development/python-modules/pytest { - hypothesis = self.hypothesis.override { - # hypothesis requires pytest that causes dependency cycle - doCheck = false; - pytest = null; - }; + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; }; # Needed for celery From 429d9988a3397e69505dbc432c758728cf0483a1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 20:23:32 -0500 Subject: [PATCH 005/362] utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9ec6c22d32a5..5290c398b2f0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,14 +5,14 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.32"; - patchVersion = ""; + patchVersion = "1"; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc"; + sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6"; }; patches = [ From 583bd3aeb657101379afb88f42a0ebaafc67ff9a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 20:34:12 -0500 Subject: [PATCH 006/362] busybox: 1.29.0 -> 1.29.1 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 06a2d4301596..e9f5f127dd39 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.0"; + name = "busybox-1.29.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8"; + sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From d6a9a93a6243ee42cf63b7c8dfcfb6fb1f0a9c9c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 21:00:30 -0500 Subject: [PATCH 007/362] bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ff99f7a7cbf6..f72ec76cc649 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.1-P2"; in +let version = "9.12.2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd"; + sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 6075fa8d0c71549821d2a110b84b834048a880a8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 13 Jul 2018 12:14:03 -0500 Subject: [PATCH 008/362] curl: 7.60.0 -> 7.61.0 --- pkgs/tools/networking/curl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 2ebae0b0c17f..06798bdcc281 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.60.0"; + name = "curl-7.61.0"; src = fetchurl { urls = [ - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" "https://curl.haxx.se/download/${name}.tar.bz2" + "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9"; + sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From a96380527f5fdf4ae9db48d19f8db188f5569fe4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 25 May 2018 23:51:04 +0000 Subject: [PATCH 009/362] mdds: fix tests --- pkgs/development/libraries/mdds/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 90d86ea9165c..43fee9ccead8 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, boost }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + checkInputs = [ boost ]; + meta = { inherit version; homepage = https://gitlab.com/mdds/mdds; From a3aedd137260f7ec67831c725e12fa80a940e1da Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 29 May 2018 02:32:26 +0000 Subject: [PATCH 010/362] git: disable checks as tests are run in installcheck --- .../version-management/git-and-tools/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 522a6fcd6a12..cb8d6a09503f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -238,6 +238,7 @@ EOF ## InstallCheck + doCheck = false; doInstallCheck = true; installCheckTarget = "test"; From 4d93021846cd04619c280d6fc9753ffc2c480514 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:26:31 +0000 Subject: [PATCH 011/362] libcommuni: disable checks as tests are run in installcheck --- pkgs/development/libraries/libcommuni/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 0788236b6017..f247c48821f7 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { # The tests fail on darwin because of install_name if they run # before the frameworks are installed. + doCheck = false; doInstallCheck = true; installCheckTarget = "check"; From 33a6533c120c113bca304816a09d8832b829fa44 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:05:51 +0000 Subject: [PATCH 012/362] gvfs: make tests run, but disable --- pkgs/development/libraries/gvfs/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4f3bc64b5d40..7ac5b8756335 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -4,7 +4,7 @@ , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata +, libsecret, libgdata, python3 # Remove when switching back to meson , autoreconfHook, lzma, bzip2 }: @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; }; + postPatch = '' + patchShebangs test test-driver + ''; + # Uncomment when switching back to meson # postPatch = '' # chmod +x meson_post_install.py # patchShebangs requires executable file @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + checkInputs = [ python3 ]; + doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" + doInstallCheck = doCheck; + preFixup = '' for f in $out/libexec/*; do wrapProgram $f \ From d9c1aa465a8431685767ce57724de492376d2b52 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:34:04 +0000 Subject: [PATCH 013/362] librdf: make tests run, but disable --- pkgs/development/libraries/librdf/rasqal.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 07f560fe2724..124fd0178182 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: +{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { postInstall = "rm -rvf $out/share/gtk-doc"; + checkInputs = [ perl ]; + doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..." + doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)" + meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = http://librdf.org/rasqal; From 02acff883991e6a1275a04c9838e72bcc5b17120 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:34:34 +0000 Subject: [PATCH 014/362] neon, neon_0_29: make tests run, but disable --- pkgs/development/libraries/neon/0.29.nix | 5 ++++- pkgs/development/libraries/neon/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 10 ++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index e393d50bf9d2..dbde83c2d94b 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 2351e3b0800b..9c2a3265491a 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e815305b539e..0c86f1ed12b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11068,15 +11068,9 @@ with pkgs; neardal = callPackage ../development/libraries/neardal { }; - neon = callPackage ../development/libraries/neon { - compressionSupport = true; - sslSupport = true; - }; + neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - compressionSupport = true; - sslSupport = true; - }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { }; nettle = callPackage ../development/libraries/nettle { }; From f7a6ea6fa6265304d6a94b9607d611da4d25bbb2 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:06:49 +0000 Subject: [PATCH 015/362] ilmbase: disable tests on i686. Spooky! --- pkgs/development/libraries/ilmbase/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 956a8667be5f..156b4f72749a 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { patches = [ ./bootstrap.patch ]; + # fails 1 out of 1 tests with + # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" + # at least on i686. spooky! + doCheck = stdenv.isx86_64; + meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; From 589d05cd09bda981e22283315bbdf0649917b704 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 29 May 2018 02:32:55 +0000 Subject: [PATCH 016/362] ruby: disable tests --- pkgs/development/interpreters/ruby/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 89d394c87569..bd27041ba2d2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -135,6 +135,11 @@ let ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; + # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips" + # mostly TZ- and patch-related tests + # TZ- failures are caused by nix sandboxing, I didn't investigate others + doCheck = false; + preInstall = '' # Ruby installs gems here itself now. mkdir -pv "$out/${passthru.gemPath}" From 7098b0fcdfd7fa4b82c036d8116b60b78f497316 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 May 2018 19:13:10 +0200 Subject: [PATCH 017/362] nixos/switch-to-configuration: Never stop system.slice Problem: Restarting (stopping) system.slice would not only stop X11 but also most system units/services. We obviously don't want this happening to users when they switch from 18.03 to 18.09 or nixos-unstable. Reason: The following change in systemd: https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798 The commit adds system.slice to the perpetual units, which means removing the unit file and adding it to the source code. This is done so that system.slice can't be stopped anymore but in our case it ironically would cause this script to stop system.slice because the unit file was removed (and an older systemd version is still running). Related issue: https://github.com/NixOS/nixpkgs/issues/39791 --- .../activation/switch-to-configuration.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 2ce04ed5342c..ecd35767e01d 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -166,6 +166,24 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { + # Ignore (i.e. never stop) these units: + if ($unit eq "system.slice") { + # TODO: This can be removed a few months after 18.09 is out + # (i.e. after everyone switched away from 18.03). + # Problem: Restarting (stopping) system.slice would not only + # stop X11 but also most system units/services. We obviously + # don't want this happening to users when they switch from 18.03 + # to 18.09 or nixos-unstable. + # Reason: The following change in systemd: + # https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798 + # The commit adds system.slice to the perpetual units, which + # means removing the unit file and adding it to the source code. + # This is done so that system.slice can't be stopped anymore but + # in our case it ironically would cause this script to stop + # system.slice because the unit was removed (and an older + # systemd version is still running). + next; + } my $unitInfo = parseUnit($prevUnitFile); $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes"); } From 05df6d4f6232be5cf5586f2e89d053ec582eeec6 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 17 Jul 2018 15:19:26 +0200 Subject: [PATCH 018/362] goBuildPackage: Add -x to the go build command if NIX_DEBUG >= 1 The -x go option prints all intermediate commands used by the Go compiler. For instance, this is pretty useful to debug Go LD_FLAGS because the used linker command is printed. --- pkgs/development/go-modules/generic/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index bd047da4c919..621ab1f18f9f 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -151,6 +151,10 @@ go.stdenv.mkDerivation ( fi } + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then declare -p buildFlagsArray > $TMPDIR/buildFlagsArray else From 3d1a59a0b5a1b04747f5f57b9df34c465bd5a6d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Jul 2018 08:39:39 -0700 Subject: [PATCH 019/362] pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0ee17ffcc38b..1762b98984f7 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.6.0"; # with database from 2018-06-29 + name = "pciutils-3.6.1"; # with database from 2018-06-29 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j"; + sha256 = "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w"; }; nativeBuildInputs = [ pkgconfig ]; From 06de6dc71b6d676884d0d0baaa7d9f1475c41bce Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 18 Jul 2018 09:41:21 -0500 Subject: [PATCH 020/362] mesa: more include fixes mostly from void-linux (thanks!) --- pkgs/development/libraries/mesa/default.nix | 2 +- .../libraries/mesa/missing-include.patch | 11 ---- .../libraries/mesa/missing-includes.patch | 55 +++++++++++++++++++ 3 files changed, 56 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/missing-include.patch create mode 100644 pkgs/development/libraries/mesa/missing-includes.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d4908..62a31161d64f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -92,7 +92,7 @@ let self = stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch deleted file mode 100644 index dd3e6bb64af8..000000000000 --- a/pkgs/development/libraries/mesa/missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch new file mode 100644 index 000000000000..feb6ffe428c0 --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -0,0 +1,55 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include ++ + #define MAXTHREADS 1 + + struct threadpool { +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include + #include + #else +--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include "util/u_atomic.h" + #include "util/list.h" + +--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +@@ -28,6 +28,8 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include ++ + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h" From 488d42b0d255bba147885b13d18385254abd3797 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 17 Jul 2018 22:51:26 -0500 Subject: [PATCH 021/362] npth: 1.5 -> 1.6 minor bump --- pkgs/development/libraries/npth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 203be8b6907b..c02998184fc5 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.5"; + name = "npth-1.6"; src = fetchurl { url = "mirror://gnupg/npth/${name}.tar.bz2"; - sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; + sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk"; }; doCheck = true; From ce408e8e75707f6e09ee0bd839127b8de3a1db45 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 10 Jul 2018 21:14:42 -0500 Subject: [PATCH 022/362] boost167: Add lockfree next_prior patch --- pkgs/development/libraries/boost/1.67.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 8b9e7ccca7f1..150272df6ca3 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,8 +1,14 @@ -{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args: +{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.67_0"; + patches = [ (fetchpatch { + url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch"; + sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; + stripLen = 1; + })]; + src = fetchurl { url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_66_0.html From 93c34c76163610ce60c4f0bc9278034205a01ddb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 15 Jul 2018 10:33:23 +0200 Subject: [PATCH 023/362] stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. --- .../interpreters/python/cpython/2.7/boot.nix | 2 +- pkgs/stdenv/darwin/default.nix | 36 +++++++++++++------ pkgs/top-level/all-packages.nix | 7 ---- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 79aa85def3c1..66f358e4b95b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, CF, configd, coreutils }: +{ stdenv, fetchurl, configd, CF, coreutils }: with stdenv.lib; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 366be3915802..b7b3640a9535 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -188,7 +188,18 @@ in rec { }; stage1 = prevStage: let - persistent = _: super: { python = super.python.override { configd = null; }; }; + persistent = self: super: with prevStage; { + cmake = super.cmake.override { + majorVersion = "3.9"; # FIXME: update ApplicationServices patch + isBootstrap = true; + useSharedLibraries = false; + }; + + python = super.callPackage ../../development/interpreters/python/cpython/2.7/boot.nix { + CF = null; # use CoreFoundation from bootstrap-tools + configd = null; + }; + }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraNativeBuildInputs = []; @@ -239,6 +250,9 @@ in rec { openssh sqlite sed serf openldap db cyrus-sasl expat apr-util findfreetype libssh curl cmake autoconf automake libtool cpio; + # Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds. + libxml2 = super.libxml2.override { pythonSupport = false; }; + llvmPackages_5 = super.llvmPackages_5 // (let libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) libcxx libcxxabi; @@ -281,6 +295,15 @@ in rec { ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; + # Hack to make sure we don't link ncurses in bootstrap tools. The proper + # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, + # quite a sledgehammer just to get the C runtime. + gettext = super.gettext.overrideAttrs (drv: { + configureFlags = drv.configureFlags ++ [ + "--disable-curses" + ]; + }); + llvmPackages_5 = super.llvmPackages_5 // (let tools = super.llvmPackages_5.tools.extend (llvmSelf: _: { inherit (llvmPackages_5) llvm clang-unwrapped; @@ -303,16 +326,7 @@ in rec { extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - overrides = lib.composeExtensions persistent (self: super: { - # Hack to make sure we don't link ncurses in bootstrap tools. The proper - # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, - # quite a sledgehammer just to get the C runtime. - gettext = super.gettext.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - "--disable-curses" - ]; - }); - }); + overrides = persistent; }; stdenvDarwin = prevStage: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8c41b9975da..507080514acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6873,13 +6873,6 @@ with pkgs; inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.isDarwin && hostPlatform == buildPlatform) { - cmake = buildPackages.cmake.override { - isBootstrap = true; - majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found - }; - libxml2 = libxml2.override { pythonSupport = false; }; - python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); From 182b7f63af2635dbdf168238bf89c630a2110637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 21 Jul 2018 21:45:48 +0900 Subject: [PATCH 024/362] matrix-synapse: 0.31.2 -> 0.33.0 --- pkgs/servers/matrix-synapse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d55932..10c2ae8b10e5 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.31.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q"; + sha256 = "1immk6k0wgiks1s39dhyjg79n6rgans9zy85r5wmkp4dlc3r5rx6"; }; patches = [ @@ -45,7 +45,7 @@ in pythonPackages.buildPythonApplication rec { signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack-python lxml matrix-synapse-ldap3 - phonenumbers jsonschema affinity bcrypt + phonenumbers jsonschema affinity bcrypt sortedcontainers ]; # Checks fail because of Tox. @@ -59,6 +59,6 @@ in pythonPackages.buildPythonApplication rec { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = [ maintainers.ralith maintainers.roblabla ]; + maintainers = with maintainers; [ ralith roblabla ekleog ]; }; } From 0262431889319d92ffd926cee79e00b00d85219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Jul 2018 20:46:42 +0200 Subject: [PATCH 025/362] Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7. Patching should no longer be needed with 3.6.1. --- pkgs/tools/system/pciutils/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index db4376affba1..1762b98984f7 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -22,16 +22,6 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; - # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path). - # This is documented to be equivalent, see `man 3 canonicalize_file_name`. - # Fixes w/musl. - # Upstream PR: https://github.com/pciutils/pciutils/pull/6 - postPatch = '' - substituteInPlace lib/sysfs.c \ - --replace "canonicalize_file_name(path)" \ - "realpath(path, NULL)" - ''; - # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; From 24596d7a4a4b07bd9ce3ad748b8dabf5957003c5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 21 Jul 2018 16:22:17 +0300 Subject: [PATCH 026/362] binutils-wrapper: Try to avoid adding unnecessary -L flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar --- pkgs/build-support/bintools-wrapper/setup-hook.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 025f6aa6e7aa..f65b792485a0 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -20,7 +20,13 @@ bintoolsWrapper_addLDVars () { fi if [[ -d "$1/lib" ]]; then - export NIX_${role_pre}LDFLAGS+=" -L$1/lib" + # Don't add the /lib directory if it actually doesn't contain any libraries. For instance, + # Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or + # $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary + # directories and bloats the size of the environment variable space. + if [[ -n "$(echo $1/lib/lib*)" ]]; then + export NIX_${role_pre}LDFLAGS+=" -L$1/lib" + fi fi } From dc9018dfa29a7df50e4ad51c60db5bf2e5cd980b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 21 Jul 2018 17:36:22 -0400 Subject: [PATCH 027/362] libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. --- pkgs/development/libraries/libffi/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index c35448066eea..6f1aeefa6758 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, fetchpatch , buildPlatform, hostPlatform, autoreconfHook -, doCheck ? true, dejagnu + +# libffi is used in darwin stdenv +# we cannot run checks within it +, doCheck ? !stdenv.isDarwin, dejagnu }: stdenv.mkDerivation rec { From 983abe10e2faaeea42dfc811043621fb65cd8b0b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Jul 2018 21:20:01 +0000 Subject: [PATCH 028/362] "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook --- pkgs/applications/editors/geany/default.nix | 8 ++------ pkgs/applications/graphics/dia/default.nix | 10 ++-------- pkgs/applications/graphics/glabels/default.nix | 5 ++--- pkgs/applications/graphics/inkscape/default.nix | 10 ++++------ .../networking/newsreaders/liferea/default.nix | 5 ++--- .../networking/p2p/transmission/default.nix | 9 +++------ pkgs/applications/office/gnucash/2.4.nix | 5 ++--- pkgs/applications/office/gnucash/2.6.nix | 6 ++---- pkgs/applications/video/handbrake/default.nix | 7 +------ pkgs/desktops/xfce/applications/orage.nix | 5 +---- pkgs/desktops/xfce/applications/xfce4-notifyd.nix | 5 ++--- pkgs/desktops/xfce/core/thunar-build.nix | 5 ++--- pkgs/desktops/xfce/core/thunar-volman.nix | 5 ++--- .../xfce/panel-plugins/xfce4-battery-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-clipman-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-cpufreq-plugin.nix | 6 ++---- .../xfce/panel-plugins/xfce4-cpugraph-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-netload-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-pulseaudio-plugin.nix | 6 ++---- .../xfce/panel-plugins/xfce4-weather-plugin.nix | 6 ++---- pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 5 ++--- pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix | 6 ++---- 22 files changed, 45 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 799f58e5b68c..ed77e6f4b471 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool libintl ]; - buildInputs = [ gtk2 which file ]; + buildInputs = [ gtk2 which file hicolor-icon-theme ]; doCheck = true; @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs ."; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { description = "Small and lightweight IDE"; longDescription = '' diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index ef63cb97a735..949dce7132be 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, +libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] + libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 2d4fa882dd61..c9d758e7bab8 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig, which, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { barcode gtk3 gtk-doc gnome3.yelp-tools gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool - + hicolor-icon-theme ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" wrapProgram "$out/bin/glabels-3" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 639f1928f8a4..935af0cfc88c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,7 +2,7 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme }: let @@ -44,15 +44,13 @@ stdenv.mkDerivation rec { libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + libvisio libcdr libexif potrace hicolor-icon-theme ]; enableParallelBuilding = true; - postInstall = '' - # Make sure PyXML modules can be found at run-time. - rm -f "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Make sure PyXML modules can be found at run-time. + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 74d59c05ec91..a82891a8f35f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib-networking +, gobjectIntrospection, glib-networking, hicolor-icon-theme }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection - librsvg glib-networking libnotify + librsvg glib-networking libnotify hicolor-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); @@ -28,7 +28,6 @@ in stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d8fc1d840d2b..8627ccb70ffd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib +, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux , enableDaemon ? true @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; + ++ optionals stdenv.isLinux [ inotify-tools ] + ++ optionals enableGTK3 [ hicolor-icon-theme ]; postPatch = '' substituteInPlace ./configure \ @@ -39,10 +40,6 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 '' - rm "$out/share/icons/hicolor/icon-theme.cache" - ''; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix index 252c6d878d0c..b4e962ce3fcf 100644 --- a/pkgs/applications/office/gnucash/2.4.nix +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gconf ]; @@ -49,8 +50,6 @@ stdenv.mkDerivation rec { --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; # The following settings fix failures in the test suite. It's not required otherwise. diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 4d85374ee9a6..471d2d757d96 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -3,7 +3,7 @@ , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers -, pango, gdk_pixbuf +, pango, gdk_pixbuf, hicolor-icon-theme }: /* @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 libxslt glibcLocales gettext swig enchant bzip2 isocodes # glib, gtk... - glib gtk2 goffice webkit + glib gtk2 goffice webkit hicolor-icon-theme # gnome... dconf gconf libgnomecanvas gsettings-desktop-schemas # financial @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; # The following settings fix failures in the test suite. It's not required otherwise. diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 0d0ac0a2e947..b0c0251b97cf 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev - libgudev + libgudev hicolor-icon-theme ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ++ lib.optional useFdk fdk_aac; @@ -82,11 +82,6 @@ stdenv.mkDerivation rec { cd build ''; - # icon-theme.cache belongs in the icon theme, not in individual packages - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for converting video files and ripping DVDs"; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 2c99bad8156b..72d8e682c862 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata -, libnotify, popt, xfce -}: +, libnotify, popt, xfce, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -35,8 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; - meta = { homepage = http://www.xfce.org/projects/; description = "A simple calendar application with reminders"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index a0856b6a6d7b..19ecff290933 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libnotify -, gtk , libxfce4util, libxfce4ui, xfconf }: +, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; + buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache # to be able to run the daemon we need it in PATH ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin ''; diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index 5f8cc71de851..0b606ee5fdd7 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook +, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { intltool gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4-panel + hicolor-icon-theme ]; # TODO: optionality? enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index a3b8a619f174..39214ca57b1f 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, xfconf, udev, libgudev, libnotify }: +, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "thunar-volman"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util - xfconf libnotify + xfconf libnotify hicolor-icon-theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index c64e8770d256..6399aa3cc20d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 236c71c66d56..cb32d5676437 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index 0a309c433e95..07838f8fe7c9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "CPU Freq load plugin for Xfce panel"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index c5487198f97e..8048a8570298 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index a843f0223c4e..e82669cc1a35 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix index 1b963237c02c..6f6f5699b6e9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf -, gtk3, libpulseaudio +, gtk3, libpulseaudio, hicolor-icon-theme , withKeybinder ? true, keybinder3 , withLibnotify ? true, libnotify }: @@ -21,12 +21,10 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ] + buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ] ++ optional withKeybinder keybinder3 ++ optional withLibnotify libnotify; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Adjust the audio volume of the PulseAudio sound system"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 03f062532ead..15cd526d6def 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4-panel }: +libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel ]; + xfce4-panel hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Weather plugin for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 9783e6c9228f..dd1fd4636689 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -2,7 +2,7 @@ , gtk , thunarx-2-dev , exo, libxfce4util, libxfce4ui -, xfconf, udev, libnotify +, xfconf, udev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { xfce4-dev-tools thunarx-2-dev exo gtk libxfce4util libxfce4ui - xfconf udev libnotify + xfconf udev libnotify hicolor-icon-theme ]; preConfigure = '' @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { pushd $out/libexec/thunar-archive-plugin > /dev/null ln -s ./file-roller.tap org.gnome.FileRoller.tap popd > /dev/null - rm $out/share/icons/hicolor/icon-theme.cache ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index d44281d052d1..8f8e96d594fa 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunarx-2-dev, python2 +, thunarx-2-dev, python2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk - thunarx-2-dev python2 + thunarx-2-dev python2 hicolor-icon-theme ]; configurePhase = "python2 waf configure --prefix=$out"; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { python2 waf install ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - enableParallelBuilding = true; meta = with stdenv.lib; { From 610485faa7f8c043482c4a9c030938ed315557e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 09:45:26 +0200 Subject: [PATCH 029/362] python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. --- pkgs/development/python-modules/pytest/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index b5a8cc252b97..1c0ceef83657 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock +, atomicwrites, mock, writeText }: buildPythonPackage rec { version = "3.6.2"; @@ -27,6 +27,11 @@ buildPythonPackage rec { runHook postCheck ''; + # Don't create .pytest-cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + export PYTEST_ADDOPTS="-p no:cacheprovider" + ''; + meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; From 5d3f5bb61e792ae96c45ac5d2efb5f779ffe0401 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 11:51:50 +0200 Subject: [PATCH 030/362] parity-ui: fix after merge --- pkgs/applications/altcoins/parity-ui/env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index 3f9b0939b62a..625a008af917 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ From 2b1417a940098a72d373cf1a19c377712c895f6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 11:51:50 +0200 Subject: [PATCH 031/362] parity-ui: fix after merge --- pkgs/applications/altcoins/parity-ui/env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index 3f9b0939b62a..625a008af917 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ From 865ffc16ceab2c58badfaa63033234c696aa2b12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 09:49:12 +0200 Subject: [PATCH 032/362] python.pkgs.appnope: move expression --- .../python-modules/appnope/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/appnope/default.nix diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix new file mode 100644 index 000000000000..08f6fa529ca7 --- /dev/null +++ b/pkgs/development/python-modules/appnope/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "appnope"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"; + }; + + meta = { + description = "Disable App Nap on macOS"; + homepage = https://pypi.python.org/pypi/appnope; + platforms = lib.platforms.darwin; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3350fad20068..5b8639edce79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -571,22 +571,7 @@ in { application = callPackage ../development/python-modules/application { }; - appnope = buildPythonPackage rec { - version = "0.1.0"; - name = "appnope-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/appnope/${name}.tar.gz"; - sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"; - }; - - meta = { - description = "Disable App Nap on macOS"; - homepage = https://pypi.python.org/pypi/appnope; - platforms = platforms.darwin; - license = licenses.bsd3; - }; - }; + appnope = callPackage ../development/python-modules/appnope { }; apsw = callPackage ../development/python-modules/apsw {}; From a5e1da3df1230308562e914a62858365bf8d435a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 09:53:59 +0200 Subject: [PATCH 033/362] python.pkgs.audiotools: move expression --- .../python-modules/audiotools/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/audiotools/default.nix diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix new file mode 100644 index 000000000000..ee029726d1c6 --- /dev/null +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchurl +, stdenv +, darwin +}: + +buildPythonPackage rec { + pname = "audiotools"; + version = "3.1.1"; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AudioToolbox + AudioUnit + CoreServices + ]); + + src = fetchurl { + url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz"; + sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c"; + }; + + meta = { + description = "Utilities and Python modules for handling audio"; + homepage = "http://audiotools.sourceforge.net/"; + license = lib.licenses.gpl2Plus; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b8639edce79..bd92733bdfaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -634,27 +634,7 @@ in { audioread = callPackage ../development/python-modules/audioread { }; - audiotools = buildPythonPackage rec { - name = "audiotools-${version}"; - version = "3.1.1"; - - buildInputs = optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - AudioToolbox - AudioUnit - CoreServices - ]); - - src = pkgs.fetchurl { - url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz"; - sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c"; - }; - - meta = { - description = "Utilities and Python modules for handling audio"; - homepage = "http://audiotools.sourceforge.net/"; - license = licenses.gpl2Plus; - }; - }; + audiotools = callPackage ../development/python-modules/audiotools { }; autopep8 = callPackage ../development/python-modules/autopep8 { }; From c6eaf088a96772b7b7dbd19630eefccf16d822a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 10:00:37 +0200 Subject: [PATCH 034/362] python.pkgs.av: move expression --- .../development/python-modules/av/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 ++----------- 2 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/av/default.nix diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix new file mode 100644 index 000000000000..2b9e298a222d --- /dev/null +++ b/pkgs/development/python-modules/av/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pillow +, numpy +, ffmpeg_2 +, git +, libav +, pkgconfig +}: + +buildPythonPackage rec { + pname = "av"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0"; + }; + + buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ]; + + # Because of https://github.com/mikeboers/PyAV/issues/152 + doCheck = false; + + meta = { + description = "Pythonic bindings for FFmpeg/Libav"; + homepage = https://github.com/mikeboers/PyAV/; + license = lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd92733bdfaf..17dee795b5a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -638,27 +638,8 @@ in { autopep8 = callPackage ../development/python-modules/autopep8 { }; - av = buildPythonPackage rec { - name = "av-${version}"; - version = "0.2.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/av/${name}.tar.gz"; - sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0"; - }; - - buildInputs - = (with self; [ nose pillow numpy ]) - ++ (with pkgs; [ ffmpeg_2 git libav pkgconfig ]); - - # Because of https://github.com/mikeboers/PyAV/issues/152 - doCheck = false; - - meta = { - description = "Pythonic bindings for FFmpeg/Libav"; - homepage = https://github.com/mikeboers/PyAV/; - license = licenses.bsd2; - }; + av = callPackage ../development/python-modules/av { + inherit (pkgs) ffmpeg_2 git libav pkgconfig; }; avro = callPackage ../development/python-modules/avro {}; From 9c4e073e01ade4b88f6355fea1be225ead512037 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 10:22:33 +0200 Subject: [PATCH 035/362] python.pkgs.suseapi: move expression --- .../python-modules/suseapi/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------ 2 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/suseapi/default.nix diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix new file mode 100644 index 000000000000..0e9f4f43656b --- /dev/null +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, suds-jurko +, ldap +, mechanize +, beautifulsoup4 +, pyxdg +, dateutil +, requests +, httpretty +}: + +buildPythonPackage rec { + pname = "suseapi"; + version = "0.24-31-g0fcbe96"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "python-${pname}"; + rev = version; + sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; + }; + + propagatedBuildInputs = [ + django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + ]; + + buildInputs = [ httpretty ]; + + doCheck = false; + + meta = { + homepage = "https://github.com/openSUSE/python-suseapi/"; + description = "Python module to work with various SUSE services"; + license = lib.licenses.gpl3Plus; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17dee795b5a8..25725c6e3455 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17689,32 +17689,7 @@ EOF yarl = callPackage ../development/python-modules/yarl { }; - suseapi = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "suseapi"; - version = "0.24-31-g0fcbe96"; - - src = pkgs.fetchFromGitHub { - owner = "openSUSE"; - repo = "python-${pname}"; - rev = version; - sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; - }; - - propagatedBuildInputs = with self; [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests - ]; - - buildInputs = with self; [ httpretty ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/openSUSE/python-suseapi/"; - description = "Python module to work with various SUSE services"; - license = licenses.gpl3Plus; - }; - }; + suseapi = callPackage ../development/python-modules/suseapi { }; typed-ast = callPackage ../development/python-modules/typed-ast { }; From c5c4880b287b4e9a2efa5c90612d56cd19ccccf3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 10:23:44 +0200 Subject: [PATCH 036/362] python.pkgs.moreItertools: remove alias, use more-itertools --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25725c6e3455..f4397a1adfa2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17544,8 +17544,6 @@ EOF }; }; - moreItertools = self.more-itertools; - more-itertools = callPackage ../development/python-modules/more-itertools { }; jaraco_functools = buildPythonPackage rec { From 72a8c0feb64f73c7d461d2fe4940273caa795bb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Jul 2018 10:34:32 +0200 Subject: [PATCH 037/362] python.pkgs.ghp-import: move to all-packages.nix because it's an application --- pkgs/development/tools/ghp-import/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 23 --------------- 3 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/tools/ghp-import/default.nix diff --git a/pkgs/development/tools/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix new file mode 100644 index 000000000000..9bad3fc6870a --- /dev/null +++ b/pkgs/development/tools/ghp-import/default.nix @@ -0,0 +1,28 @@ +{ python3, glibcLocales, lib }: + +with python3.pkgs; + +buildPythonApplication rec { + version = "0.4.1"; + pname = "ghp-import"; + + src = fetchPypi { + inherit pname version; + sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053"; + }; + + disabled = isPyPy; + buildInputs = [ glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + # No tests available + doCheck = false; + + meta = { + description = "Copy your docs directly to the gh-pages branch"; + homepage = "https://github.com/davisp/ghp-import"; + license = "Tumbolia Public License"; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add4e0f4e235..82be48518fec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9296,6 +9296,8 @@ with pkgs; givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; + ghp-import = callPackage ../development/tools/ghp-import { }; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4397a1adfa2..835909f5dfa5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16565,29 +16565,6 @@ EOF ''; }; - ghp-import = buildPythonPackage rec { - version = "0.4.1"; - name = "ghp-import-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/g/ghp-import/${name}.tar.gz"; - sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053"; - }; - disabled = isPyPy; - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - # No tests available - doCheck = false; - - meta = { - description = "Copy your docs directly to the gh-pages branch"; - homepage = "https://github.com/davisp/ghp-import"; - license = "Tumbolia Public License"; - maintainers = with maintainers; [ garbas ]; - }; - }; - typogrify = buildPythonPackage rec { name = "typogrify-2.0.7"; src = pkgs.fetchurl { From 130d8035f5591ddd9db770101aa3402420598a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 22 Jul 2018 09:31:21 +0200 Subject: [PATCH 038/362] python.pkgs.pyyaml: 3.12 -> 3.13 --- 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 a4918bf352dc..e66ca0df5b91 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 = "3.12"; + version = "3.13"; src = fetchPypi { inherit pname version; - sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; + sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; }; propagatedBuildInputs = [ libyaml ]; From fb7b8948f4c2551cdfbac23cbe92a6f1ba5d5b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 1 Jul 2018 16:39:07 +0200 Subject: [PATCH 039/362] python.pkgs.sip: 4.19.6 -> 4.19.8 --- pkgs/development/python-modules/sip/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 0503e2ef04fe..bfca2a6f6982 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,13 +1,15 @@ { lib, fetchurl, buildPythonPackage, python, isPyPy }: -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { +buildPythonPackage rec { pname = "sip"; - version = "4.19.6"; + version = "4.19.8"; format = "other"; + disabled = isPyPy; + src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx"; + sha256 = "1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy"; }; configurePhase = '' From 40887a6dc63568746068344550193a342219d73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Jul 2018 17:36:05 +0100 Subject: [PATCH 040/362] pipenv: 2018.5.18 -> 2018.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Domen Kožar --- .../python-modules/arpeggio/default.nix | 24 ++++++++++++++++ .../python-modules/hypothesis/default.nix | 11 ++++---- .../python-modules/invoke/default.nix | 22 +++++++++++++++ .../python-modules/parver/default.nix | 28 +++++++++++++++++++ pkgs/development/tools/pipenv/default.nix | 6 ++-- pkgs/top-level/python-packages.nix | 4 +++ 6 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/arpeggio/default.nix create mode 100644 pkgs/development/python-modules/invoke/default.nix create mode 100644 pkgs/development/python-modules/parver/default.nix diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix new file mode 100644 index 000000000000..b793ff29ddfa --- /dev/null +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +}: + +buildPythonPackage rec { + pname = "Arpeggio"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rvgwc2nxqf22fjnggswqw2i3sn1f2hhq043vhjr3af7ldfai3l2"; + }; + + # Shall not be needed for next release + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + + meta = { + description = "Packrat parser interpreter"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 6701c5a5b7e9..5694ea92405c 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,23 +9,24 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.45.2"; + version = "3.66.2"; pname = "hypothesis"; - # Upstream prefers github tarballs + # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; - rev = version; - sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; + rev = "hypothesis-python-${version}"; + sha256 = "17ywbwa76z7f0pgash0003fvm25fsj7hxdrdiprdbv99y3i8bm88"; }; + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; checkInputs = [ pytest pytest_xdist flaky mock ]; inherit doCheck; - # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' rm tox.ini # This file changes how py.test runs and breaks it py.test tests/cover diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix new file mode 100644 index 000000000000..20d2973ca4f1 --- /dev/null +++ b/pkgs/development/python-modules/invoke/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "invoke"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6"; + }; + + # errors with vendored libs + doCheck = false; + + meta = { + description = "Pythonic task execution"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix new file mode 100644 index 000000000000..7918c5bf6fa5 --- /dev/null +++ b/pkgs/development/python-modules/parver/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, attrs +, pytest +, hypothesis +, pretend +, arpeggio +}: + +buildPythonPackage rec { + pname = "parver"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc"; + }; + + propagatedBuildInputs = [ six attrs arpeggio ]; + checkInputs = [ pytest hypothesis pretend ]; + + meta = { + description = "parver allows parsing and manipulation of PEP 440 version numbers."; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index e58cc44884c8..297d2c3c6667 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,16 +2,16 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.5.18"; + version = "2018.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84"; + sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv"; }; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ pew pip requests flake8 ]; + propagatedBuildInputs = [ pew pip requests flake8 parver invoke ]; doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 835909f5dfa5..281f90a73ef4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -264,6 +264,10 @@ in { discordpy = callPackage ../development/python-modules/discordpy { }; + parver = callPackage ../development/python-modules/parver { }; + arpeggio = callPackage ../development/python-modules/arpeggio { }; + invoke = callPackage ../development/python-modules/invoke { }; + distorm3 = callPackage ../development/python-modules/distorm3 { }; dogtail = callPackage ../development/python-modules/dogtail { }; From f48cc618f14518ca3de536040073eebae21b63f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:03:51 +0200 Subject: [PATCH 041/362] python: adal: 1.0.1 -> 1.0.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 2f4c020eb974..ab9839a21031 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.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393"; + sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; From 070cba0dc893040abb06c31788c33c2e490914da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:03:58 +0200 Subject: [PATCH 042/362] python: aioconsole: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 49d0bc6c6377..f594b66285db 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50"; + sha256 = "f263eb4f5eaee9f5e86f7b34fea3b50b3a4ff77b9f23ffcd3c4cb204c3b3fccc"; }; # hardcodes a test dependency on an old version of pytest-asyncio From b2c657d3be2836047dc2687ade6303cffd59cc6a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:06 +0200 Subject: [PATCH 043/362] python: alembic: 0.9.10 -> 1.0.0 --- 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 7becf1cffc41..cb70d3760c8c 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 = "0.9.10"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7"; + sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e"; }; buildInputs = [ pytest pytestcov mock coverage ]; From 621a29650b6f7d61c3ca399021d33aec2885188e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:13 +0200 Subject: [PATCH 044/362] python: apipkg: 1.4 -> 1.5 --- pkgs/development/python-modules/apipkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 213bc4f1eb91..4390810d91a0 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "apipkg"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6"; + sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; buildInputs = [ pytest ]; From b6b291af660089d06e76e4e1872048a46ab532df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:21 +0200 Subject: [PATCH 045/362] python: Arpeggio: 1.8.0 -> 1.9.0 --- 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 b793ff29ddfa..045707aee4dc 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.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0rvgwc2nxqf22fjnggswqw2i3sn1f2hhq043vhjr3af7ldfai3l2"; + sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732"; }; # Shall not be needed for next release From 7ac59b6c02e0c2b292a8ccdbaf0ae7ceefed878f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:29 +0200 Subject: [PATCH 046/362] python: astor: 0.6.2 -> 0.7.1 --- pkgs/development/python-modules/astor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 381a4a733146..687808461feb 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astor"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d"; + sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d"; }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 From cdf9d66b0d8919ee385625eeaec66ecba1c91a80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:36 +0200 Subject: [PATCH 047/362] python: astroid: 1.6.5 -> 2.0.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 a7e7931d9d92..dc132f911477 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "astroid"; - version = "1.6.5"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"; + sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] From 9bbf5651194a70878657f8e44f9dc5d6c9dfff76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:43 +0200 Subject: [PATCH 048/362] python: av: 0.2.4 -> 0.4.1 --- pkgs/development/python-modules/av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 2b9e298a222d..7e68265eed83 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "av"; - version = "0.2.4"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0"; + sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f"; }; buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ]; From ee895c02d2c5536d3218fd26828b5b3c09c88d8e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:50 +0200 Subject: [PATCH 049/362] python: aws-sam-translator: 1.6.0 -> 1.6.1 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index d7bdd143b697..64c75b3c092b 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb"; + sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10"; }; # Tests are not included in the PyPI package From 000b9ce78d66ad9cabe17a4670ffacf9d35a6d05 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:04:58 +0200 Subject: [PATCH 050/362] python: aws-xray-sdk: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 9dbd20cd6eef..a16f6c7415f2 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d"; + sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef"; }; propagatedBuildInputs = [ From 205e1dbdfd96ebd6a8645804dbff9a95f53813ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:04 +0200 Subject: [PATCH 051/362] python: backports.lzma: 0.0.9 -> 0.0.13 --- 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 a0643e82ae03..c650076d4c00 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.9"; + version = "0.0.13"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539"; + sha256 = "50829db66f0445442f6c796bba0ca62d1f87f54760c4682b6d1489e729a43744"; }; buildInputs = [ lzma ]; From 1b2297a60db32540c466bef1fe0e10946eb81c62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:11 +0200 Subject: [PATCH 052/362] python: backports.unittest_mock: 1.3 -> 1.4 --- .../python-modules/backports_unittest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 2125390d6715..3baaa871adf5 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.unittest_mock"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6"; + sha256 = "73df9093bc7a2cc8e7018d08d6983dc5bcb2a47d7e7e107b9e8d0711f1702ef8"; }; propagatedBuildInputs = [ mock ]; From 7f19f1ea632f4e017c3e55d01e6452ffa752774a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:17 +0200 Subject: [PATCH 053/362] python: billiard: 3.5.0.3 -> 3.5.0.4 --- 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 6b21a1492bd1..42e38d0babe1 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.5.0.3"; + version = "3.5.0.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6"; + sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84"; }; buildInputs = [ pytest case ]; From 0692580f272893d389e8f6279ee6fca33a95af40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:24 +0200 Subject: [PATCH 054/362] python: biopython: 1.71 -> 1.72 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 8229c1edce8a..39be67e6e51f 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.71"; + version = "1.72"; src = fetchPypi { inherit pname version; - sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033"; + sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2"; }; propagatedBuildInputs = [ numpy ]; From 6da075b6e69b88124903ceb681b37fea71b72d31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:31 +0200 Subject: [PATCH 055/362] python: botocore: 1.10.57 -> 1.10.62 --- 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 70a5af97fdaa..2fefd361a87e 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.10.57"; + version = "1.10.62"; src = fetchPypi { inherit pname version; - sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi"; + sha256 = "047d553ec2a4c7f80f9ca02f73c3ab443577bad6bcb079c698fb9dd8cc93c0af"; }; propagatedBuildInputs = [ From 1fe6cde733445ee71ac160d25f0924aac1e2688e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:44 +0200 Subject: [PATCH 056/362] python: zc.buildout: 2.11.5 -> 2.12.1 --- 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 91b310a21790..5a1bc4485b71 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.11.5"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122"; + sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d"; }; patches = [ ./nix.patch ]; From 4e8b0caaf9be6d7c4d3c9087c1b648b198ca607c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:51 +0200 Subject: [PATCH 057/362] python: bumps: 0.7.8 -> 0.7.10 --- 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 3f6b2ed3ccd0..469b449483af 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.8"; + version = "0.7.10"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2"; + sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8"; }; meta = with stdenv.lib; { From 22cac57e0125e9f8433d06ca58cb136d2b01dbc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:05:57 +0200 Subject: [PATCH 058/362] python: buttersink: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/buttersink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix index 29f5ff5dccd2..b13251e1ca75 100644 --- a/pkgs/development/python-modules/buttersink/default.nix +++ b/pkgs/development/python-modules/buttersink/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "buttersink"; - version = "0.6.8"; + version = "0.6.9"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; + sha256 = "c9c05982c44fbb85f17b7ef0e8bee11f375c03d89bcba50cbc2520013512107a"; }; propagatedBuildInputs = [ boto crcmod psutil ]; From 54b6ac6ec4548b7344f3be78197c5c36acfaec7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:03 +0200 Subject: [PATCH 059/362] python: python-can: 2.1.0 -> 2.2.1 --- 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 f85f80ea2399..1ca4cee347ca 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc"; + sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b"; }; propagatedBuildInputs = [ pyserial ]; From d1660fbc0e25beeb049379942f1d853ee475c75c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:10 +0200 Subject: [PATCH 060/362] python: cement: 2.10.2 -> 2.10.12 --- pkgs/development/python-modules/cement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 36cc20e027bb..9b744957540f 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cement"; - version = "2.10.2"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55"; + sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70"; }; # Disable test tests since they depend on a memcached server running on From e608d3d7de0697dae91657aaab27973bbf720b47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:18 +0200 Subject: [PATCH 061/362] python: chainer: 4.1.0 -> 4.3.0 --- pkgs/development/python-modules/chainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index cc75649119bd..d332d99cf809 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "4.1.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329"; + sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683"; }; checkInputs = [ From 8ad3d8bd49b55d736deda628c84e3ac3606c4c44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:25 +0200 Subject: [PATCH 062/362] python: cheroot: 6.3.2 -> 6.3.3 --- 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 7a7d44339ba4..d7e6abf3eb6c 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cheroot"; - version = "6.3.2"; + version = "6.3.3"; src = fetchPypi { inherit pname version; - sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f"; + sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25"; }; propagatedBuildInputs = [ more-itertools six ]; From 9a9531c45331d2bb622e159fdc235a9785b45791 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:31 +0200 Subject: [PATCH 063/362] python: CherryPy: 16.0.2 -> 17.0.0 --- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 47aca123998f..e9ae4bde8cc7 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "CherryPy"; - version = "16.0.2"; + version = "17.0.0"; src = fetchPypi { inherit pname version; - sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3"; + sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7"; }; propagatedBuildInputs = [ cheroot portend routes six ]; From d73d218001160e84751757d98a314c4e18be28c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:39 +0200 Subject: [PATCH 064/362] python: click-log: 0.2.1 -> 0.3.2 --- pkgs/development/python-modules/click-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 7229488a700f..f5626859d066 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-log"; - version = "0.2.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; + sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; }; propagatedBuildInputs = [ click ]; From 58c146e47b9b957917fa5717d5e4dfcd1cc41f14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:46 +0200 Subject: [PATCH 065/362] python: cmd2: 0.9.1 -> 0.9.3 --- 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 967941666c84..1997c2389ab0 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49"; + sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417"; }; LC_ALL="en_US.UTF-8"; From 68f529a0b3cb718a7ca38fa9735e340980886d0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:52 +0200 Subject: [PATCH 066/362] python: confluent-kafka: 0.11.4 -> 0.11.5 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index bcf67ab222d4..0638ea3a36d2 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: buildPythonPackage rec { - version = "0.11.4"; + version = "0.11.5"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1"; + sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; From 719290d5e20e4685f4e070a63b3cc2f1b09c14f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:06:59 +0200 Subject: [PATCH 067/362] python: python-consul: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 888e7a922528..5c9e83b8d206 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-consul"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4"; + sha256 = "168f1fa53948047effe4f14d53fc1dab50192e2a2cf7855703f126f469ea11f4"; }; buildInputs = [ requests six pytest ]; From 67031b87195374c07524b825bd98908cf8591092 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:06 +0200 Subject: [PATCH 068/362] python: cryptography: 2.2.2 -> 2.3 --- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8fe8ccc31a95..2a8736e29de3 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,7 +21,7 @@ }: let - version = "2.2.2"; + version = "2.3"; in assert version == cryptography_vectors.version; buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; @@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63"; + sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6"; }; outputs = [ "out" "dev" ]; From 65de56e4eac7180a7aa3ce7f9b2b29d28e64cd8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:12 +0200 Subject: [PATCH 069/362] python: cryptography_vectors: 2.2.2 -> 2.3 --- .../python-modules/cryptography_vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 6285ac28fce1..ba896d29fc57 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688"; + sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15"; }; # No tests included From f3a1a1b8a8deac59542e5880d03ff9c8159151a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:19 +0200 Subject: [PATCH 070/362] python: cupy: 4.1.0 -> 4.3.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index da742b310507..5d9ae10b09a9 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "4.1.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0"; + sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5"; }; checkInputs = [ From e6b54fc1698df488280b6b3483b2adebf8098d8a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:25 +0200 Subject: [PATCH 071/362] python: cx_Oracle: 6.3.1 -> 6.4.1 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 7c0fa32eb99f..a4ad178cb349 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.3.1"; + version = "6.4.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7"; + sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6"; }; preConfigure = '' From 37ac63d899364cd97b6b36861cac30cdf4433847 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:32 +0200 Subject: [PATCH 072/362] python: dask: 0.18.0 -> 0.18.1 --- 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 0d69edcf9cea..7de2eeb5a198 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.18.0"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0"; + sha256 = "b50b435c51bf5ca30c2667d0d92649765b732a2e6bebe7e219e6dd3fe8d7ac4e"; }; checkInputs = [ pytest ]; From 29e48a2ec35a1fb51b97e671db6dc0c4a957fefd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:39 +0200 Subject: [PATCH 073/362] python: dbf: 0.97.7 -> 0.97.11 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 4ebb9a336908..5a27e2b746fd 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.97.7"; + version = "0.97.11"; src = fetchPypi { inherit pname version; - sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0"; + sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; From bb801eebf825e6bd86c159a6a3cfbcb4eef083ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:46 +0200 Subject: [PATCH 074/362] python: deprecation: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/deprecation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index d1ec79210990..10e0d79dddf5 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96"; + sha256 = "cbe7d15006bc339709be5e02b14884ecc479639c1a3714a908de3a8ca13b5ca9"; }; propagatedBuildInputs = [ packaging ]; From 57ad6be0c4116d4f853c219b698d3bf6355d2289 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:07:53 +0200 Subject: [PATCH 075/362] python: dill: 0.2.8.1 -> 0.2.8.2 --- 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 5473d85b5765..3f01d56ac915 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.8.1"; + version = "0.2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822"; + sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3"; }; # Messy test suite. Even when running the tests like tox does, it fails From 99b739ecddacd50a47a747cf116b6b6ce760c71d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:00 +0200 Subject: [PATCH 076/362] python: Django: 2.0.6 -> 2.0.7 --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 545eba8360a7..3c35b74bab61 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.6"; + version = "2.0.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8"; + sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613"; }; patches = stdenv.lib.optionals withGdal [ From 1650883b96225f94f230579ca6c9a3202a96c108 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:07 +0200 Subject: [PATCH 077/362] python: django-sites: 0.9 -> 0.10 --- pkgs/development/python-modules/django-sites/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 831dbbc4a6c9..63c61131261d 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-sites"; - version = "0.9"; + version = "0.10"; meta = { description = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05nrydk4a5a99qrxjrcnacs8nbbq5pfjikdpj4w9yn5yfayp057s"; + sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; }; propagatedBuildInputs = [ django ]; From 0475d9931fe1e369a546ccdfcd2feb5b8e77908c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:13 +0200 Subject: [PATCH 078/362] python: docker-compose: 1.21.2 -> 1.22.0 --- pkgs/development/python-modules/docker_compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 80a3a6d949c6..01a5b4aa8e68 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.21.2"; + version = "1.22.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38"; + sha256 = "915cdd0ea7aff349d27a8e0585124ac38695635201770a35612837b25e234677"; }; # lots of networking and other fails From 34538061cb2f3c601ba6ba84bcee417c8b42ae5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:21 +0200 Subject: [PATCH 079/362] python: docker: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 0eedf4f01a6e..dd4aafe1aa90 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.4.0"; + version = "3.4.1"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7"; + sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99"; }; propagatedBuildInputs = [ From fdfa4bede6e221c2bee837e6cc0c4692434f0b60 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:27 +0200 Subject: [PATCH 080/362] python: dogpile.cache: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 88dc6b0fc750..9a840e5112af 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.5"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31"; + sha256 = "044d4ea0a0abc72491044f3d3df8e1fc9e8fa7a436c6e9a0da5850d23a0d16c1"; }; # Disable concurrency tests that often fail, From 228069ef3bc5f558616d77b3e34d23e274cb0fa2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:34 +0200 Subject: [PATCH 081/362] python: dropbox: 8.9.0 -> 9.0.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 8a5f23de8998..5d344f180590 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "8.9.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7eeac47f35e73b34023b7a3089380e74bacd0cce4b57e1e347539dfb53681d2"; + sha256 = "385c62c2983c3804ba0064762f9e5f4753ea20a132c727b4961d3b68e1372ac8"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From e68413917b33d0362cca5d32bc63ab3f7689ed1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:40 +0200 Subject: [PATCH 082/362] python: dulwich: 0.19.3 -> 0.19.5 --- 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 61b1d0d1cd98..2617249b75a9 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.3"; + version = "0.19.5"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0d1ab6adf5e8e9bc30cce6e2f924ca06e50241fb1bb17a585fc8d98e3c09c4a4"; + sha256 = "34f99e575fe1f1e89cca92cec1ddd50b4991199cb00609203b28df9eb83ce259"; }; LC_ALL = "en_US.UTF-8"; From 71c1eccaccc4fc58fe8d681afc127b46b0cc230d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:47 +0200 Subject: [PATCH 083/362] python: Faker: 0.8.16 -> 0.8.17 --- 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 6441db945d7f..74ed13da8b46 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.16"; + version = "0.8.17"; src = fetchPypi { inherit pname version; - sha256 = "04645d946256b835c675c1cef7c03817a164b0c4e452018fd50b212ddff08c22"; + sha256 = "0e9a1227a3a0f3297a485715e72ee6eb77081b17b629367042b586e38c03c867"; }; checkInputs = [ From a188a94ea8da0a06c9c78fe3344cd1445aa7d312 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:08:53 +0200 Subject: [PATCH 084/362] python: Fiona: 1.7.12 -> 1.7.13 --- pkgs/development/python-modules/fiona/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 642111680b37..e6d347b440d3 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.12"; + version = "1.7.13"; src = fetchPypi { inherit pname version; - sha256 = "8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51"; + sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2"; }; buildInputs = [ From 25a6b57b29db7decd4b2d1c32544cbd893ae895f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:00 +0200 Subject: [PATCH 085/362] python: flake8-import-order: 0.17.1 -> 0.18 --- .../python-modules/flake8-import-order/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 79ad50a63ffe..5709b17c524a 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.17.1"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7"; + sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; From b2cf1a2e79230f1cf8677d8aea364908790b64e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:06 +0200 Subject: [PATCH 086/362] python: Flask-PyMongo: 0.5.2 -> 2.0.1 --- pkgs/development/python-modules/Flask-PyMongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 55b059cd7fa2..6a14607ad27f 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-PyMongo"; - version = "0.5.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5"; + sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5"; }; checkInputs = [ pytest ]; From f7412e8ba0a63d1e7d436b41b0159ac17a4a1caa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:19 +0200 Subject: [PATCH 087/362] python: gensim: 3.4.0 -> 3.5.0 --- 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 1b3ab52c4c39..f9f8198e4ac1 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0"; + sha256 = "78ed9b6ac35f104542f3bee0386d71ddf9432d74c153065d2ea9f6baf10e5b49"; }; propagatedBuildInputs = [ smart_open numpy six scipy From 09db10803ee3ee888adcde26512e65aa89c37b06 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:26 +0200 Subject: [PATCH 088/362] python: gevent: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/gevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 1169dd3a4a47..cd28a4976a9f 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74"; + sha256 = "7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0"; }; buildInputs = [ libev ]; From 0c96df34722af24bbb358a2214fb69d18f2614f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:32 +0200 Subject: [PATCH 089/362] python: gitdb2: 2.0.3 -> 2.0.4 --- 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 1ebbd3de7850..f5812c62e13e 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.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn"; + sha256 = "bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044"; }; propagatedBuildInputs = [ smmap2 ]; From dd51be2730f96a6ea747b64226dde265d2052482 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:39 +0200 Subject: [PATCH 090/362] python: GitPython: 2.1.9 -> 2.1.11 --- 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 89b941c34fc2..aef59ba2ab91 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "2.1.9"; + version = "2.1.11"; pname = "GitPython"; src = fetchPypi { inherit pname version; - sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64"; + sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; checkInputs = [ mock nose ddt ]; From 95fdec0a678e86d773caa7f78ea991a660bef695 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:46 +0200 Subject: [PATCH 091/362] python: GooCalendar: 0.3 -> 0.4 --- pkgs/development/python-modules/goocalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index f6e67ad43923..4324b357f29d 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.3"; + version = "0.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823"; + sha256 = "ca3950c2728916d9fb703c886f3940ac9b76739f99ec840b0e1c2c282510e1ab"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = [ From 018f503ffe9c8f18252ed366a9166fba9fe8afaa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:52 +0200 Subject: [PATCH 092/362] python: google-api-python-client: 1.7.3 -> 1.7.4 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 7f71a4ed3ef2..c8dd5ea84aec 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "e32d30563b90c4f88ff042d4d891b5e8ed1f6cdca0adab95e9c2ce2603087436"; + sha256 = "5d5cb02c6f3112c68eed51b74891a49c0e35263380672d662f8bfe85b8114d7c"; }; # No tests included in archive From 08b683627140ff776ac095d78c3ade00383c16b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:09:59 +0200 Subject: [PATCH 093/362] python: google-cloud-speech: 0.34.0 -> 0.35.0 --- .../python-modules/google_cloud_speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 8cf3fe5753ee..f404c68921d4 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.34.0"; + version = "0.35.0"; src = fetchPypi { inherit pname version; - sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; + sha256 = "5db2d69315b3d95d067c9bffe17994b6ee9252702888cc300d76252b451638e1"; }; propagatedBuildInputs = [ google_api_core ]; From 80c4984a294f44deb93583430f7dc59a7ca3de4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:06 +0200 Subject: [PATCH 094/362] python: greenlet: 0.4.13 -> 0.4.14 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 91b075163018..58b240297cfd 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.13"; + version = "0.4.14"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4"; + sha256 = "f1cc268a15ade58d9a0c04569fe6613e19b8b0345b64453064e2c3c6d79051af"; }; propagatedBuildInputs = [ six ]; From 43e93b8a75d13d7934f490db3051838d5efeac31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:12 +0200 Subject: [PATCH 095/362] python: gssapi: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 5ceadcc0f91b..698da6dc91a1 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,11 +3,11 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "be715cb74ac56db2dd888b016097aaa29ab7d7d34c1f8c706ff63f76b3553f71"; + sha256 = "76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc"; }; # It's used to locate headers From 2ea117a328f4b8c2d6d839be72b6a22a5185fd01 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:19 +0200 Subject: [PATCH 096/362] python: gunicorn: 19.8.1 -> 19.9.0 --- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index efc42dedc655..85c5c011dfd9 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "19.8.1"; + version = "19.9.0"; src = fetchPypi { inherit pname version; - sha256 = "bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"; + sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3"; }; checkInputs = [ pytest mock pytestcov coverage ]; From 0da1f197f702cbeb3796e21cbfb7a5fb68d1fdb8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:25 +0200 Subject: [PATCH 097/362] python: hdbscan: 0.8.13 -> 0.8.15 --- 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 94b9861daa97..3c86563adac2 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.13"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "31874db29375816688b5541287a051c9bd768f2499ccf1f6a4d88d266530e2a6"; + sha256 = "446f98e1ea622a39c1f396d839fa2b1c35db98234e373336de61c3bd6ffaec78"; }; checkInputs = [ nose ]; From 89a4204af5856f266bf8a731c529538b8610c92c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:32 +0200 Subject: [PATCH 098/362] python: howdoi: 1.1.7 -> 1.1.13 --- pkgs/development/python-modules/howdoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index a72338143a14..dc9c79781f11 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "1.1.7"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz"; + sha256 = "96f5e057fd45a84379d77e46233165d95211e6b3ea869cb5c0df172aa322b566"; }; propagatedBuildInputs = [ six requests-cache pygments pyquery ]; From be13e7804cd92a8e1a0cc9e8b28644f09b4a82b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:39 +0200 Subject: [PATCH 099/362] python: hvac: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 862d7af91f0a..f18d8eadec87 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "e7b8425ce36894cda8b8ed3387a47119edc517302e6a72942602df54a96ee453"; + sha256 = "4bc80744df5f09882b1cc91755b03b7b62b093fc63c8c4abb26fbfb9c9e878dd"; }; propagatedBuildInputs = [ requests ]; From c75ddbfeeef5bd223edaa4c51785443e48375318 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:52 +0200 Subject: [PATCH 100/362] python: idna-ssl: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/idna-ssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index b324705a152f..a8a040d39e29 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "idna-ssl"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979"; + sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c"; }; propagatedBuildInputs = [ idna ]; From 63b5053447ce20b56e9ecac1bf1df4681576f0a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:10:58 +0200 Subject: [PATCH 101/362] python: ipyparallel: 6.2.1 -> 6.2.2 --- pkgs/development/python-modules/ipyparallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 665d08980dca..a469ad468838 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.1"; + version = "6.2.2"; src = fetchPypi { inherit pname version; - sha256 = "9afb0001d6fa2eca9340e9daab5da021db05211987868f47ab5b305d701cb12d"; + sha256 = "02b225966d5c20f12b1fba0b6b10aa5d352a6b492e075f137ff0ff6e95b9358e"; }; buildInputs = [ nose ]; From 0585d4be985feec68929cc4e4859554bb765445d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:11 +0200 Subject: [PATCH 102/362] python: ipywidgets: 7.2.1 -> 7.3.0 --- 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 e65de4ee3ad0..9f15a2fc5c2e 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.2.1"; + version = "7.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ab9869cda5af7ba449d8f707b29b7e97a7db97d6366805d6b733338f51096f54"; + sha256 = "3ce93db970a94f06f38121da70757cdbcce884ecd14f79a4dd9bc49a47e0f33b"; }; # Tests are not distributed From 5060d8b1946d083333967dcd40f42054b8e1c0b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:18 +0200 Subject: [PATCH 103/362] python: jdatetime: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index eed6a8b979b4..6458fc888e18 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "ac5646460defa5bf3d062504d870954c77d6234536365baf52433fb845b620d0"; + sha256 = "0c5983ef1a36b5d98d2b20c16f1d26a52452043d84f3ff1bf8f37e46bc314874"; }; propagatedBuildInputs = [ six ]; From 9148fc876c37b742e183990d117d9d42328318c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:24 +0200 Subject: [PATCH 104/362] python: jedi: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 9522d2099f8b..0664a6cc2943 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr"; + sha256 = "b409ed0f6913a701ed474a614a3bb46e6953639033e31f769ca7581da5bd1ec1"; }; postPatch = '' From ed7a618d72c4216a74c4beb91230e68146f74ff3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:38 +0200 Subject: [PATCH 105/362] python: joblib: 0.11 -> 0.12.1 --- pkgs/development/python-modules/joblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 17896a58469c..8b42e6e1ea1d 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.11"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; + sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524"; }; checkInputs = [ sphinx numpydoc pytest ]; From a09cc50e95f79ba8183c2f8d593f17bf22a90fda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:45 +0200 Subject: [PATCH 106/362] python: jsonrpc-async: 0.6 -> 1.0.0 --- pkgs/development/python-modules/jsonrpc-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 2bdb93dfdf2d..758fc0f1dd59 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "0.6"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw"; + sha256 = "6241a221b52e18265fe6bb59c60633acebb6fb5ef8c04de9a076b757aa133b86"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; From 9acaa99425ae9798b3a0ab2bb482e6382e2ff0e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:51 +0200 Subject: [PATCH 107/362] python: jsonrpc-base: 1.0 -> 1.0.1 --- pkgs/development/python-modules/jsonrpc-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 8dbe07382889..d68b031d5179 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "1.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk"; + sha256 = "21f860c915617f6475aa1ac5a1ec11de03cce6b279741f25ad97d8a4c5b76c3c"; }; propagatedBuildInputs = [ ]; From 7d4a8626eb4e16f2e6ad374426e6e61c2929aace Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:11:58 +0200 Subject: [PATCH 108/362] python: jsonrpc-websocket: 0.6 -> 1.0.0 --- pkgs/development/python-modules/jsonrpc-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 0914100b5aa6..c753058b093c 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "0.6"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71"; + sha256 = "40949836996c0a8104e7878997d3f68bda4561e9d3af64e5cd178127ec3c2778"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; From b226232424c26832a10f04cd1dfb327cb949ce4e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:05 +0200 Subject: [PATCH 109/362] python: jupyterlab_launcher: 0.10.5 -> 0.11.2 --- .../python-modules/jupyterlab_launcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index f316fe10563d..79d22b6b1c99 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: buildPythonPackage rec { pname = "jupyterlab_launcher"; - version = "0.10.5"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; + sha256 = "236a647f4c3f8417413643a918a893a5f662fb5d2fdccce2fd101e3cca2e7fd1"; }; propagatedBuildInputs = [ From 460605560e0dd58c3738c0fdfb784071de6ea44d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:11 +0200 Subject: [PATCH 110/362] python: keyring: 12.2.1 -> 13.2.1 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index e773bf7436a0..24d1178da37b 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "12.2.1"; + version = "13.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1zhg2a59rqgigl8apm4s39md6yf3f2v1d4bl6s5rmiigwfifm624"; + sha256 = "6364bb8c233f28538df4928576f4e051229e0451651073ab20b315488da16a58"; }; nativeBuildInputs = [ setuptools_scm ]; From 29acc8339fd5eb1f84ed99d9b71381269ec67a04 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:19 +0200 Subject: [PATCH 111/362] python: ldappool: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/ldappool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 02d10b832ff2..a09fa75ce349 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; + sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952"; }; nativeBuildInputs = [ pbr ]; From 4efd060a5e6f31fe2172a2e095e58b28a96341a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:26 +0200 Subject: [PATCH 112/362] python: ledgerblue: 0.1.17 -> 0.1.19 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 47eea033f6e7..4f6c2a96c566 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.17"; + version = "0.1.19"; src = fetchPypi { inherit pname version; - sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f"; + sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; From 44ccbd988c72c5c0394846416dca1388067ca803 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:33 +0200 Subject: [PATCH 113/362] python: libagent: 0.9.8 -> 0.11.3 --- pkgs/development/python-modules/libagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e606d84ede4f..20312ed81d3e 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.9.8"; + version = "0.11.3"; src = fetchPypi{ inherit pname version; - sha256 = "7e7d62cedef9d1291b8e77abc463d50b3d685dfd953611d55a0414c12276aa78"; + sha256 = "cb6199c3572e1223756465e758fb525e7f406a4808e9d7cfdddf089bec710047"; }; buildInputs = [ From b96df9f2c3d99e0b173624fae20e6dd9d630c59c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:39 +0200 Subject: [PATCH 114/362] python: llvmlite: 0.23.2 -> 0.24.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 4d702f166114..224cea4eebdd 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.23.2"; + version = "0.24.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1e63f317b8fb3679d3a397920b1e8bade2d5f471f6c60c7e9bf97746f616f79e"; + sha256 = "320de4c4a1c105b91629305be069d217f3a9d7fbe32cb22bcfb016361895fc07"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; From 4188917eed5002175606c1ef48612ea6ee6c2d97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:46 +0200 Subject: [PATCH 115/362] python: logilab-common: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/logilab/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 6d3b81488b95..9f932b81e7ab 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d"; + sha256 = "cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0"; }; propagatedBuildInputs = [ unittest2 six ]; From f245d167c3e5221bf948866342335fbdb110d546 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:53 +0200 Subject: [PATCH 116/362] python: lxml: 4.2.1 -> 4.2.3 --- 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 8b321b911ccd..8589e47be210 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.2.1"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b"; + sha256 = "622f7e40faef13d232fb52003661f2764ce6cdef3edb0a59af7c1559e4cc36d1"; }; buildInputs = [ libxml2 libxslt ]; From e3ffc1bd47edb89ee6dd83e3acc2546a5f535aa2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:12:59 +0200 Subject: [PATCH 117/362] python: m2r: 0.1.14 -> 0.1.15 --- pkgs/development/python-modules/m2r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 823c86818738..4cb7744f3d92 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -2,11 +2,11 @@ mistune, docutils } : buildPythonPackage rec { pname = "m2r"; - version = "0.1.14"; + version = "0.1.15"; src = fetchPypi { inherit pname version; - sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add"; + sha256 = "1c358d8bf21ff70e569968d604a0e3c9b05fe01b5f362389235e97bc7c0cd542"; }; propagatedBuildInputs = [ mistune docutils ]; From 230e6bb8914eb7b705e116287ece41a0e1f4edb3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:05 +0200 Subject: [PATCH 118/362] python: mozinfo: 0.9 -> 0.10 --- .../development/python-modules/marionette-harness/mozinfo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 1515c050a3f0..d44dc108ff3d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozinfo"; - version = "0.9"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z"; + sha256 = "dcd53a1b1793340418e1ae42bf300e3e56d8f12047972378c6f9318b220b1023"; }; disabled = isPy3k; From a819881bba870dfb1d117081bd24863016fd2ac6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:12 +0200 Subject: [PATCH 119/362] python: mozlog: 3.7 -> 3.8 --- pkgs/development/python-modules/marionette-harness/mozlog.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index bc4b9e914653..ce24fd48dd4b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mozlog"; - version = "3.7"; + version = "3.8"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9"; + sha256 = "af3a3252bc58f8642a641601ba59096c22e4aa49cdc1ed4b0df2314f4f027f0d"; }; propagatedBuildInputs = [ blessings mozterm six ]; From 0c38fd329f8effaca2046c3c276a723726235508 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:20 +0200 Subject: [PATCH 120/362] python: mozterm: 0.1.0 -> 1.0.0 --- pkgs/development/python-modules/mozterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 98e8d5b4078c..358b21893fa6 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mozterm"; - version = "0.1.0"; + version = "1.0.0"; # name 'unicode' is not defined disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561"; + sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4"; }; meta = with lib; { From e264d92932e50d195db62d8bac45ca1d82e227d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:27 +0200 Subject: [PATCH 121/362] python: msgpack-numpy: 0.4.3 -> 0.4.3.1 --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index cae571fe2f5c..e04e9d1e802d 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.3"; + version = "0.4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126"; + sha256 = "31fd5dd009bbee7f8b107db8c859e3a0a2793acc196f25ffbbae1e71b4c63ca5"; }; buildInputs = [ From 73ba0b24fc4121ac6a9a556363d8ea098e3cbe4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:34 +0200 Subject: [PATCH 122/362] python: mutagen: 1.40.0 -> 1.41.0 --- pkgs/development/python-modules/mutagen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 46658520cb58..054d0247600a 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj"; + sha256 = "dab6038c7f0e17c1b67fb8f56303e8be21e73ac47760f1a8e716856f1bdf5057"; }; checkInputs = [ From 7fd77f535f1e90fa6d7857efce8b946437f0aedf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:41 +0200 Subject: [PATCH 123/362] python: mypy: 0.610 -> 0.620 --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 65cdf79059df..021f3461e535 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.610"; + version = "0.620"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0fc7h7hf9042nlqczdvj2ngz2hc7rcnd35qz5pb840j38x9n8wpl"; + sha256 = "c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c"; }; disabled = !isPy3k; From fae2795c043484aa941a76054ee059b53e2e6c37 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:49 +0200 Subject: [PATCH 124/362] python: mysqlclient: 1.3.12 -> 1.3.13 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 9aabd6d94e2c..41e1d4cb10bb 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.12"; + version = "1.3.13"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5"; + sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f"; }; meta = with stdenv.lib; { From 2bd85b8f61f254c0d715e27c73ce75b78cb0a827 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:13:56 +0200 Subject: [PATCH 125/362] python: natsort: 5.3.2 -> 5.3.3 --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index e32c712560a5..e952129f15d9 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.3.2"; + version = "5.3.3"; checkInputs = [ hypothesis @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "94056276c41be501d9fad3ade61d4eb4edf3b37fea53829b3294b75dc1d23708"; + sha256 = "da930bfddce941526955dea8d35a44243c96adf919ceb758ba7bbd1ba5b0a39a"; }; # testing based on project's tox.ini From 154c08861477bd450454c681cad7e9334e1bfc9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:03 +0200 Subject: [PATCH 126/362] python: ncclient: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 27fc7d11e751..d8a6499d136d 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.5.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b"; + sha256 = "da7f7dfb8a60711610139e894b41ebcab3cd7103b78439ad5e9e91c2d3cfa423"; }; checkInputs = [ nose rednose ]; From 6cb00d57ac62b11576b0ce53819aa590fc209704 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:10 +0200 Subject: [PATCH 127/362] python: nipype: 1.0.4 -> 1.1.0 --- 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 ccfd35dc646b..aca430028980 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4c3c1eb15fc016457525d1f7eb701d1bbe595eb48a036ae8dc2d21b843f9e525"; + sha256 = "2a5ebbc9244a18e3b2d83a9639da09248e92bc0742b81a86550ef1a18c1fccbc"; }; # see https://github.com/nipy/nipype/issues/2240 From 06fd9d6a265581c77df9083b8796bbe08f393abb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:19 +0200 Subject: [PATCH 128/362] python: notebook: 5.5.0 -> 5.6.0 --- 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 15f93878ab71..8a9a82b25698 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664"; + sha256 = "e2c8e931cc19db4f8c63e6a396efbc13a228b2cb5b2919df011b946f28239a08"; }; LC_ALL = "en_US.utf8"; From 8c02abd208241edb01e44f2f5c8cb46f98a5cf12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:27 +0200 Subject: [PATCH 129/362] python: numba: 0.38.1 -> 0.39.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 33d044c41aa0..48ca5a80addf 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.38.1"; + version = "0.39.0"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "48fb76b8dcde868d6426c7c7836b76a0b2b20861547770c27b6307f712c09bc5"; + sha256 = "07749d1ddac8c4c0ce8b22bf3dec52ef2fd4922174c71447126807f5f8dc2bae"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From dc92b5d4fe746d28f46495fdc482770ddb9203fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:35 +0200 Subject: [PATCH 130/362] python: numexpr: 2.6.5 -> 2.6.6 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 8ba4e0061fa3..09f6c6636c1a 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.6.5"; + version = "2.6.6"; src = fetchPypi { inherit pname version; - sha256 = "f8ad8014085628eab91bc82fb9d10cf9ab8e04ede4884e4a1061445d395b36bb"; + sha256 = "97c1f7fa409439ae933494014cd41d43de84cfe6c98b7f93392f94d54de1b453"; }; propagatedBuildInputs = [ numpy ]; From 362f8bfcb09d043e6b4bcbc51c6ba3312d1fda99 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:42 +0200 Subject: [PATCH 131/362] python: numpy-stl: 2.4.1 -> 2.7.0 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 2ec5066e5fc4..e4a9aa67dfda 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.4.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "33e88013ed2f4f9ec45598f0e0930a0d602ab3c49aa19e92703a867f37ffe520"; + sha256 = "ede911118cfee5a8fd4c341b418fc55bfcd70a557686febc4efb6693297e3aa2"; }; checkInputs = [ pytest pytestrunner ]; From 9691b50b0719fb3189a0976c6e683935a9b0f7f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:14:48 +0200 Subject: [PATCH 132/362] python: outcome: 0.1.0a0 -> 0.1.0 --- pkgs/development/python-modules/outcome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index e91925c75d50..9525be4cb341 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "0.1.0a0"; + version = "0.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn"; + sha256 = "d54e5d469088af53022f64a753b288d6bab0fe42e513eb7146137d560e2e516e"; }; checkInputs = [ pytest ]; From 2b3f304bba238738b768dc0e37b83b2b4c022f71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:02 +0200 Subject: [PATCH 133/362] python: pandas: 0.23.1 -> 0.23.3 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ef07f2a36e32..962ba60a734c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.23.1"; + version = "0.23.3"; src = fetchPypi { inherit pname version; - sha256 = "50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690"; + sha256 = "9cd3614b4e31a0889388ff1bd19ae857ad52658b33f776065793c293a29cf612"; }; LC_ALL = "en_US.UTF-8"; From 7b6a42f3a90f8fb0b82a73d55611db4c5518e8ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:08 +0200 Subject: [PATCH 134/362] python: paramz: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/paramz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index daca12f66c09..718393b5e1e1 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "paramz"; - version = "0.9.1"; + version = "0.9.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf"; + sha256 = "7b38c2487602c423ac402214c3b3fa6bbe22b294e2f9e5f9f3842182e1541599"; }; propagatedBuildInputs = [ numpy scipy six decorator ]; From 561b9221f1afd2a58238aed1d85840a1593fa192 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:15 +0200 Subject: [PATCH 135/362] python: parso: 0.2.1 -> 0.3.1 --- pkgs/development/python-modules/parso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 7f3bc9cf4821..c29901b2e99a 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f"; + sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2"; }; checkInputs = [ pytest ]; From 4de44d626a53349b58f2f0faaa9a0fe8f84cd2e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:22 +0200 Subject: [PATCH 136/362] python: pbr: 4.0.4 -> 4.1.1 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 764319a1a0d7..666df965f87b 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "4.0.4"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "a9c27eb8f0e24e786e544b2dbaedb729c9d8546342b5a6818d8eda098ad4340d"; + sha256 = "754e766b4f4bad3aa68cfd532456298da1aa39375da8748392dbae90860d5f18"; }; # circular dependencies with fixtures From 0724e284c1923d1dbf5b71cf775de93ad7572ac2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:28 +0200 Subject: [PATCH 137/362] python: phonenumbers: 8.9.8 -> 8.9.10 --- 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 b797e6e76a0b..79a5a646eada 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.9.8"; + version = "8.9.10"; src = fetchPypi { inherit pname version; - sha256 = "7813a9d45f0d1386a23552072af20a3ef34fa34f76eeb9033743ff083f9551e1"; + sha256 = "cbb8194814cc026f476132c38c507adbd459bc8ee99be39f421650ab1b986ed7"; }; meta = { From 4a41d0fd81daef995db4c4baf2dda3068c89df5e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:35 +0200 Subject: [PATCH 138/362] python: Pillow: 5.1.0 -> 5.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 44399f34bda1..22bd2fd82467 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.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"; + sha256 = "f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab"; }; doCheck = !stdenv.isDarwin && !isPyPy; From f0a0672040ed377894f3ec7f41c80caa4c4be19b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:41 +0200 Subject: [PATCH 139/362] python: pip: 10.0.1 -> 18.0 --- 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 20558312f290..f5732d2cb953 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "10.0.1"; + version = "18.0"; src = fetchPypi { inherit pname version; - sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"; + sha256 = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From c13d800b2c298104b0d60909d2f57d23e7ffd751 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:48 +0200 Subject: [PATCH 140/362] python: plaster_pastedeploy: 0.5 -> 0.6 --- .../python-modules/plaster-pastedeploy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 5675be323973..ac6cdc31f485 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "plaster_pastedeploy"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "70a3185b2a3336996a26e9987968cf35e84cf13390b7e8a0a9a91eb8f6f85ba9"; + sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; }; checkPhase = '' From 341908bb85882b7c00a35d52573daa281a57b22d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:15:54 +0200 Subject: [PATCH 141/362] python: plotly: 2.7.0 -> 3.1.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6a1993e1fd17..9d2df2a89ebd 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.7.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f7305816a423fd899da20919282445703118aeece19a54fb97be4cbf302341f8"; + sha256 = "015a5b8ca616d19eb96433dd597c3ccccc80e3afba02a23bd526a017ff4fce05"; }; propagatedBuildInputs = [ From 2d9a06904c0c1951666dd6acad5bf2e4031c0592 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:00 +0200 Subject: [PATCH 142/362] python: preshed: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/preshed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index ba1537a02c87..14baf995e6b9 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -8,11 +8,11 @@ }: buildPythonPackage rec { pname = "preshed"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6"; + sha256 = "7b99ace606143a922163a7ff7ad4969b296288f5b20b9c9bda328caec3b92f71"; }; propagatedBuildInputs = [ From 0d18e3c02e2aadcce988ba34797b5e2d8cccbb19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:07 +0200 Subject: [PATCH 143/362] python: progressbar: 2.3 -> 2.5 --- pkgs/development/python-modules/progressbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 59ef547dba36..a8e8bf07ad56 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "progressbar"; - version = "2.3"; + version = "2.5"; # https://github.com/niltonvolpato/python-progressbar/issues/54 disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; + sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63"; }; # invalid command 'test' From 1d3881c45c2b15029e8e91b9cd3e4d4fd587212c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:13 +0200 Subject: [PATCH 144/362] python: prometheus_client: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/prometheus_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index f6b2bfa939c6..be014bc0f7ec 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1r3510jq6iryd2a8jln2qpvqy112y5502ncbfkn116xl7gj74r6r"; + sha256 = "69494dc1ac967c0f626c8193e439755c2b95dd4ed22ef31c277601778a50c7ff"; }; doCheck = false; From 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2018 21:50:19 +0200 Subject: [PATCH 145/362] Take me (viric) out of most maintenance Since years I'm not maintaining anything of the list below other than some updates when I needed them for some reason. Other people is doing that maintenance on my behalf so I better take me out but for very few packages. Finally! --- pkgs/applications/audio/mikmod/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 2 +- pkgs/applications/graphics/giv/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/paraview/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- pkgs/applications/graphics/rawtherapee/default.nix | 2 +- pkgs/applications/graphics/sane/xsane.nix | 2 +- pkgs/applications/graphics/smartdeblur/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/dmenu/default.nix | 2 +- pkgs/applications/misc/eaglemode/default.nix | 2 +- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- pkgs/applications/misc/navit/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/st/default.nix | 2 +- pkgs/applications/misc/truecrypt/default.nix | 2 +- pkgs/applications/misc/xterm/default.nix | 2 +- pkgs/applications/networking/browsers/links2/default.nix | 2 +- .../applications/networking/instant-messengers/qtox/default.nix | 2 +- .../networking/instant-messengers/toxic/default.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/git.nix | 2 +- pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 +- pkgs/applications/networking/pjsip/default.nix | 2 +- pkgs/applications/networking/znc/default.nix | 2 +- pkgs/applications/office/homebank/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/still.nix | 2 +- pkgs/applications/science/electronics/gtkwave/default.nix | 2 +- pkgs/applications/science/electronics/ngspice/default.nix | 2 +- pkgs/applications/video/avidemux/default.nix | 2 +- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 2 +- pkgs/applications/window-managers/tabbed/default.nix | 2 +- pkgs/applications/window-managers/vwm/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.7/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 2 +- pkgs/development/compilers/llvm/6/llvm.nix | 2 +- pkgs/development/compilers/mono/generic-cmake.nix | 2 +- pkgs/development/compilers/mono/generic.nix | 2 +- pkgs/development/interpreters/octave/default.nix | 2 +- pkgs/development/libraries/filter-audio/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/libsodium/default.nix | 2 +- pkgs/development/libraries/libtoxcore/new-api.nix | 2 +- pkgs/development/libraries/openct/default.nix | 2 +- pkgs/development/libraries/opencv/3.x.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/ucommon/default.nix | 2 +- pkgs/development/libraries/vtk/default.nix | 2 +- pkgs/development/tools/cdecl/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 2 +- pkgs/development/tools/misc/openocd/default.nix | 2 +- pkgs/games/asc/default.nix | 2 +- pkgs/games/dxx-rebirth/default.nix | 2 +- pkgs/games/rigsofrods/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 2 +- pkgs/games/xmoto/default.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- pkgs/os-specific/linux/batman-adv/default.nix | 2 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 2 +- pkgs/os-specific/linux/v4l-utils/default.nix | 2 +- pkgs/servers/bird/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/mail/dovecot/default.nix | 2 +- pkgs/servers/sip/freeswitch/default.nix | 2 +- pkgs/servers/sip/sipwitch/default.nix | 2 +- pkgs/tools/backup/dar/default.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 2 +- pkgs/tools/graphics/jhead/default.nix | 2 +- pkgs/tools/misc/mktorrent/default.nix | 2 +- pkgs/tools/misc/pv/default.nix | 2 +- pkgs/tools/misc/remind/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/inadyn/default.nix | 2 +- pkgs/tools/networking/isync/default.nix | 2 +- pkgs/tools/networking/nuttcp/default.nix | 2 +- pkgs/tools/networking/nylon/default.nix | 2 +- pkgs/tools/security/ccid/default.nix | 2 +- pkgs/tools/security/opensc/default.nix | 2 +- pkgs/tools/security/pcsclite/default.nix | 2 +- pkgs/tools/security/pcsctools/default.nix | 2 +- pkgs/tools/text/dos2unix/default.nix | 2 +- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/tools/typesetting/htmldoc/default.nix | 2 +- pkgs/tools/typesetting/pdftk/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- 104 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 343ec8679feb..42fa8b7621a5 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c2ead5a19141..f9220e107f3c 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [viric mpickering]; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index dea3fd4e3c61..fbc84521de08 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 8107ed8aa449..1c5b8d1b81dd 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric hrdinka ]; + maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1d9956245a63..9839bb740778 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric guibert]; + maintainers = with stdenv.lib.maintainers; [guibert]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index a3151238438b..140903766848 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -77,7 +77,7 @@ buildDotnetPackage rec { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index eb97a2b9b3b6..52cdc0bc0676 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ca0f49e0c948..09b431fdb116 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric peti]; + maintainers = with stdenv.lib.maintainers; [peti]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 55c856c19127..377a5ae61687 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Y-Vladimir/SmartDeblur; description = "Tool for restoring blurry and defocused images"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0fa859ac84bb..0a98f387ff86 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { description = "Comprehensive e-book software"; homepage = https://calibre-ebook.com; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ viric domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; platforms = platforms.linux; inherit version; }; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3b620fc0606c..3ee2006ab0c0 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; license = licenses.mit; - maintainers = with maintainers; [ viric pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index d83eb1ed86a7..b08ce5baa5b6 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://eaglemode.sourceforge.net; description = "Zoomable User Interface"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = true; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index d1befec34082..70a6efb90ddc 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 1857c3118ddd..bce2a79cde33 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ viric vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 447fc4570a76..9a40e3bc1053 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 92269e03e58d..362d28d2607f 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 35931707ed6b..40432c18aa38 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; - maintainers = with maintainers; [ domenkozar viric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 3562a4f9b168..e5cfa145bc25 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { homepage = https://st.suckless.org/; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; - maintainers = with maintainers; [viric andsild]; + maintainers = with maintainers; [andsild]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 48e0d19e20b9..5bb614ac68b1 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = http://www.truecrypt.org/; license = "TrueCrypt License Version 2.6"; - maintainers = with stdenv.lib.maintainers; [ viric ryantm ]; + maintainers = with stdenv.lib.maintainers; [ ryantm ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 8b15b0307897..aa36ccd49e23 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [viric vrthra]; + maintainers = with stdenv.lib.maintainers; [vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index bb8eb83d6bf0..ff165f99ae9b 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = with maintainers; [ raskin viric ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index f1d33b83fd0c..fa481b7fe663 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -44,7 +44,7 @@ in mkDerivation rec { description = "Qt Tox client"; homepage = https://tox.chat; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; + maintainers = with maintainers; [ jgeerds akaWolf peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 8a45e988c07d..646b41cfe75a 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 13f7bce49218..8f1960b58cd8 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -62,7 +62,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ viric jgeerds wkennington ]; + maintainers = with maintainers; [ jgeerds wkennington ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index e15c3588c298..8e1777b0ce79 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 9763c0ee97fa..9428b2764585 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a5d861093c90..a1f275723966 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ Anton-Latukha viric ]; + maintainers = with maintainers; [ Anton-Latukha ]; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 2a4991b9318f..f7f989dc3a9d 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = http://pjsip.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric olynch]; + maintainers = with stdenv.lib.maintainers; [olynch]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 80b1e9caeaa9..30fa41de12d1 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; homepage = https://wiki.znc.in/ZNC; - maintainers = with maintainers; [ viric schneefux lnl7 ]; + maintainers = with maintainers; [ schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 28b85936a281..94e0e46767a0 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7125343dee67..b2f063860032 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -278,7 +278,7 @@ in stdenv.mkDerivation rec { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = https://libreoffice.org/; license = licenses.lgpl3; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5958a5aa79e4..eb99cac8e9ec 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -275,7 +275,7 @@ in stdenv.mkDerivation rec { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; homepage = https://libreoffice.org/; license = licenses.lgpl3; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index d4cf7f5ea907..78c981ded56f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "VCD/Waveform viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index af2ee49daee9..196374706e1f 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ bgamari viric rongcuid ]; + maintainers = with maintainers; [ bgamari rongcuid ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 0637e813b48c..5fcab43c86ba 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; - maintainers = with maintainers; [ viric abbradar ma27 ]; + maintainers = with maintainers; [ abbradar ma27 ]; # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 3a595da96d07..a76608bdd900 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A script system that allows advanced non-linear editing"; homepage = https://github.com/avxsynth/avxsynth; license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; broken = true; # 2018-04-10 }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 05d8c1edec29..742c2fb03f7c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric eelco ]; + maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 5e1098e97064..3bb79f6a77da 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 8ed144a32ea4..3423b0e181d5 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 943391611de1..101a6feeeae3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -443,7 +443,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index bf3b192e1bbd..1df87cc3d429 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -462,7 +462,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0564329967e5..1215c971f239 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -461,7 +461,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 50d55aef2342..0fb390758954 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -469,7 +469,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 25bb08284142..accdfbf23b56 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 7dc134b4fcfd..388da007d33d 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 98b6f4adbbf6..e540469c6278 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 8cfcb1af43d4..d7324665240f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c974eb6f6d39..dfeddf2fe65a 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -169,7 +169,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 514c3a006e38..8cfeb02225a8 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -158,7 +158,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 68eebc33c6b9..3a6dea806f3c 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index a86f5b5039e7..4d981398b9aa 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index c8afd0dcc906..57d5fc0c83b7 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; darwin ++ linux; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e39de76117af..06dcfb8b3933 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = stdenv.lib.platforms.x86; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? } // meta; } diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ce3ce584434f..f6bd96af40f5 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = if overridePlatforms == null then (with stdenv.lib.platforms; linux ++ darwin) else overridePlatforms; diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 3faba45714a0..9dc0776f08a7 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight audio filtering library made from webrtc code"; license = licenses.bsd3; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 5790672d8e51..f524c9402558 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 0b341b38917d..f2f8aed065f0 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A modern and easy-to-use crypto library"; homepage = http://doc.libsodium.org/; license = licenses.isc; - maintainers = with maintainers; [ raskin viric wkennington ]; + maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 785bc6f3c843..401d9c7d8a2e 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5eb08ecd6014..bddb0e1479e2 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/openct/; license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 264c05e1af9d..d2c2cec62213 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -277,7 +277,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; + maintainers = with stdenv.lib.maintainers; [mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d2d106827169..66a840fa2a9e 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; license = licenses.bsd3; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 8665be26925e..416cf53ab496 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index bdfe3d1c5c60..b85d76640cf0 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 388f6b0db439..7981681a6414 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [viric joelteon]; + maintainers = with stdenv.lib.maintainers; [joelteon]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 32c888b7e62f..31e720b13f29 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 73c5b7623184..cea86f090d6a 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://openocd.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 6b7ead6d2030..c8f5deef9240 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index e48ac612b32d..5334e4cbd12c 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { description = "Source Port of the Descent 1 and 2 engines"; homepage = https://www.dxx-rebirth.com/; license = licenses.free; - maintainers = with maintainers; [ viric peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index e75698e72799..274a095de6f4 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 10ce55f4e217..4bf03fec9de9 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index e43d01d2ecaf..a0fc6d5ca718 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Obstacled race game"; homepage = http://xmoto.tuxfamily.org; - maintainers = with maintainers; [ raskin viric pSub ]; + maintainers = with maintainers; [ raskin pSub ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3b95907a7893..9ccda9178f10 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 79d3a0613dcc..4a98b4f169dd 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index bfd79cb42dc5..9ac696621307 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = https://busybox.net/; license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index a09fa93cb782..fc13d97429c2 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 83ca21719faa..b29cf88f168f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/raspberrypi/firmware; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg viric tavyc ]; + maintainers = with maintainers; [ dezgeg tavyc ]; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 7f4c9dae166a..91e6e7f4cc59 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/raspberrypi/userland; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg viric tavyc ]; + maintainers = with maintainers; [ dezgeg tavyc ]; }; } diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index fee9b0c09d56..3665606e99c8 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = https://linuxtv.org/projects.php; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 94bd92abb4f8..fc7acc35c19a 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -28,7 +28,7 @@ let description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ff99f7a7cbf6..6a2efdcc3601 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [viric peti]; + maintainers = with stdenv.lib.maintainers; [peti]; platforms = with stdenv.lib.platforms; unix; outputsToInstall = [ "out" "dnsutils" "host" ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5a9d8e61b1fe..acd08f658e66 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ]; + maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 0e31cd8fe08e..32acba433b12 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 0ba5a3ee5adb..9a6f2b0b5e1a 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 99c0bd4a34ca..e0b4d1fee124 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index d4b6b9a72eba..ee14f2d6781d 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -37,7 +37,7 @@ python2Packages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = http://www.nongnu.org/duplicity; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric peti ]; + maintainers = with maintainers; [ peti ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index b0c33212edb3..9fe4f90f258b 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 2fb1c9325c03..7bdb3444a4c1 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; - maintainers = with maintainers; [ viric rycee ]; + maintainers = with maintainers; [ rycee ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 6f56267ebf72..da1e8be7cf49 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [viric Profpatsch]; + maintainers = with stdenv.lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index f453199835f5..8c965da451d7 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ viric jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ jgeerds ]; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 8dcc9ef81ff6..d9933e0018f9 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; + maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 6d99a5c2d1a5..ab8d257d7c76 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar viric garbas chaoflow ]; + maintainers = with maintainers; [ domenkozar garbas chaoflow ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 2bd76188a638..6178181193cf 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://troglobit.com/project/inadyn/; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 7dcfc6b512fb..581a45eaebb9 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny viric ]; + maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 23cce602875a..34a34ef903d2 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; homepage = http://nuttcp.net/; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index bc026d6835b8..5c8f98101eed 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ edwtjo viric ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 9eb5858b0573..903794622fb0 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7624e6cfa39e..70a1beb8ce7c 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Set of libraries and utilities to access smart cards"; homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 84072fd2840e..495b6ee48ea7 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = https://pcsclite.apdu.fr/; license = licenses.bsd3; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index d9e68c77d25c..5b67a6d89ceb 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { description = "Tools used to test a PC/SC driver, card or reader"; homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 59697891b6a3..2db82c36a72a 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; license = licenses.bsd2; - maintainers = with maintainers; [viric ndowens ]; + maintainers = with maintainers; [ndowens ]; }; } diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 38362333cadd..514085bee64e 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { homepage = http://kdiff3.sourceforge.net/; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index b9d5407c68de..d6c4fedc1434 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Converts HTML files to PostScript and PDF"; homepage = https://michaelrsweet.github.io/htmldoc; license = licenses.gpl2; - maintainers = with maintainers; [ viric shanemikel ]; + maintainers = with maintainers; [ shanemikel ]; platforms = with platforms; linux ++ darwin; longDescription = '' diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 71cc1738837c..72f25ef099bc 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "Simple tool for doing everyday things with PDF documents"; homepage = https://www.pdflabs.com/tools/pdftk-server/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 4eec47e9e759..8be028730377 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = http://rtmpdump.mplayerhq.hu/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; }; } From 36701d4af71bea5d042128effa4f665d28ee403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2018 21:33:16 +0200 Subject: [PATCH 146/362] Openssl in coreutils makes *sum programs much faster. sha256sum, md5sum, etc. --- pkgs/tools/misc/coreutils/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 589c58d0acc0..d904cbcd449f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages , autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, openssl ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = - optional (singleBinary != false) + configureFlags = optional (openssl != null) "--with-openssl" + ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gmp ] + buildInputs = [ gmp openssl ] ++ optional aclSupport acl ++ optional attrSupport attr ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. - enableParallelBuilding = false; + enableParallelBuilding = true; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; From cd91d1ad9f108182b78ebfd6f72f0924fe843c09 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Jul 2018 23:07:25 -0400 Subject: [PATCH 147/362] setup.sh: add HOST_PATH HOST_PATH contains the path of the host package. This will include the packages listed in buildInputs & depsHostHost. Use this to find runtime commands that the host needs. For instance to find the runtime version of perl, $ PATH="$HOST_PATH" command -v perl /nix/store/...-perl-5.28.0-aarch64-unknown-linux-android/bin/perl This path should not be executed directly (it will break for cross compilation). Only use it to find the location of executables that will be run by your host system. Your build tools will, as always, be available on the default PATH. --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c5feffcea99b..8b98aac1146d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -504,6 +504,10 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi + if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then + addToSearchPath HOST_PATH "$pkg/bin" + fi + if [[ -f "$pkg/nix-support/setup-hook" ]]; then local oldOpts="$(shopt -po nounset)" set +u From 04e21a073b5c5db2e1748a62e412b3dc01c6de1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 10:00:29 +0200 Subject: [PATCH 148/362] python.pkgs.pytest-flake8: disable test, fix build --- pkgs/development/python-modules/pytest-flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 101594750fd5..1d7447293dfa 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkPhase = '' - pytest . + pytest . -k "not test_mtime_caching" ''; meta = { From 3afce33daab17b7f5b6423f5678ba012494dcc8a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 10:00:29 +0200 Subject: [PATCH 149/362] python.pkgs.pytest-flake8: disable test, fix build --- pkgs/development/python-modules/pytest-flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 101594750fd5..1d7447293dfa 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkPhase = '' - pytest . + pytest . -k "not test_mtime_caching" ''; meta = { From 535a8356781b5c64a8c7e0d86b262b0d8475b38f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 23 Jul 2018 20:36:35 +0200 Subject: [PATCH 150/362] parallel: 20180622 -> 20180722 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index b884a23ca7bc..f92f03c4cc79 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180622"; + name = "parallel-20180722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j"; + sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg"; }; nativeBuildInputs = [ makeWrapper perl ]; From ce2637c97a1d6c59d29fad62678e5f3c261df59a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 23 Jul 2018 15:22:48 -0400 Subject: [PATCH 151/362] mkDerivation: depsHostBuild -> depsHostHost `depsHostBuild` is not a thing, would never be a thing per the rules, and isn't used anywhere. This is just my typo, hitherto unnoticed because "host -> host" dependencies are by far the most obscure form. --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 778f107f71e1..45b83ce50d13 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -192,14 +192,14 @@ rec { depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; - depsHostBuild = lib.elemAt (lib.elemAt dependencies 1) 0; + depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; - depsHostBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; + depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; From 18f517fbd626ee0d4502f2237bbcc837366b4c74 Mon Sep 17 00:00:00 2001 From: Matthew Stewart Date: Sat, 14 Jul 2018 11:32:10 -0400 Subject: [PATCH 152/362] Enable new dtags in a way that works with binutils 2.30. In 3027bca, binutils was upgraded from 2.28.1 to 2.30. However, in 2.30, the ldmain.c file within binutils, which the nixpkgs new-dtags.patch file is meant to modify, was changed in such a way that the patch no longer works. As a result, the new dtags are not actually enabled, and binaries are built with RPATH set instead of RUNPATH, thereby preventing LD_LIBRARY_PATH from overriding this built-in path. This change corrects this. The patch file is no longer necessary because binutils's ldmain.c now sets link_info.new_dtags based on the configuration flags. This was probably not noticed immediately because, when the derivation is built with nix-build, the fixupPhase runs patchelf --shrink-rpath. patchelf converts any RPATH in the binary into RUNPATH (unless --force-rpath is specified). Of course, if the binary is built without nix-build (such as in a nix-shell), this never occurs, and any RPATH in the binary is left in place. --- pkgs/development/tools/misc/binutils/default.nix | 10 +++++----- pkgs/development/tools/misc/binutils/new-dtags.patch | 10 ---------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/new-dtags.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 2badd0ed26a9..890ff7b64a91 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -26,11 +26,6 @@ stdenv.mkDerivation rec { }); patches = [ - # Turn on --enable-new-dtags by default to make the linker set - # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. - ./new-dtags.patch - # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs. # That requires upstream changes for things to work. So we can patch it to # get the old behaviour by now. @@ -117,6 +112,11 @@ stdenv.mkDerivation rec { "--enable-deterministic-archives" "--disable-werror" "--enable-fix-loongson2f-nop" + + # Turn on --enable-new-dtags by default to make the linker set + # RUNPATH instead of RPATH on binaries. This is important because + # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + "--enable-new-dtags" ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; doCheck = false; # fails diff --git a/pkgs/development/tools/misc/binutils/new-dtags.patch b/pkgs/development/tools/misc/binutils/new-dtags.patch deleted file mode 100644 index eea6f8c39d57..000000000000 --- a/pkgs/development/tools/misc/binutils/new-dtags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- binutils/ld/ldmain.c -+++ binutils/ld/ldmain.c -@@ -296,6 +296,7 @@ main (int argc, char **argv) - - link_info.allow_undefined_version = TRUE; - link_info.keep_memory = TRUE; -+ link_info.new_dtags = TRUE; - link_info.combreloc = TRUE; - link_info.strip_discarded = TRUE; - link_info.callbacks = &link_callbacks; From 13904b44e36853f401826009f61231bd619b6c3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Jul 2018 19:18:06 -0500 Subject: [PATCH 153/362] Revert "meson: 0.46.1 -> 0.47.0" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d. (cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d) Signed-off-by: Domen Kožar --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 2ccd6637d088..3cb906d50edf 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,12 +2,12 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.47.0"; + version = "0.46.1"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6"; + sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; }; postFixup = '' From 911b7b20c0f40547aff59b3fdedf408539d4303a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Jul 2018 23:48:29 +0200 Subject: [PATCH 154/362] elixir: init 1.7.0 --- pkgs/development/beam-modules/default.nix | 29 +++++++++++-------- pkgs/development/interpreters/elixir/1.7.nix | 7 +++++ .../interpreters/elixir/generic-builder.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.7.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f10c8ec86ff9..26bed216acfa 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,25 +44,30 @@ let # BEAM-based languages. elixir = elixir_1_6; + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + inherit rebar erlang; + debugInfo = true; + }; + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix new file mode 100644 index 000000000000..426e5a4cbba0 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.7.0"; + sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 78598ce3d81e..7d3c6476131d 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -37,7 +37,7 @@ in preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -v rebar + rm -vf rebar ln -s ${rebar}/bin/rebar rebar substituteInPlace Makefile \ diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3440bfafb110..da5fed4be4b9 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; From 4301f221972a7146619a59f04ccf8a990ef6b7bb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Jul 2018 00:16:21 +0200 Subject: [PATCH 155/362] vim-plugins: automatic updates --- pkgs/misc/vim-plugins/default.nix | 156 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8a9580d99e17..34699940f0cc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -455,11 +455,11 @@ let }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-19"; + name = "deoplete-nvim-2018-07-22"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "0f1921799644cd662cb0a3393ba71096e5e56115"; - sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2"; + rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; + sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; }; dependencies = []; @@ -609,11 +609,11 @@ let }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-04-15"; + name = "clighter8-2018-07-25"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "6d325abd043fd1bc31bea821f751996541bfc944"; - sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; + rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; + sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; }; dependencies = []; preFixup = '' @@ -623,11 +623,11 @@ let }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-07-16"; + name = "neomake-2018-07-23"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "f26a31a315f60150fd42682df911306b4d795dd8"; - sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w"; + rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163"; + sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0"; }; dependencies = []; @@ -876,11 +876,11 @@ let }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-07-07"; + name = "vim-2018-07-23"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33"; - sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm"; + rev = "d329d61c1752807059aef388c4e9629296760a35"; + sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; }; dependencies = []; @@ -920,11 +920,11 @@ let }; editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2017-10-14"; + name = "editorconfig-vim-2018-07-25"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "0abb0634a8bf3c760a283e9e7475594b83869a46"; - sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21"; + rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; + sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; }; dependencies = []; @@ -986,11 +986,11 @@ let }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-04-05"; + name = "vim-localvimrc-2018-07-23"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; - sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; + rev = "a3cb22a68625e022df1da402361801cc817bcec5"; + sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc"; }; dependencies = []; @@ -1041,11 +1041,11 @@ let }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-07-18"; + name = "vim-go-2018-07-22"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b"; - sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk"; + rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585"; + sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1"; }; dependencies = []; @@ -1349,11 +1349,11 @@ let }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2017-11-17"; + name = "vim-orgmode-2018-07-25"; src = fetchgit { url = "https://github.com/jceb/vim-orgmode"; - rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637"; - sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9"; + rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; + sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; }; dependencies = []; @@ -1371,11 +1371,11 @@ let }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2016-06-14"; + name = "tslime-vim-2018-07-23"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim"; - rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2"; - sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1"; + rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; + sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; }; dependencies = []; @@ -1448,11 +1448,11 @@ let }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-07-11"; + name = "fzf-vim-2018-07-22"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109"; - sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj"; + rev = "6ce58caad320be3cf9ff5d275191f88524edf326"; + sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf"; }; dependencies = []; @@ -1580,11 +1580,11 @@ let }; swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "swift-vim-2018-04-20"; + name = "swift-vim-2018-07-21"; src = fetchgit { url = "https://github.com/keith/swift.vim"; - rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996"; - sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3"; + rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; + sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; }; dependencies = []; @@ -1679,11 +1679,11 @@ let }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-07-13"; + name = "vimtex-2018-07-25"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "e3dabe0a369dac556508ac5d1132979d654bc753"; - sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2"; + rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c"; + sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n"; }; dependencies = []; @@ -1870,22 +1870,22 @@ let }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-07-08"; + name = "vim-signify-2018-07-25"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "9303070b022c4a642a8d35361e3680622c525144"; - sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz"; + rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc"; + sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-07-03"; + name = "vim-startify-2018-07-21"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde"; - sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s"; + rev = "8cde338d1f35057fd64146090c960a55b953dcd9"; + sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29"; }; dependencies = []; @@ -2094,11 +2094,11 @@ let }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-06-13"; + name = "python-mode-2018-07-23"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6"; - sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f"; + rev = "d241974f40e8d206f9970e51fb0069951862ba35"; + sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci"; }; dependencies = []; @@ -2334,11 +2334,11 @@ let }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-07-19"; + name = "denite-nvim-2018-07-22"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "0cab5543d755be4a6c9d331672b07235f8473f1f"; - sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0"; + rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8"; + sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r"; }; dependencies = []; @@ -2672,11 +2672,11 @@ let }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-07-18"; + name = "vim-dispatch-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "43760f9d8469d59fd629a97e19dce4491192cca6"; - sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90"; + rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b"; + sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh"; }; dependencies = []; @@ -2694,11 +2694,11 @@ let }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-07-18"; + name = "vim-fugitive-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056"; - sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz"; + rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac"; + sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v"; }; dependencies = []; @@ -2727,11 +2727,11 @@ let }; vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2018-07-19"; + name = "vim-rhubarb-2018-07-21"; src = fetchgit { url = "https://github.com/tpope/vim-rhubarb"; - rev = "186bf27e05ab8713193b1d1210cd3c79f392445a"; - sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv"; + rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a"; + sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9"; }; dependencies = []; @@ -2771,11 +2771,11 @@ let }; vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2018-06-15"; + name = "vim-surround-2018-07-23"; src = fetchgit { url = "https://github.com/tpope/vim-surround"; - rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce"; - sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql"; + rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; + sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; }; dependencies = []; @@ -2848,11 +2848,11 @@ let }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-07-24"; + name = "youcompleteme-2018-07-25"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "459b3e620e45191b15c48c66b02ff89f1a0674db"; - sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr"; + rev = "15362d9cb8ec054c929e9a202252825eabe47e58"; + sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy"; }; dependencies = []; buildPhase = '' @@ -2874,11 +2874,11 @@ let }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-07-13"; + name = "vim-airline-2018-07-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2"; - sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw"; + rev = "59f3669a42728406da6d1b948608cae120d1453f"; + sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025"; }; dependencies = []; @@ -2896,11 +2896,11 @@ let }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2018-01-11"; + name = "vim-pandoc-2018-07-23"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "3a686781ab5ea622616798475deb394e48d3cc48"; - sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3"; + rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb"; + sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk"; }; dependencies = []; @@ -3127,33 +3127,33 @@ let }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-06-12"; + name = "vimwiki-2018-07-21"; src = fetchgit { url = "https://github.com/vimwiki/vimwiki"; - rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90"; - sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw"; + rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4"; + sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc"; }; dependencies = []; }; dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-07-15"; + name = "dhall-vim-2018-07-23"; src = fetchgit { url = "https://github.com/vmchale/dhall-vim"; - rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae"; - sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw"; + rev = "5bdddb86e660f172841109a28e2a98efb76448ce"; + sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq"; }; dependencies = []; }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-07-17"; + name = "ale-2018-07-25"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "5453e0e1a43302226da1d1d753e162af0231f9d3"; - sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp"; + rev = "79ffdde267323a206a96227904549c370f27decf"; + sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg"; }; dependencies = []; From 9ac035b5a6664d3b20522267ebd2a3d593dbc7df Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Jul 2018 00:37:14 +0200 Subject: [PATCH 156/362] vim-plugins: add extra plugins - isort - splice - a bunch of tpope's missing plugins --- pkgs/misc/vim-plugins/default.nix | 115 ++++++++++++++++-- pkgs/misc/vim-plugins/vim-plugin-names | 10 +- .../vim2nix/additional-nix-code/vim-isort | 4 + 3 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 34699940f0cc..b3dfed3d265e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -32,7 +32,7 @@ let # Documentation & usage see vim-utils.nix. # attribute names should be the same as used by vim-pi to make dependency # resolution work - self = rec { +self = rec { # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations # which recreates this the following derivations based on ./vim-plugin-names pluginnames2nix = vimUtils.pluginnames2Nix { @@ -454,17 +454,6 @@ let }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; - sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; - }; - dependencies = []; - - }; - ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ultisnips-2018-04-30"; src = fetchgit { @@ -1051,6 +1040,20 @@ let }; + vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-isort-2017-03-12"; + src = fetchgit { + url = "https://github.com/fisadev/vim-isort"; + rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda"; + sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m"; + }; + dependencies = []; + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; + }; + vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-colorschemes-2017-08-22"; src = fetchgit { @@ -2344,6 +2347,17 @@ let }; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2018-07-22"; + src = fetchgit { + url = "https://github.com/shougo/deoplete.nvim"; + rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; + sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; + }; + dependencies = []; + + }; + echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "echodoc-vim-2018-03-26"; src = fetchgit { @@ -2484,6 +2498,17 @@ let ''; }; + fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fugitive-gitlab-vim-2018-07-04"; + src = fetchgit { + url = "https://github.com/shumphrey/fugitive-gitlab.vim"; + rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; + sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; + }; + dependencies = []; + + }; + gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "gundo-vim-2017-05-09"; src = fetchgit { @@ -2495,6 +2520,17 @@ let }; + splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "splice-vim-2017-09-03"; + src = fetchgit { + url = "https://github.com/sjl/splice.vim"; + rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; + sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + }; + dependencies = []; + + }; + last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "last256-2017-06-11"; src = fetchgit { @@ -2660,6 +2696,17 @@ let }; + vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-abolish-2017-03-10"; + src = fetchgit { + url = "https://github.com/tpope/vim-abolish"; + rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd"; + sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m"; + }; + dependencies = []; + + }; + vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-commentary-2018-07-11"; src = fetchgit { @@ -2693,6 +2740,17 @@ let }; + vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-flagship-2018-07-24"; + src = fetchgit { + url = "https://github.com/tpope/vim-flagship"; + rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff"; + sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f"; + }; + dependencies = []; + + }; + vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-fugitive-2018-07-25"; src = fetchgit { @@ -2715,6 +2773,17 @@ let }; + vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-projectionist-2018-07-24"; + src = fetchgit { + url = "https://github.com/tpope/vim-projectionist"; + rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a"; + sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz"; + }; + dependencies = []; + + }; + vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-repeat-2018-07-02"; src = fetchgit { @@ -2737,6 +2806,17 @@ let }; + vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scriptease-2018-07-18"; + src = fetchgit { + url = "https://github.com/tpope/vim-scriptease"; + rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300"; + sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4"; + }; + dependencies = []; + + }; + vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sensible-2018-07-16"; src = fetchgit { @@ -2781,6 +2861,17 @@ let }; + vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tbone-2018-06-27"; + src = fetchgit { + url = "https://github.com/tpope/vim-tbone"; + rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; + sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; + }; + dependencies = []; + + }; + vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-vinegar-2018-06-20"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9e7f70925a20..4d0e85e153ce 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,6 +52,7 @@ "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:FelikZ/ctrlp-py-matcher" +"github:fisadev/vim-isort" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" @@ -194,7 +195,7 @@ "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" -"github:Shougo/deoplete.nvim" +"github:shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -207,8 +208,10 @@ "github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" +"github:shumphrey/fugitive-gitlab.vim" "github:SirVer/ultisnips" "github:sjl/gundo.vim" +"github:sjl/splice.vim" "github:sk1418/last256" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" @@ -224,17 +227,22 @@ "github:tomasr/molokai" "github:tomlion/vim-solidity" "github:tomtom/tlib_vim" +"github:tpope/vim-abolish" "github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-flagship" "github:tpope/vim-fugitive" "github:tpope/vim-pathogen" +"github:tpope/vim-projectionist" "github:tpope/vim-repeat" "github:tpope/vim-rhubarb" +"github:tpope/vim-scriptease" "github:tpope/vim-sensible" "github:tpope/vim-sleuth" "github:tpope/vim-speeddating" "github:tpope/vim-surround" +"github:tpope/vim-tbone" "github:tpope/vim-vinegar" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort new file mode 100644 index 000000000000..febd2185bac3 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort @@ -0,0 +1,4 @@ + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; From 67ef19791914471dc422b18a0c83e57ebb848783 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 26 Jul 2018 12:38:50 +0300 Subject: [PATCH 157/362] iwd: 0.3 -> 0.4 --- pkgs/os-specific/linux/iwd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index de9787a0fa74..833609f9fc2c 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.6"; - sha256 = "0cs0a7rjg9gl9gn9sc3b1y8mv2zbjg7rb87mla6kcrknjci76pgm"; + rev = "0.7"; + sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.3"; + version = "0.4"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "151bqc85vchl1arhl9pyvfashxq886cjrbi6js4csx4vzscbhzzm"; + sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; }; nativeBuildInputs = [ From ed7a2ca061234ff21c0c204859170d58a318717f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:26 +0200 Subject: [PATCH 158/362] python: ptyprocess: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/ptyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index c1c9ce18c560..5de528ccd403 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ptyprocess"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"; + sha256 = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"; }; meta = { From 5d4ab6d266cf684ed87453bb22ca81697feea1cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:33 +0200 Subject: [PATCH 159/362] python: py3exiv2: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/py3exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index ab83e54fd824..d8633488102b 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.3.0"; + version = "0.4.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "14626aaa83cae4cd3d54f51646a0fd048e8ee0e3caf205522b33020226da8c0e"; + sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; }; buildInputs = [ exiv2 boost ]; From 1d63c87262c864abf1368600f2b9fa2e4ad7d318 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:39 +0200 Subject: [PATCH 160/362] python: py3status: 3.8 -> 3.11 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index b5ac0f7b7b1b..e47771d5ca08 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.8"; + version = "3.11"; src = fetchPypi { inherit pname version; - sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb"; + sha256 = "ba6930427d57b79cf344262494fdcbddbf75f6e37794489d445f2ebb8bc53ec5"; }; doCheck = false; propagatedBuildInputs = [ pytz requests tzlocal ]; From f79a68c983d239f4a57ce96f73ed0fca920bb440 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:46 +0200 Subject: [PATCH 161/362] python: pyasn1-modules: 0.2.1 -> 0.2.2 --- 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 35c0d5233005..8c23d2a3f301 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.1"; + version = "0.2.2"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc"; + sha256 = "a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547"; }; propagatedBuildInputs = [ pyasn1 ]; From f208b1bd66c2c479f739faa84d616a54d507c663 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:52 +0200 Subject: [PATCH 162/362] python: pycodestyle: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/pycodestyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 32ef1d547b0b..69b8e2bc0d15 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8"; + sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"; }; meta = with lib; { From 10fd98376d3ab9d0c86d331212f1fc1e5564b74b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:16:59 +0200 Subject: [PATCH 163/362] python: pycryptodome: 3.6.2 -> 3.6.4 --- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 35041f8447ba..27ccc7f4687b 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.6.2"; + version = "3.6.4"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69"; + sha256 = "9c7790ffd291c81b934fe0ca8155a67235d33f70d4914bbf7467a447d9dbcb09"; }; meta = { From 87712ad7ebf12610838337c81b3ff1fbe6a237ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:05 +0200 Subject: [PATCH 164/362] python: pycryptodomex: 3.6.2 -> 3.6.4 --- pkgs/development/python-modules/pycryptodomex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index aa838bc928ea..b5487a24b77c 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.6.2"; + version = "3.6.4"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8ed51799f6c060b4f62459e1bd9f3b3855bec6fa68202e76639d628001fdf3b7"; + sha256 = "4daabe7c0404e673b9029aa43761c779b9b4df2cbe11ccd94daded6a0acd8808"; }; } From f667b56d36ee0f8701ade75fa6705ee2601e86e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:12 +0200 Subject: [PATCH 165/362] python: py: 1.5.3 -> 1.5.4 --- pkgs/development/python-modules/py/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 564946c579a9..14ffb8e2773a 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,16 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"; + sha256 = "3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7"; }; # Circular dependency on pytest doCheck = false; + buildInputs = [ setuptools_scm ]; + meta = with stdenv.lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; homepage = http://pylib.readthedocs.org/; From 1891611271d1d04dbd78820e962c999543c1f9ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:18 +0200 Subject: [PATCH 166/362] python: pyflakes: 1.6.0 -> 2.0.0 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 06b027dd59a8..d833d9a0f683 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "1.6.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"; + sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49"; }; buildInputs = [ unittest2 ]; From 9fde265a9d15666e0afed03f51cde3db3d03733a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:24 +0200 Subject: [PATCH 167/362] python: pygame: 1.9.3 -> 1.9.4 --- pkgs/development/python-modules/pygame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index b6c9ae5e8ba6..8fbd73dfc1f5 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; - sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m"; + sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; }; buildInputs = [ From 9ca0ca3da1d9485c4b0b6eda3d8b175e05957beb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:31 +0200 Subject: [PATCH 168/362] python: pygit2: 0.26.4 -> 0.27.1 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 72e09bf98f92..fda2e0cfbf07 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "0.26.4"; + version = "0.27.1"; src = fetchPypi { inherit pname version; - sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390"; + sha256 = "1aa5ba1d59370bda158950ba4849bb6e59f13ac7e6fca5e392bfd873bd2c1cf9"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From b76c1a47c5e50f5bd1a45374cee70e36fcdefac2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:38 +0200 Subject: [PATCH 169/362] python: pyhomematic: 0.1.44 -> 0.1.46 --- 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 a8946857d88f..4ec77ed96c19 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.44"; + version = "0.1.46"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "09f928d33fefd1ef5d18325877d73d01c6811b6177fc97fc1190c20acc5e12a9"; + sha256 = "0a0ba8de05fc6d60bbb0beec7e808fb231abcb566c3bc17de532f72b18fe2837"; }; # PyPI tarball does not include tests/ directory From aacf5b1e95e4a73656034e724d8ef42aff6fec15 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:44 +0200 Subject: [PATCH 170/362] python: pykdtree: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/pykdtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 86524b6002d6..2dd014821e6b 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776"; + sha256 = "0d49d3bbfa0366dbe29176754ec86df75114a25525b530dcbbb75d3ac4c263e9"; }; buildInputs = [ openmp ]; From 3bbdf27a166f8a6eb7c2428cd13b007d910046e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:51 +0200 Subject: [PATCH 171/362] python: pylint: 1.9.2 -> 2.0.0 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index cd112f7c4e9a..0dcb5181534e 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pylint"; - version = "1.9.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3"; + sha256 = "9cd70527ef3b099543eeabeb5c80ff325d86b477aa2b3d49e264e12d12153bc8"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; From 3396f4e6655525d69ea5de54f36f83f53b337abf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:17:58 +0200 Subject: [PATCH 172/362] python: pylru: 1.0.9 -> 1.1.0 --- pkgs/development/python-modules/pylru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index 79bb6dbd9a2b..b0fd4f4003a4 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pylru"; - version = "1.0.9"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + sha256 = "e03a3d354eb8fdfa11638698e8a1f06cd3b3a214ebc0a120c603a79290d9ebec"; }; meta = with lib; { From 7fa99fe7b40eb49f46586a2e20ea9c569111f721 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:04 +0200 Subject: [PATCH 173/362] python: pymc3: 3.4.1 -> 3.5 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 5af6ef992289..ebf852c09a48 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.4.1"; + version = "3.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b8fe2a1ca142674f1b5cbed05a0a54ce9dade5998370005ddcea349472e7fe2d"; + sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee"; }; # No need for coverage stats in Nix builds From f4e51b3d67a62264e3961c574997361e5d2f793a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:11 +0200 Subject: [PATCH 174/362] python: pymongo: 3.6.1 -> 3.7.1 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 838adeac8a8e..9c8bf84e7c55 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.6.1"; + version = "3.7.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796"; + sha256 = "f14fb6c4058772a0d74d82874d3b89d7264d89b4ed7fa0413ea0ef8112b268b9"; }; doCheck = false; From 883eb392d80341853cb46dba6e30a72afa0feb30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:18 +0200 Subject: [PATCH 175/362] python: pyperclip: 1.6.2 -> 1.6.4 --- pkgs/development/python-modules/pyperclip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 0a972d4864bb..0b0737992547 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.6.4"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "43496f0a1f363a5ecfc4cda5eba6a2a3d5056fe6c7ffb9a99fbb1c5a3c7dea05"; + sha256 = "f70e83d27c445795b6bf98c2bc826bbf2d0d63d4c7f83091c8064439042ba0dc"; }; doCheck = false; From b9d2781db356efc3d931f7298ab229b53502fdfe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:25 +0200 Subject: [PATCH 176/362] python: pytest: 3.6.2 -> 3.6.3 --- 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 1c0ceef83657..2edce6e6ae93 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText }: buildPythonPackage rec { - version = "3.6.2"; + version = "3.6.3"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c"; + sha256 = "0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752"; }; checkInputs = [ hypothesis mock ]; From 29a19eb12c8d1122b15693503d635bd9a0a2cd44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:31 +0200 Subject: [PATCH 177/362] python: pytest-server-fixtures: 1.3.0 -> 1.3.1 --- .../python-modules/pytest-server-fixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index c50795a66698..caede4c18095 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7"; + sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df"; }; buildInputs = [ pytest ]; From e298f9e2b0b01ea1c287238b7917efd3805014c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:38 +0200 Subject: [PATCH 178/362] python: python-axolotl-curve25519: 0.1 -> 0.4.1.post2 --- .../python-modules/python-axolotl-curve25519/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index 91def55c5e44..e372913af7df 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl-curve25519"; - version = "0.1"; + version = "0.4.1.post2"; src = fetchPypi { inherit pname version; - sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3"; }; meta = with lib; { From 9d9d122216ecd57ad750a7808feb4e93a5e94eb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:45 +0200 Subject: [PATCH 179/362] python: python-axolotl: 0.1.39 -> 0.1.42 --- pkgs/development/python-modules/python-axolotl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 1fff6bb76086..44cd69fee363 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl"; - version = "0.1.39"; + version = "0.1.42"; src = fetchPypi { inherit pname version; - sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + sha256 = "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0"; }; propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; From b5e2cb8cae380d0ef15b1329bebbdef456560919 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:52 +0200 Subject: [PATCH 180/362] python: python-fedora: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/python_fedora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index f476d0d4d44a..1ff1f6512645 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "python-fedora"; - version = "0.9.0"; + version = "0.10.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0sf468scw52sw9pzxrnmqs54rix9c4fp1mi2r5k5n7mgjrmf6j0x"; + sha256 = "5516b8c066bb2eb5d604ae8e84c3d31e27753795c5d84f6a792979363756405c"; }; propagatedBuildInputs = [ kitchen requests bunch paver lockfile six munch urllib3 beautifulsoup4 openidc-client ]; From 25a153e578a8079cc7fe8ab92c4e93d69a86f15a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:18:58 +0200 Subject: [PATCH 181/362] python: python_openzwave: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/python_openzwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index d5cf709104fc..7f88946013d8 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.4"; + version = "0.4.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2"; + sha256 = "c12a0eebb0e1919fee978d6a3b7727af8ba1f733c01f595558c83fa746553f5a"; extension = "zip"; }; From b1fd593a41b2311256b18bc38c202cd9a9fd1345 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:05 +0200 Subject: [PATCH 182/362] python: python-telegram-bot: 9.0.0 -> 10.1.0 --- .../python-modules/python-telegram-bot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index d55472179101..5bb20ae8e77c 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "9.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; + sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; }; prePatch = '' From 87502960d030704adfb13499195ce3d5d1e61a5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:11 +0200 Subject: [PATCH 183/362] python: pytools: 2018.4 -> 2018.5.2 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 31092705d0ff..41eac5d2044b 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.4"; + version = "2018.5.2"; src = fetchPypi { inherit pname version; - sha256 = "f9746ef763ce4d7d59ee8506ee83dd684884e4b520244b67f253095decc8a876"; + sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b"; }; checkInputs = [ pytest ]; From 050295102a727494b9a16ec05f0ee6b73dc5194a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:18 +0200 Subject: [PATCH 184/362] python: pytz: 2018.4 -> 2018.5 --- 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 734fbbba7179..7eb9ada5cae7 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 = "2018.4"; + version = "2018.5"; src = fetchPypi { inherit pname version; - sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"; + sha256 = "ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277"; }; checkPhase = '' From c18ea23e0f7d12c1a0022a93b01e7df95ad17f2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:24 +0200 Subject: [PATCH 185/362] python: pyzmq: 17.0.0 -> 17.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 4de7777fa8b9..26c453e3a09b 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 = "17.0.0"; + version = "17.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0"; + sha256 = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4"; }; checkInputs = [ pytest tornado ]; From a9c6d65605476f592dbbfbcb61de271ce4631938 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:31 +0200 Subject: [PATCH 186/362] python: quantities: 0.12.1 -> 0.12.2 --- pkgs/development/python-modules/quantities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index e65329c1b695..a4274317e1bd 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934"; + sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0"; }; propagatedBuildInputs = [ numpy ]; From c05004f5d7f2bd9df969fb6e151d4cfa96b6ffe6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:37 +0200 Subject: [PATCH 187/362] python: regex: 2018.06.21 -> 2018.07.11 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 660f56e1660e..f3e6d1f5e0a0 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.06.21"; + version = "2018.07.11"; src = fetchPypi { inherit pname version; - sha256 = "b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283"; + sha256 = "9308dbce8e5ff4ee06b172a777f6c7f650a5835a5ad41a6080eb501639c27a2f"; }; postCheck = '' From 430017cce4a1232a7d71a6de0516bd4a46bc2bc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:44 +0200 Subject: [PATCH 188/362] python: reikna: 0.6.8 -> 0.7.0 --- pkgs/development/python-modules/reikna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index e8e18face079..14e8f9f74ced 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.6.8"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c"; + sha256 = "e27af9a202b8cdedd07793abbd3282806ec724aba091a27c76d7ba8284cfd8ba"; }; checkInputs = [ sphinx pytestcov pytest ]; From c53d60809649ad4a799acf343b921a2241075c27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:50 +0200 Subject: [PATCH 189/362] python: reportlab: 3.4.0 -> 3.5.1 --- 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 0b3e84c35128..268eab0d9688 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.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343"; + sha256 = "5345494df4f1563fdab5597f7f543eae44c0aeecce05bd4d93c199f34c4b8c0c"; }; checkInputs = [ glibcLocales ]; From adb2c88d38cb26048fb1b45a9ec53687f33e15a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:19:57 +0200 Subject: [PATCH 190/362] python: requests-mock: 1.5.0 -> 1.5.2 --- pkgs/development/python-modules/requests-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 2286d9c2dc7f..3ea1bf58d8af 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.5.0"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4"; + sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb"; }; patchPhase = '' From 3a2734bbad18fca62cec80f1538d91cca2ce935e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:03 +0200 Subject: [PATCH 191/362] python: rlp: 0.6.0 -> 1.0.1 --- pkgs/development/python-modules/rlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 87a59cf73975..381a784d24af 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "0.6.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; + sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512"; }; checkInputs = [ pytest ]; From 7f707bf9914bc13ba3cbd554f9af5675b6312270 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:10 +0200 Subject: [PATCH 192/362] python: salmon-mail: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/salmon-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index c642039d4fea..b278d26b5dda 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "salmon-mail"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "452557172901d6227a325bbc72fcf61002a53c2342d935457b729303dce71f7e"; + sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc"; }; checkInputs = [ nose jinja2 mock ]; From 3fbc96a157500c0f2c8df7ce2e6fa47d842253d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:16 +0200 Subject: [PATCH 193/362] python: sarge: 0.1.4 -> 0.1.5.post0 --- pkgs/development/python-modules/sarge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index bbdc4d90b288..cf9e175490dd 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sarge"; - version = "0.1.4"; + version = "0.1.5.post0"; src = fetchPypi { inherit pname version; - sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0"; }; meta = with lib; { From a369e8fc132f08a67822e491a745582629abb525 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:23 +0200 Subject: [PATCH 194/362] python: scikit-learn: 0.19.1 -> 0.19.2 --- pkgs/development/python-modules/scikitlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 39af29da8145..201ae2b27e5c 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.19.1"; + version = "0.19.2"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0"; + sha256 = "b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888"; }; # basically https://github.com/scikit-learn/scikit-learn/pull/10723, From 003d4d089e24b113eea983f51e45c2ccc8e5e689 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:29 +0200 Subject: [PATCH 195/362] python: Scrapy: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 1c03e381bdca..fcac013b6de3 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; + sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6"; }; meta = with lib; { From cc57fa8b75b1b02c3b09273819e226aa570e10e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:36 +0200 Subject: [PATCH 196/362] python: seaborn: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/seaborn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index cc6fed43a42a..d596c640823c 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -8,10 +8,10 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; + sha256 = "76c83f794ca320fb6b23a7c6192d5e185a5fcf4758966a0c0a54baee46d41e2f"; }; checkInputs = [ nose ]; From c3a3358f6de682c0246ff26c4264297cd3306f9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:42 +0200 Subject: [PATCH 197/362] python: seekpath: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/seekpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index de17e65d2bfb..dfca0a5fa2ea 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "seekpath"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026"; + sha256 = "8fb22231ed6fc6aa12e2f2cc6c8ca67b82648e16c1c85ddac2e2237ac4553d83"; }; LC_ALL = "en_US.utf-8"; From d82950ad1f26eb1d65843d3aa2fcb3bf29e389e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:56 +0200 Subject: [PATCH 198/362] python: Shapely: 1.6.4.post1 -> 1.6.4.post2 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 52101b3482f9..42d825660737 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.6.4.post1"; + version = "1.6.4.post2"; src = fetchPypi { inherit pname version; - sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2"; + sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; }; buildInputs = [ geos glibcLocales cython ]; From 6ef7a12f0b86886dce8e3e4aabb5906f21ed881c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:02 +0200 Subject: [PATCH 199/362] python: simplejson: 3.15.0 -> 3.16.0 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index b42be465a3b4..2099b00ba962 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.15.0"; + version = "3.16.0"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb"; + sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5"; }; meta = { From 564cb48a3628653a7c8d93476d9648cdb97cb359 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:09 +0200 Subject: [PATCH 200/362] python: sleekxmpp: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/sleekxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 7f437ec59c11..37ecc8bbb1c4 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sleekxmpp"; - version = "1.3.1"; + version = "1.3.3"; propagatedBuildInputs = [ dns pyasn1 ]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr"; + sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569"; }; meta = with stdenv.lib; { From e374e273a840430d29cc3cc27da1cafd877580e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:15 +0200 Subject: [PATCH 201/362] python: smart_open: 1.5.7 -> 1.6.0 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 8c66df80dc58..f1a5bf6ed9f2 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.5.7"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p"; + sha256 = "c2c2b44125a03d6e96efdf3e53e28be99e1f548e8a4fa8035f8fab448bbdbbda"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build From 20ff5b0c3904a336361305198d18af36260e6043 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:22 +0200 Subject: [PATCH 202/362] python: smmap2: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/smmap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix index ea0f0859bbd2..08264e92e5fa 100644 --- a/pkgs/development/python-modules/smmap2/default.nix +++ b/pkgs/development/python-modules/smmap2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "smmap2"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7"; + sha256 = "dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6"; }; checkInputs = [ nosexcover ]; From 8bb0a5a15b2c67f5feb64eca3dfca58cacc57dd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:28 +0200 Subject: [PATCH 203/362] python: spacy: 2.0.9 -> 2.0.12 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index d2a306356b6d..dc0509e226c0 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.0.9"; + version = "2.0.12"; src = fetchPypi { inherit pname version; - sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5"; + sha256 = "b220ebee412c19613c26b2c1870b60473834bd686cec49553ce5f184164d3359"; }; prePatch = '' From cce9f61353e55ebc67e5cdf45aa65f8b7653095e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:34 +0200 Subject: [PATCH 204/362] python: spglib: 1.10.3.65 -> 1.10.3.75 --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 07273d0fa0d4..e04589f3dfcd 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.10.3.65"; + version = "1.10.3.75"; src = fetchPypi { inherit pname version; - sha256 = "55b49227835396b2bcd6afe724e9f37202ad0f61e273bedebd5bf740bad2e8e3"; + sha256 = "347fea7c87f7d2162fabb780560665d21a43cbd7a0af08328130ba26e6422143"; }; propagatedBuildInputs = [ numpy ]; From 64f236c254bd9093b5ffd0e36ca5cf3b5f5511b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:41 +0200 Subject: [PATCH 205/362] python: Sphinx: 1.7.5 -> 1.7.6 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 0c45592fc219..97f76be15cbb 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { pname = "Sphinx"; - version = "1.7.5"; + version = "1.7.6"; src = fetchPypi { inherit pname version; - sha256 = "d45480a229edf70d84ca9fae3784162b1bc75ee47e480ffe04a4b7f21a95d76d"; + sha256 = "217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc"; }; LC_ALL = "en_US.UTF-8"; From d90439868226037db42cf28adac1dafa9266525f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:47 +0200 Subject: [PATCH 206/362] python: SQLAlchemy: 1.2.8 -> 1.2.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 50d58877b7ea..8c3c6fe23744 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.8"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c"; + sha256 = "72325e67fb85f6e9ad304c603d83626d1df684fdf0c7ab1f0352e71feeab69d8"; }; checkInputs = [ From 2469b98fd18e2506a242987153f95415013768c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:21:54 +0200 Subject: [PATCH 207/362] python: sqlmap: 1.2.6 -> 1.2.7 --- 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 bc2218f7deec..674d1e66f7e9 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.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "a3649f9b5219b7336b82d3a1bf6e91c8d649171b96747b927a92ac075947d619"; + sha256 = "9e570fcac05b3231d5e01398e496b88a78601938bba228e381994a1b3fe3bd88"; }; # No tests in archive From 0e3863c1922382747994dcbb9aa91812db1a8b75 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:00 +0200 Subject: [PATCH 208/362] python: stevedore: 1.28.0 -> 1.29.0 --- pkgs/development/python-modules/stevedore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index e7745cf86252..6d088d52d7e7 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.28.0"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b"; + sha256 = "1e153545aca7a6a49d8337acca4f41c212fbfa60bf864ecd056df0cafb9627e8"; }; doCheck = false; From 6aad36076dd6a779dd47f4ea706181e0577b731a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:06 +0200 Subject: [PATCH 209/362] python: stripe: 1.82.2 -> 2.0.3 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 07849b0f30c1..f2e4b946b5d8 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.82.2"; + version = "2.0.3"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9d0443d772d176faba8c8e8a2ddc3a507861dd7d882b4a88cf6062b20fa5f224"; + sha256 = "17a618541c19a48d5591f4011a282cbcbbe2d05c361109f8f5381aeec05eb270"; }; checkInputs = [ unittest2 mock ]; From 22f8ae6096b15469df106a74e52097a9f9668619 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:13 +0200 Subject: [PATCH 210/362] python: tempora: 1.9 -> 1.13 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 9f8087a305d9..6d1695e4d3cc 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "1.9"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96"; + sha256 = "4848df474c9d7ad9515fbeaadc88e48843176b4b90393652156ccff613bcaeb1"; }; doCheck = false; From a0fa91189232475608acedd27b75f9338149bb40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:20 +0200 Subject: [PATCH 211/362] python: textacy: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 9b22ad3e5456..fdfa91d292f2 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "32ffb796f2abf0577af480d482608cca2baf85d366a4e2981ffd3e632ebeb76c"; + sha256 = "6019f32719c0661f41fa93c2fdd9714504d443119bf4f6426ee690bdda90835b"; }; disabled = isPy27; # 2.7 requires backports.csv From 82bde96c67b87c6fad73d2d0c5e8db0e75edbc47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:27 +0200 Subject: [PATCH 212/362] python: texttable: 1.3.1 -> 1.4.0 --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 277d70cba6a4..fed9a3fd7330 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259"; + sha256 = "95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b"; }; meta = { From 2629844dd969b69833198d891c196f26801780c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:33 +0200 Subject: [PATCH 213/362] python: tifffile: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 6e1baf2f2e95..39d2f35fa703 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e"; + sha256 = "1970dd5b3acfe0042ff8eb6f444ff3e552a02cf291274fec4beba4a56cd28360"; }; checkInputs = [ nose ]; From 4141cc7d40ad64f8f57b221cc7cda33dac7cb4af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:40 +0200 Subject: [PATCH 214/362] python: tornado: 5.0.2 -> 5.1 --- pkgs/development/python-modules/tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 37b1c7bcf5cb..6d86404e1925 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "5.0.2"; + version = "5.1"; propagatedBuildInputs = [ backports_abc certifi singledispatch ] @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7"; + sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582"; }; meta = { From bed3339facb302b8e1208ad8aafb4b3f0311302e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:47 +0200 Subject: [PATCH 215/362] python: tox: 3.0.0 -> 3.1.2 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 4ceeb026634c..e98cb2493a88 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.0.0"; + version = "3.1.2"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ py virtualenv pluggy six ]; @@ -18,6 +18,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f"; + sha256 = "9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059"; }; } \ No newline at end of file From a0e3bd18e0a1921f31474131d67a23f720990176 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:22:53 +0200 Subject: [PATCH 216/362] python: treq: 17.8.0 -> 18.6.0 --- pkgs/development/python-modules/treq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 90d8003bb346..f49c7a0d2430 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "17.8.0"; + version = "18.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16"; + sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48"; }; propagatedBuildInputs = [ From e62842ff79da73bec3ae6307fe2f98ee1e8f4cb9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:00 +0200 Subject: [PATCH 217/362] python: trezor: 0.9.1 -> 0.10.2 --- pkgs/development/python-modules/trezor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 0f96b100435a..878de1875190 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.9.1"; + version = "0.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; + sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d"; }; propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; From 2ddfd5df937bcfe6ed849b52f2c936ba067e10f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:07 +0200 Subject: [PATCH 218/362] python: trio: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 2bd607170fd5..c630668386e4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4"; + sha256 = "ce0b4f59e2f41af0433247f92ce83116bf356a3c2ab5ca5942cf359a1105b4a8"; }; checkInputs = [ pytest pyopenssl trustme ]; From 720a3574552fbd53d8c4dbe6f7eb854f2a0fe5f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:20 +0200 Subject: [PATCH 219/362] python: Twisted: 18.4.0 -> 18.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 14ccac5690bc..7b20dcd0bba4 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "18.4.0"; + version = "18.7.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9"; + sha256 = "95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; From faf158ca83945c1c074d093e5011ec40ef1e92f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:27 +0200 Subject: [PATCH 220/362] python: txtorcon: 18.0.0 -> 18.0.2 --- pkgs/development/python-modules/txtorcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index e369e13cb957..2fb7e83c3b16 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.0.0"; + version = "18.0.2"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1"; + sha256 = "ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87"; }; # Skip a failing test until fixed upstream: From 7fd2bbfc34d8c56bcd6fee75fd16ef0d78274f1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:34 +0200 Subject: [PATCH 221/362] python: typeguard: 2.1.4 -> 2.2.0 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 611eeba8ae03..a6eb75b53cf7 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.1.4"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "40b22d18d2215b76b3ddda2564acfbddfa6e702968637fbd969187c2a6fb99da"; + sha256 = "e588ff78b7093fc31c3b00c78db09b9b3764157b03b867f25ccd1dd3efd96ffb"; }; buildInputs = [ setuptools_scm ]; From 4956273c96e28b16afaea79d7086bc8570bccee3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:41 +0200 Subject: [PATCH 222/362] python: uproot: 2.8.33 -> 2.9.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 45c1428c6064..368f787313b6 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "2.8.33"; + version = "2.9.6"; src = fetchPypi { inherit pname version; - sha256 = "42b6482d085b699a534f0a3ec352e96d4653e31c8839855c8a852618f54e27d8"; + sha256 = "1fb8dd19bd1f1ed376a96e92b32ff44f7d3688bda55eda9055898111fdac8391"; }; propagatedBuildInputs = [ From 911e14238f1e1c87268c2a0c8510b06bb0159069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:47 +0200 Subject: [PATCH 223/362] python: vcrpy: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/vcrpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 805941cab60d..e0e842a773d0 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "13c6a835a6dc1ac96d7e6cae03587525eb260d7a46c6e5dd7a25416655eecb3a"; + sha256 = "7031f9c78a70b9586d2db4a2ec135c4e04194cabff58695ef0cc95e7cd66bc01"; }; checkInputs = [ From f9b5d92fe31132102ceb62b924698e56b4fadee7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:23:54 +0200 Subject: [PATCH 224/362] python: vobject: 0.9.6 -> 0.9.6.1 --- pkgs/development/python-modules/vobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 3c0b8a1f5932..95cf6efaa46a 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: buildPythonPackage rec { - version = "0.9.6"; + version = "0.9.6.1"; pname = "vobject"; src = fetchPypi { inherit pname version; - sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8"; + sha256 = "96512aec74b90abb71f6b53898dd7fe47300cc940104c4f79148f0671f790101"; }; disabled = isPyPy; From ebca113751177ae5e82a545c46fa472f382f9dc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:00 +0200 Subject: [PATCH 225/362] python: websockets: 5.0.1 -> 6.0 --- pkgs/development/python-modules/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 8b2584a16d32..0628b3c869a8 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "websockets"; - version = "5.0.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674"; + sha256 = "8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c"; }; disabled = pythonOlder "3.3"; From 96c4fcae9cf987fe6fa897359679aded21753fac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:06 +0200 Subject: [PATCH 226/362] python: widgetsnbextension: 3.2.1 -> 3.3.0 --- .../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 5af9119508a4..0f102dda106e 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.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc"; + sha256 = "c5280a62d293735cdadc7b8884e2affcfb0488420ee09963577f042359726392"; }; propagatedBuildInputs = [ notebook ]; From ab01a86e78d3ed4851b8d1185b3471df19fb5fa9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:13 +0200 Subject: [PATCH 227/362] python: WSME: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/WSME/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index 8cbbd2c767fb..adad20512927 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976"; + sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a"; }; postPatch = '' From 024b636ad97b47290740d57ddf7880ae533b9d9a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:19 +0200 Subject: [PATCH 228/362] python: xarray: 0.10.7 -> 0.10.8 --- 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 a9041f9a76f7..c443c8fc880a 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.7"; + version = "0.10.8"; src = fetchPypi { inherit pname version; - sha256 = "d87241580e3eccb961dfc16e804e1b92b3d6a8000ffee82ceb076767934342cc"; + sha256 = "6a1f2c5dc5f639f8343f70ed08d0afbb477a3867298ef38f0d9bf4aafa0fb750"; }; checkInputs = [ pytest ]; From 92ca82e5b2c73c026e443bf47b6c18b79544240e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:26 +0200 Subject: [PATCH 229/362] python: xml2rfc: 2.9.8 -> 2.10.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 29830adb5ede..291b981bf475 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.9.8"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m"; + sha256 = "dc62e1d2fea896855ee0681f02bcb7596e3b6b5aa559348b8520a4eb0c793282"; }; propagatedBuildInputs = [ intervaltree pyflakes requests lxml ]; From 524b4eb124d723f07d31aae274ae91f82332bb87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:24:33 +0200 Subject: [PATCH 230/362] python: yamllint: 1.9.0 -> 1.11.1 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index e27abba413d1..d72b1999030a 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34"; + sha256 = "e9b7dec24921ef13180902e5dbcaae9157c773e3e3e2780ef77d3a4dd67d799f"; }; checkInputs = [ nose ]; From 16bd495463dbe86735338e424d0f9f5e1e70968f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 12:20:49 +0200 Subject: [PATCH 231/362] python: setuptools: 39.2.0 -> 40.0.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 ea4781097220..b10cdfae5c7c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "39.2.0"; + version = "40.0.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"; + sha256 = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f"; }; nativeBuildInputs = [ unzip wrapPython ]; From 20f3647c2f8e29c6c003de5efece657c7288a165 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 16:55:40 +0200 Subject: [PATCH 232/362] python.pkgs.bootstrapped-pip: update 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 2a9cb2a2cfdf..b320db51e3c0 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,20 +9,20 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "39.2.0"; + version = "40.0.0"; format = "wheel"; - sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926"; + sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "10.0.1"; + version = "18.0"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7"; + sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c"; }; unpackPhase = '' From 1c28ff05fa34c88d910462645c91bd7ee8408df1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 04:22:53 +0200 Subject: [PATCH 233/362] python.pkgs.apipkg: fix build --- pkgs/development/python-modules/apipkg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 4390810d91a0..8e6fc6682043 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest }: +, pytest, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; @@ -10,7 +10,8 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - buildInputs = [ pytest ]; + buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest ]; checkPhase = '' py.test From ab7dc046ff08cde12d230f4401cedc7f1666aaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:13:58 +0200 Subject: [PATCH 234/362] python.pkgs.flake8: allow newer versions of pycodestyle and pyflakes This applies appropriate upstream patches from https://gitlab.com/pycqa/flake8/commits/master/setup.py. --- .../python-modules/flake8/default.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 944c7f7e1fd8..9d9d211dbfae 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes }: @@ -12,6 +12,37 @@ buildPythonPackage rec { sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; }; + # Allow newer version of pycodestyle and pyflakes + patches = [ + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch; + sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676"; + excludes = [ "setup.cfg" ]; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch; + sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb"; + excludes = [ "setup.cfg" ]; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch; + sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch; + sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch; + sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch; + sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x"; + excludes = [ "setup.cfg" ]; + }) + ]; + buildInputs = [ pytest mock pytestrunner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] From 9de15d502fc44f9582fd489475cffd2ee73e1e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:22:37 +0200 Subject: [PATCH 235/362] python.pkgs.twisted: update propagatedBuildInputs --- 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 7b20dcd0bba4..49e936c1cc12 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -7,6 +7,8 @@ , automat , constantly , hyperlink +, pyhamcrest +, attrs , pyopenssl , service-identity , idna @@ -21,7 +23,7 @@ buildPythonPackage rec { sha256 = "95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; From 634875fb1597184b1525410a0bd4cc1d00049467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:27:09 +0200 Subject: [PATCH 236/362] python.pkgs.python-axolotl: update propagatedBuildInputs --- pkgs/development/python-modules/python-axolotl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 44cd69fee363..29fc45f31ac2 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python-axolotl-curve25519, protobuf, pycrypto }: +{ lib, buildPythonPackage, fetchPypi, cryptography, python-axolotl-curve25519, protobuf }: buildPythonPackage rec { pname = "python-axolotl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0"; }; - propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; + propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) doCheck = false; From 387c17236975fb856affebc5e3ae1a8c1faff9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:28:20 +0200 Subject: [PATCH 237/362] python.pkgs.python-axolotl: enable tests --- pkgs/development/python-modules/python-axolotl/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 29fc45f31ac2..299a18871995 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -10,8 +10,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; - # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) - doCheck = false; meta = with lib; { homepage = https://github.com/tgalal/python-axolotl; From b51b190403f25e3149eb8307a09e1a77d23619bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:30:21 +0200 Subject: [PATCH 238/362] Revert "python: pygit2: 0.26.4 -> 0.27.1" This reverts commit e9bba1cb01ea7e45c1051f29f33c78b9bb502008. python.pkgs.pygit2 has to be upgraded at the same time as libgit2. --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index fda2e0cfbf07..72e09bf98f92 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "0.27.1"; + version = "0.26.4"; src = fetchPypi { inherit pname version; - sha256 = "1aa5ba1d59370bda158950ba4849bb6e59f13ac7e6fca5e392bfd873bd2c1cf9"; + sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From 240715f8f9ba27170c4b6c4fc5e22d0504f5314a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:51:01 +0200 Subject: [PATCH 239/362] python.pkgs.node-semver: remove tox from checkInputs --- pkgs/development/python-modules/node-semver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 9e4ba35680a1..20ae56fdbc79 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.3.0"; pname = "node-semver"; - buildInputs = [ pytest tox ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; From 9b3cb0d49fca23c45f6ee41fd617706615c91fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:54:48 +0200 Subject: [PATCH 240/362] python.pkgs.tox: update propagatedBuildInputs --- .../python-modules/tox/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index e98cb2493a88..7719687f2ea8 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,10 +1,12 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, py -, virtualenv +, packaging , pluggy -, setuptools_scm +, py , six +, virtualenv +, setuptools_scm }: buildPythonPackage rec { @@ -12,7 +14,7 @@ buildPythonPackage rec { version = "3.1.2"; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py virtualenv pluggy six ]; + propagatedBuildInputs = [ packaging pluggy py six virtualenv ]; doCheck = false; @@ -20,4 +22,10 @@ buildPythonPackage rec { inherit pname version; sha256 = "9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059"; }; -} \ No newline at end of file + + meta = with lib; { + description = "Virtualenv-based automation of test activities"; + homepage = https://tox.readthedocs.io/; + license = licenses.mit; + }; +} From 52baeaebd147401a2fc3b61d4223339f59f974c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 11:55:39 +0200 Subject: [PATCH 241/362] python.pkgs.face_recognition: remove tox from checkInputs --- pkgs/development/python-modules/face_recognition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index d1d8e8535a48..b532c7d19f73 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales +, face_recognition_models, stdenv, flake8, pytest, glibcLocales }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; - checkInputs = [ flake8 tox pytest glibcLocales ]; + checkInputs = [ flake8 pytest glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test ''; From 178b84c10d36cab7912c36d3fe266062254d8a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 12:02:21 +0200 Subject: [PATCH 242/362] python.pkgs.ipython: allow prompt_toolkit 2.0 This applies the appropriate upstream patch: https://github.com/ipython/ipython/commit/8e256bd37373f98580ba1ef1d3fcfd7976802238 --- pkgs/development/python-modules/ipython/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 2c0e4aaf4db6..24a938b195b2 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -34,6 +35,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + # Upgrade to prompt_toolkit 2.0 + patches = fetchpatch { + url = https://github.com/ipython/ipython/commit/8e256bd37373f98580ba1ef1d3fcfd7976802238.patch; + sha256 = "1d9qy2z21n4frf15g4aj7xi011d1d3qc31gs27f2v23j0gv69r9h"; + }; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments ]; From e9f05ffa9b935a6b9d672ebc6b51a19942f0ad13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Jul 2018 18:48:49 +0100 Subject: [PATCH 243/362] python.pkgs.pystemmer: fix compilation with python3.7 --- .../python-modules/pystemmer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pystemmer/default.nix diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix new file mode 100644 index 000000000000..e569042f729a --- /dev/null +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python, fetchPypi, buildPythonPackage, cython }: + +buildPythonPackage rec { + pname = "PyStemmer"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91"; + }; + + nativeBuildInputs = [ cython ]; + + preBuild = '' + cython src/Stemmer.pyx + ''; + + checkPhase = '' + ${python.interpreter} runtests.py + ''; + + meta = with stdenv.lib; { + description = "Snowball stemming algorithms, for information retrieval"; + homepage = http://snowball.tartarus.org/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 281f90a73ef4..68328b7ca775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10966,25 +10966,7 @@ in { }; }; - PyStemmer = buildPythonPackage (rec { - name = "PyStemmer-1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyStemmer/${name}.tar.gz"; - sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91"; - }; - - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - meta = { - description = "Snowball stemming algorithms, for information retrieval"; - homepage = http://snowball.tartarus.org/; - license = licenses.mit; - platforms = platforms.unix; - }; - }); + PyStemmer = callPackage ../development/python-modules/pystemmer {}; Pyro = callPackage ../development/python-modules/pyro { }; From c4b99ee9cc5ff56552d00b2e9dde948c6e6ee4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 23 Jul 2018 10:39:18 +0100 Subject: [PATCH 244/362] python.pkgs.snowballstemmer: move out of python-packages.nix --- .../snowballstemmer/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/snowballstemmer/default.nix diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix new file mode 100644 index 000000000000..9b7481a62a64 --- /dev/null +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, PyStemmer, fetchPypi }: + +buildPythonPackage rec { + pname = "snowballstemmer"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128"; + }; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ PyStemmer ]; + + meta = with stdenv.lib; { + description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68328b7ca775..049ed6e43f54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12573,26 +12573,7 @@ in { }; }; - snowballstemmer = buildPythonPackage rec { - name = "snowballstemmer-1.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/snowballstemmer/${name}.tar.gz"; - sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128"; - }; - - # No tests included - doCheck = false; - - propagatedBuildInputs = with self; [ PyStemmer ]; - - meta = { - description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; - homepage = http://sigal.saimon.org/en/latest/index.html; - license = licenses.bsd3; - platforms = platforms.unix; - }; - }; + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; spake2 = callPackage ../development/python-modules/spake2 { }; From 2e7ed10e4436a66b5333a33410020ad4c4dd61e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 16:00:11 +0200 Subject: [PATCH 245/362] python.pkgs.pandas: fix build --- pkgs/development/python-modules/pandas/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 962ba60a734c..a3b2cd5e42fc 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -97,7 +97,8 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' - py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests" + # pandas no longer seems to distribute datasets for IO tests + py.test $out/${python.sitePackages}/pandas --ignore=io --skip-slow --skip-network -k "$disabledTests" runHook postCheck ''; From 9ddbfc92426e3bd4af656d75eb6853426eb98b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 21:47:18 +0200 Subject: [PATCH 246/362] python.pkgs.jaraco_functools: move expression --- .../jaraco_functools/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/jaraco_functools/default.nix diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix new file mode 100644 index 000000000000..f719c12e2197 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, more-itertools, backports_functools_lru_cache }: + +buildPythonPackage rec { + pname = "jaraco.functools"; + version = "1.15.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya"; + }; + + propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + + doCheck = false; + + buildInputs = [ setuptools_scm ]; + + meta = with lib; { + description = "Additional functools in the spirit of stdlib's functools"; + homepage = https://github.com/jaraco/jaraco.functools; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 049ed6e43f54..fe42f0e5d27a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17490,21 +17490,7 @@ EOF more-itertools = callPackage ../development/python-modules/more-itertools { }; - jaraco_functools = buildPythonPackage rec { - name = "jaraco.functools-${version}"; - version = "1.15.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jaraco.functools/${name}.tar.gz"; - sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya"; - }; - - propagatedBuildInputs = with self; [ more-itertools backports_functools_lru_cache ]; - - doCheck = false; - - buildInputs = with self; [ setuptools_scm ]; - }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_classes = buildPythonPackage rec { name = "jaraco.classes-${version}"; From 4a5de923afe4e8ef40e4aee9b1eb65c851d9cebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 23:59:43 +0200 Subject: [PATCH 247/362] python.pkgs.jaraco_functools: 1.15.1 -> 1.20 --- pkgs/development/python-modules/jaraco_functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index f719c12e2197..cbff3f8b45a8 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "1.15.1"; + version = "1.20"; src = fetchPypi { inherit pname version; - sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya"; + sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b"; }; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; From 6ee974baa76d0d1edfc2f7685aa9d7d1b5515da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 23 Jul 2018 22:26:04 +0200 Subject: [PATCH 248/362] python.pkgs.tempora: update propagatedBuildInputs --- pkgs/development/python-modules/tempora/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6d1695e4d3cc..1aabffc05d53 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools_scm -, six, pytz}: +, six, pytz, jaraco_functools }: buildPythonPackage rec { pname = "tempora"; @@ -15,5 +15,11 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six pytz ]; + propagatedBuildInputs = [ six pytz jaraco_functools ]; + + meta = with lib; { + description = "Objects and routines pertaining to date and time"; + homepage = https://github.com/jaraco/tempora; + license = licenses.mit; + }; } From 94d87e4c1e70c328015b8667ce6a581c01e7fe43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 00:12:19 +0200 Subject: [PATCH 249/362] python: testresources: 0.2.7 -> 2.0.1 --- .../python-modules/testresources/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/testresources/default.nix diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix new file mode 100644 index 000000000000..fa4fc0b1fedf --- /dev/null +++ b/pkgs/development/python-modules/testresources/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, python +, pbr, fixtures, testtools }: + +buildPythonPackage rec { + pname = "testresources"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417"; + }; + + buildInputs = [ pbr ]; + + checkInputs = [ fixtures testtools ]; + + checkPhase = '' + ${python.interpreter} -m testtools.run discover + ''; + + meta = with lib; { + description = "Pyunit extension for managing expensive test resources"; + homepage = https://launchpad.net/testresources; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe42f0e5d27a..d073f19165a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13788,21 +13788,7 @@ in { }; }; - testresources = buildPythonPackage rec { - name = "testresources-${version}"; - version = "0.2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testresources/${name}.tar.gz"; - sha256 = "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md"; - }; - - meta = { - description = "Pyunit extension for managing expensive test resources"; - homepage = https://pypi.python.org/pypi/testresources/; - license = licenses.bsd2; - }; - }; + testresources = callPackage ../development/python-modules/testresources { }; testtools = callPackage ../development/python-modules/testtools { }; From 673d0bed95420f8b8b6b740be9daf68bf42ffb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 01:08:05 +0200 Subject: [PATCH 250/362] python.pkgs.astroid: fix build --- .../python-modules/astroid/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index dc132f911477..ea087ce4f5fb 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,32 +1,25 @@ -{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six -, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder -, backports_functools_lru_cache +{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +, lazy-object-proxy, six, wrapt, typing, typed-ast +, pytestrunner, pytest }: buildPythonPackage rec { pname = "astroid"; version = "2.0.1"; + disabled = pythonOlder "3.4"; + src = fetchPypi { inherit pname version; sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f"; }; - propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] - ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch] - ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ]; + # From astroid/__pkginfo__.py + propagatedBuildInputs = [ lazy-object-proxy six wrapt ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast; - postPatch = '' - cd astroid/tests - for i in $(ls unittest*); do mv -v $i test_$i; done - cd ../.. - rm -vf astroid/tests/test_unittest_inference.py - rm -vf astroid/tests/test_unittest_manager.py - ''; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + checkInputs = [ pytestrunner pytest ]; meta = with lib; { description = "A abstract syntax tree for Python with inference support"; From c7228f8654e56bb089ffe8549cc07c561cc4dd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 09:31:21 +0200 Subject: [PATCH 251/362] python.pkgs.flake8: remove no longer used patch --- .../move-pytest-config-to-pytest-ini.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch deleted file mode 100644 index d75d8e7bd0ad..000000000000 --- a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r ad8325924f04 pytest.ini ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200 -@@ -0,0 +1,4 @@ -+[pytest] -+-norecursedirs = .git .* *.egg* old docs dist build -+-addopts = -rwv -+ -diff -r ad8325924f04 setup.cfg ---- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200 -+++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200 -@@ -12,10 +12,6 @@ - pycodestyle >= 2.0.0, < 2.1.0 - mccabe >= 0.5.0, < 0.6.0 - --[pytest] --norecursedirs = .git .* *.egg* old docs dist build --addopts = -rw -- - [egg_info] - tag_build = - tag_date = 0 From a576b2ea6439a02c607d35f6f0ba63a01b1ad5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 09:38:55 +0200 Subject: [PATCH 252/362] conan: 1.5.2 -> 1.6.0 --- .../tools/build-managers/conan/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e77647b2fed4..3725760c1d6c 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,6 +1,6 @@ -{ lib, python }: +{ lib, python3, fetchpatch, git }: -let newPython = python.override { +let newPython = python3.override { packageOverrides = self: super: { distro = super.distro.overridePythonAttrs (oldAttrs: rec { version = "1.1.0"; @@ -16,30 +16,48 @@ let newPython = python.override { sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; }; }); + astroid = super.astroid.overridePythonAttrs (oldAttrs: rec { + version = "1.6.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"; + }; + }); + pylint = super.pylint.overridePythonAttrs (oldAttrs: rec { + version = "1.8.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; + }; + + }); }; }; in newPython.pkgs.buildPythonApplication rec { - version = "1.5.2"; + version = "1.6.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp"; + sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa"; }; - postPatch = '' - # Remove pylint constraint - substituteInPlace conans/requirements.txt --replace ", <1.9.0" "" - ''; + # Bump PyYAML to 3.13 + patches = fetchpatch { + url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch; + sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k"; + }; - checkInputs = with newPython.pkgs; [ + checkInputs = [ + git + ] ++ (with newPython.pkgs; [ nose parameterized mock webtest codecov - ]; + ]); propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch @@ -47,9 +65,10 @@ in newPython.pkgs.buildPythonApplication rec { future pygments mccabe deprecation ]; - preCheck = '' + checkPhase = '' export HOME="$TMP/conan-home" mkdir -p "$HOME" + nosetests conans.test ''; meta = with lib; { From c5758bd67e58d4488e2e56f4162bad3844799915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 09:44:35 +0200 Subject: [PATCH 253/362] rtv: use python3Packages --- pkgs/applications/misc/rtv/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5c16a02ddb8c..be27e28c9938 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { version = "1.23.0"; - name = "rtv-${version}"; + pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - buildInputs = [ + checkInputs = [ coverage coveralls docopt @@ -30,18 +30,11 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - backports_functools_lru_cache beautifulsoup4 - configparser - contextlib2 decorator kitchen - mailcap-fix - mccabe requests six - tornado - pyyaml ]; meta = with stdenv.lib; { From bb147bbc0bc1d904f0aef3112b80c048808ddf0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 24 Jul 2018 17:06:01 +0200 Subject: [PATCH 254/362] python.pkgs.pytest: fix setupHook .pytest-cache In 610485faa7f8c043482c4a9c030938ed315557e5 a setupHook was added to `pytest` to prevent the creation of `.pytest-cache` folder. Some pytest plugins relied on the cache and were thus failing. This commit permits the cache during build time but removes it in a `postFixupHook`. --- pkgs/development/python-modules/pytest/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 2edce6e6ae93..5fda0994010e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -27,9 +27,11 @@ buildPythonPackage rec { runHook postCheck ''; - # Don't create .pytest-cache when using py.test in a Nix build + # Remove .pytest-cache when using py.test in a Nix build setupHook = writeText "pytest-hook" '' - export PYTEST_ADDOPTS="-p no:cacheprovider" + postFixupHooks+=( + 'find $out -name .pytest-cache -type d -exec rm -rf {} +' + ) ''; meta = with stdenv.lib; { From 7b9141d172a7e531fd054e958039cf12d66120ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 17:23:28 +0200 Subject: [PATCH 255/362] python.pkgs.importlib: remove importlib is included in Python 2.7+ and 3.1+ --- pkgs/top-level/python-packages.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d073f19165a9..4ad513ac8e10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4840,8 +4840,7 @@ in { sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w"; }; - propagatedBuildInputs = with self; [ django ] ++ - (optionals (pythonOlder "2.7") [ importlib ordereddict ]); + propagatedBuildInputs = with self; [ django ]; meta = { description = "An extension to the Django web framework that provides comprehensive version control facilities"; @@ -6472,17 +6471,6 @@ in { }; }; - importlib = buildPythonPackage rec { - name = "importlib-1.0.2"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/importlib/importlib-1.0.2.tar.gz"; - sha256 = "131jvp6ahllcqblszjg6fxrzh4k50w8g60sq924b4nb8lxm9dl14"; - }; - }; - inflection = callPackage ../development/python-modules/inflection { }; influxdb = buildPythonPackage rec { From 3030fab2f13e6c1786bb49998b5a3840070549d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 17:28:26 +0200 Subject: [PATCH 256/362] python.pkgs.can: fix build --- pkgs/development/python-modules/can/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 1ca4cee347ca..1072b33bc1b9 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,9 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, wrapt , pyserial , nose -, mock }: +, mock +, pytest +, pytest-timeout }: buildPythonPackage rec { pname = "python-can"; @@ -14,8 +17,14 @@ buildPythonPackage rec { sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b"; }; - propagatedBuildInputs = [ pyserial ]; - checkInputs = [ nose mock ]; + propagatedBuildInputs = [ wrapt pyserial ]; + checkInputs = [ nose mock pytest pytest-timeout ]; + + checkPhase = '' + pytest -k "not test_writer_and_reader \ + and not test_reader \ + and not test_socketcan_on_ci_server" + ''; meta = with lib; { homepage = https://github.com/hardbyte/python-can; From 7f698253346ab5d24e2461ca86aad06a264ff70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 17:53:48 +0200 Subject: [PATCH 257/362] python.pkgs.pylint: 2.0.0 -> 2.0.1 --- .../python-modules/pylint/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 0dcb5181534e..0156e92738a3 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,29 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, astroid, isort, - pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: +{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort, + pytest, pytestrunner, mccabe, pytest_xdist, pyenchant }: buildPythonPackage rec { pname = "pylint"; - version = "2.0.0"; + version = "2.0.1"; + + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "9cd70527ef3b099543eeabeb5c80ff325d86b477aa2b3d49e264e12d12153bc8"; + sha256 = "2c90a24bee8fae22ac98061c896e61f45c5b73c2e0511a4bf53f99ba56e90434"; }; - buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; + checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ]; - propagatedBuildInputs = [ astroid configparser isort mccabe ]; + propagatedBuildInputs = [ astroid isort mccabe ]; postPatch = '' - # Remove broken darwin tests - sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py - sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py + # Remove broken darwin test rm -vf pylint/test/test_functional.py ''; checkPhase = '' - cd pylint/test - ${python.interpreter} -m unittest discover -p "*test*" + cat pylint/test/test_self.py + # Disable broken darwin tests + pytest pylint/test -k "not test_parallel_execution \ + and not test_py3k_jobs_option \ + and not test_good_comprehension_checks" ''; postInstall = '' From 02b1cc96009bacd7fd9513c92505f223900dd53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 17:56:55 +0200 Subject: [PATCH 258/362] python.pkgs.sqlalchemy_migrate: remove pylint from checkInputs Seems not to be needed and does not work on Python 2. --- pkgs/development/python-modules/sqlalchemy-migrate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c2e454d08cda..8a5609c1cd9f 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ]; + checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; prePatch = '' From 48eb8c4e88ef2ee50f2ee013f537f3048355c2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 19:04:02 +0200 Subject: [PATCH 259/362] spyder: remove from pythonPackages Spyder is an application only and therefore does not belong in pythonPackages. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82be48518fec..ee50aeae26a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20909,7 +20909,7 @@ with pkgs; simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = pythonPackages.spyder; + spyder = callPackage ../applications/science/spyder { }; stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ad513ac8e10..dc65cb710188 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13381,8 +13381,6 @@ in { }; }); - spyder = callPackage ../applications/science/spyder { }; - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; SQLAlchemy-ImageAttach = buildPythonPackage rec { From daabcc3b9aa76bc6091be4929c8c349774d6011d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 18:17:14 +0200 Subject: [PATCH 260/362] spyder: use python3 Dependency pylint is no longer supported on Python 2. --- pkgs/applications/science/spyder/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0564f3de1b78..71def712db6c 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,18 +1,10 @@ -{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem -# mandatory -, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle -# optional -, numpy ? null, scipy ? null, matplotlib ? null -# optional -, pylint ? null -}: +{ stdenv, python3, makeDesktopItem }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "spyder"; version = "3.2.8"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; }; @@ -22,7 +14,7 @@ buildPythonApplication rec { sed -i -e '/pyqt5/d' setup.py ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; From 72934aa94e322eb3d5be277d667466643f78e706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Jul 2018 18:17:24 +0200 Subject: [PATCH 261/362] beets: use python3Packages --- pkgs/tools/audio/beets/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index b6ff7e5c9673..5c7ced40afb6 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -97,7 +97,7 @@ let }; in pythonPackages.buildPythonApplication rec { - name = "beets-${version}"; + pname = "beets"; version = "1.4.7"; src = fetchFromGitHub { @@ -114,7 +114,6 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.munkres pythonPackages.musicbrainzngs pythonPackages.mutagen - pythonPackages.pathlib pythonPackages.pyyaml pythonPackages.unidecode pythonPackages.gst-python diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee50aeae26a1..f707f98d4a0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1549,7 +1549,7 @@ with pkgs; beegfs = callPackage ../os-specific/linux/beegfs { }; beets = callPackage ../tools/audio/beets { - pythonPackages = python2Packages; + pythonPackages = python3Packages; }; bepasty = callPackage ../tools/misc/bepasty { }; From 8abd3d33100caac297a1096bc177c6f6bbcea43c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 10:00:29 +0200 Subject: [PATCH 262/362] python.pkgs.pytest-flake8: disable test, fix build --- pkgs/development/python-modules/pytest-flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 101594750fd5..1d7447293dfa 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkPhase = '' - pytest . + pytest . -k "not test_mtime_caching" ''; meta = { From 7d5f1d7bd351a4c0ce8ed9227616edbcbb908ecc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 12:21:25 +0200 Subject: [PATCH 263/362] python.pkgs.pytest-flake8: disable tests --- pkgs/development/python-modules/pytest-flake8/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 1d7447293dfa..2ad44c4e8066 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { pytest . -k "not test_mtime_caching" ''; + # https://github.com/tholo/pytest-flake8/issues/49 + doCheck = false; + meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; homepage = https://github.com/tholo/pytest-flake8; From ac7a998fae6402e126e560787ab05180c035a674 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 12:22:35 +0200 Subject: [PATCH 264/362] python.pkgs.prompt_toolkit_52: remove unused --- pkgs/top-level/python-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc65cb710188..b8ccafc3ad7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9935,22 +9935,6 @@ in { prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; - prompt_toolkit_52 = self.prompt_toolkit.overridePythonAttrs(oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "0.52"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m"; - }; - - # No tests included in archive - doCheck = false; - - #Only <3.4 expressly supported. - disabled = isPy35; - - }); - protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; From 9e751587c7a3792abab6ac0ff125fdfa671b51d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 12:32:07 +0200 Subject: [PATCH 265/362] python.pkgs.JPype1: disable tests --- pkgs/development/python-modules/JPype1/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 879cdb9bd095..d449ae8bbf69 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k }: +{ buildPythonPackage, fetchPypi, isPy3k, pytest }: buildPythonPackage rec { pname = "JPype1"; @@ -11,8 +11,10 @@ buildPythonPackage rec { patches = [ ./set-compiler-language.patch ]; - # Test loader complains about non-test module on python3. - doCheck = !isPy3k; + checkInputs = [ pytest ]; + + # ImportError: Failed to import test module: test.testlucene + doCheck = false; meta = { homepage = "https://github.com/originell/jpype/"; From ac21188b6eef7b2ff363a536f7608b74ff31ad27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 12:39:54 +0200 Subject: [PATCH 266/362] python.pkgs.nipype: add missing dependency --- pkgs/development/python-modules/nipype/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index aca430028980..3785986ad28b 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -8,6 +8,7 @@ , dateutil , funcsigs , future +, futures , mock , networkx , nibabel @@ -46,6 +47,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" + + rm pytest.ini ''; propagatedBuildInputs = [ @@ -53,6 +56,7 @@ buildPythonPackage rec { dateutil funcsigs future + futures networkx nibabel numpy From e328e5c5e220124708ad17670786d297df32d406 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:08:50 +0200 Subject: [PATCH 267/362] python: aioconsole: 0.1.9 -> 0.1.10 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index f594b66285db..0f2740a90d8f 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "f263eb4f5eaee9f5e86f7b34fea3b50b3a4ff77b9f23ffcd3c4cb204c3b3fccc"; + sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a"; }; # hardcodes a test dependency on an old version of pytest-asyncio From d73ce6e7a39bcd40223a90853401424f65e788d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:08:57 +0200 Subject: [PATCH 268/362] python: asyncssh: 1.13.2 -> 1.13.3 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 6308b1a170fb..1ac393ff2d71 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.13.2"; + version = "1.13.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb"; + sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6"; }; propagatedBuildInputs = [ From ef44818ddc13b39f6454c1a08e0666656ab60c70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:03 +0200 Subject: [PATCH 269/362] python: botocore: 1.10.62 -> 1.10.64 --- 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 2fefd361a87e..368db7903751 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.10.62"; + version = "1.10.64"; src = fetchPypi { inherit pname version; - sha256 = "047d553ec2a4c7f80f9ca02f73c3ab443577bad6bcb079c698fb9dd8cc93c0af"; + sha256 = "977e8ab657747b3e60f4b597b9f732cbe467b12ecc52a9c5b2121c0006d41a63"; }; propagatedBuildInputs = [ From d3abeb9b297b5d223f016928e21b801d4ece1de8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:10 +0200 Subject: [PATCH 270/362] python: dask: 0.18.1 -> 0.18.2 --- 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 7de2eeb5a198..e1572ab53216 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.18.1"; + version = "0.18.2"; src = fetchPypi { inherit pname version; - sha256 = "b50b435c51bf5ca30c2667d0d92649765b732a2e6bebe7e219e6dd3fe8d7ac4e"; + sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc"; }; checkInputs = [ pytest ]; From 8d219d9fcffbab8049de7ff2c658a1dd26656408 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:16 +0200 Subject: [PATCH 271/362] python: IBMQuantumExperience: 1.9.6 -> 1.9.8 --- .../python-modules/ibmquantumexperience/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index eb4b859c2f64..0fcb26628013 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "1.9.6"; + version = "1.9.8"; src = fetchPypi { inherit pname version; - sha256 = "83baa3c88979df67e7be929b147d253cffe45a7f7f5657f87fbe945819e9ce24"; + sha256 = "78a7d9770fa2884d79d3c8b18f374644866e4d22ec151cf703053f7530bb7b7c"; }; propagatedBuildInputs = [ From 2380766faf4707d3ca3d745253af3bf735238bf3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:23 +0200 Subject: [PATCH 272/362] python: jdatetime: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 6458fc888e18..db79050077f0 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0c5983ef1a36b5d98d2b20c16f1d26a52452043d84f3ff1bf8f37e46bc314874"; + sha256 = "030a47ad3acbde45cb03872e2c6415c675dbb4a82462302971e93076145b5096"; }; propagatedBuildInputs = [ six ]; From c421e0c3b9f727e117d18eb115674f667af14811 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:30 +0200 Subject: [PATCH 273/362] python: libusb1: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index f3b48eaa5760..8d74a4d3c46e 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.6.4"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"; + sha256 = "4707f81e933a97fed1c5bf7d4957f07bae1139cb8084bdee1f50201a40e3fd7c"; }; postPatch = lib.optionalString stdenv.isLinux '' From 850cc1fdfefe25839a1a8b0e450558f22a6805a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:36 +0200 Subject: [PATCH 274/362] python: pyasn1: 0.4.3 -> 0.4.4 --- 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 c1b133a0ab7d..d7d266b23ff2 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.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc"; + sha256 = "f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137"; }; meta = with stdenv.lib; { From db2545bea7e92c57a2fb6e052ae3eb2edf2b999d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:42 +0200 Subject: [PATCH 275/362] python: pytest-timeout: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index cca3279482b8..012226de0532 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "08b550b498b9251901a3747f02aa2624ed53a9c8285ca482551346c85b47d641"; + sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23"; }; buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; From b4569891818a0bd2a8c695fb5550ac1384f0bb19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:49 +0200 Subject: [PATCH 276/362] python: pytest-xdist: 1.22.2 -> 1.22.3 --- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 84f337e1b83a..2e88a7654177 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.22.2"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f"; + sha256 = "48868d1f461122ac8c5fb60487b6da03c0d73dcb06a9d79e06c4eab8ef62a5c3"; }; nativeBuildInputs = [ setuptools_scm ]; From e6facae89076fa4956926cbbb61b8e46c3850bcc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:09:55 +0200 Subject: [PATCH 277/362] python: python_openzwave: 0.4.5 -> 0.4.7 --- pkgs/development/python-modules/python_openzwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 7f88946013d8..d29365c86bad 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.5"; + version = "0.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c12a0eebb0e1919fee978d6a3b7727af8ba1f733c01f595558c83fa746553f5a"; + sha256 = "b28a3abefc04d1d04dd68ee5a695b091e96ba7ab9a9eaa67db43dd55b61a4664"; extension = "zip"; }; From dda2be9de674d7dd8bc44955abb80dabd88bf256 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:10:02 +0200 Subject: [PATCH 278/362] python: pyxattr: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/pyxattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 558dc37a394f..f667e09892c1 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.6.0"; + version = "0.6.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09"; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; }; # IOError: [Errno 95] Operation not supported (expected) From 7babc81b07a7d24c61b1d42c212e7fb478ad32c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:10:08 +0200 Subject: [PATCH 279/362] python: reportlab: 3.5.1 -> 3.5.2 --- 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 268eab0d9688..6ede1b8937b5 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.1"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5345494df4f1563fdab5597f7f543eae44c0aeecce05bd4d93c199f34c4b8c0c"; + sha256 = "08986267eaf25d62c3802512f0a97dc3426d0c82f52c8beb576689582eb85b7f"; }; checkInputs = [ glibcLocales ]; From 7428d0830ad5582d4ee7ea7c4a075c05792573bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:10:15 +0200 Subject: [PATCH 280/362] python: seqdiag: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/seqdiag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 2ce155210484..d3c6006bc6c8 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "seqdiag"; - version = "0.9.5"; + version = "0.9.6"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; - sha256 = "994402cb19fef77ee113d18810aa397a7290553cda5f900be2bb44e2c7742657"; + sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; }; buildInputs = [ pep8 nose unittest2 docutils ]; From 5463fb39e7f077ef9c9f684cb964cd2826fe6f30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:10:21 +0200 Subject: [PATCH 281/362] python: tifffile: 0.15.0 -> 0.15.1 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 39d2f35fa703..159051b9a6a8 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "1970dd5b3acfe0042ff8eb6f444ff3e552a02cf291274fec4beba4a56cd28360"; + sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08"; }; checkInputs = [ nose ]; From d1a411468d33a1c135f1ff910cf17243a2afb7f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 Jul 2018 13:58:58 +0200 Subject: [PATCH 282/362] python.pkgs.scikitlearn: disable tests; remove maintainer --- .../python-modules/scikitlearn/default.nix | 12 +-- ...ld-be-less-than-max_iter-using-lbgfs.patch | 73 ------------------- 2 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 201ae2b27e5c..c7b6947b37d2 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -7,17 +7,15 @@ buildPythonPackage rec { pname = "scikit-learn"; version = "0.19.2"; - disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 + # UnboundLocalError: local variable 'message' referenced before assignment + disabled = true; +# disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; sha256 = "b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888"; }; - # basically https://github.com/scikit-learn/scikit-learn/pull/10723, - # but rebased onto 0.19.1 - patches = [ ./n_iter-should-be-less-than-max_iter-using-lbgfs.patch ]; - buildInputs = [ nose pillow gfortran glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; @@ -29,10 +27,12 @@ buildPythonPackage rec { HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/ ''; + + meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; homepage = http://scikit-learn.org; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch deleted file mode 100644 index 67309a673d08..000000000000 --- a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py -index e17dc1e..665654d 100644 ---- a/sklearn/linear_model/huber.py -+++ b/sklearn/linear_model/huber.py -@@ -181,7 +181,11 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): - - n_iter_ : int - Number of iterations that fmin_l_bfgs_b has run for. -- Not available if SciPy version is 0.9 and below. -+ -+ .. versionchanged:: 0.20 -+ -+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed -+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. - - outliers_ : array, shape (n_samples,) - A boolean mask which is set to True where the samples are identified -@@ -272,7 +276,9 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): - raise ValueError("HuberRegressor convergence failed:" - " l-BFGS-b solver terminated with %s" - % dict_['task'].decode('ascii')) -- self.n_iter_ = dict_.get('nit', None) -+ # In scipy <= 1.0.0, nit may exceed maxiter. -+ # See https://github.com/scipy/scipy/issues/7854. -+ self.n_iter_ = min(dict_.get('nit', None), self.max_iter) - self.scale_ = parameters[-1] - if self.fit_intercept: - self.intercept_ = parameters[-2] -diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py -index 8646c9a..c72a7d9 100644 ---- a/sklearn/linear_model/logistic.py -+++ b/sklearn/linear_model/logistic.py -@@ -718,7 +718,9 @@ def logistic_regression_path(X, y, pos_class=None, Cs=10, fit_intercept=True, - warnings.warn("lbfgs failed to converge. Increase the number " - "of iterations.") - try: -- n_iter_i = info['nit'] - 1 -+ # In scipy <= 1.0.0, nit may exceed maxiter. -+ # See https://github.com/scipy/scipy/issues/7854. -+ n_iter_i = min(info['nit'], max_iter) - except: - n_iter_i = info['funcalls'] - 1 - elif solver == 'newton-cg': -@@ -1115,6 +1117,11 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin, - it returns only 1 element. For liblinear solver, only the maximum - number of iteration across all classes is given. - -+ .. versionchanged:: 0.20 -+ -+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed -+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. -+ - See also - -------- - SGDClassifier : incrementally trained logistic regression (when given -diff --git a/sklearn/linear_model/tests/test_huber.py b/sklearn/linear_model/tests/test_huber.py -index 08f4fdf..ca1092f 100644 ---- a/sklearn/linear_model/tests/test_huber.py -+++ b/sklearn/linear_model/tests/test_huber.py -@@ -42,6 +42,13 @@ def test_huber_equals_lr_for_high_epsilon(): - assert_almost_equal(huber.intercept_, lr.intercept_, 2) - - -+def test_huber_max_iter(): -+ X, y = make_regression_with_outliers() -+ huber = HuberRegressor(max_iter=1) -+ huber.fit(X, y) -+ assert huber.n_iter_ == huber.max_iter -+ -+ - def test_huber_gradient(): - # Test that the gradient calculated by _huber_loss_and_gradient is correct - rng = np.random.RandomState(1) From 1d0caa7b035875cee70bf8072b46b19e4965c65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jul 2018 18:31:18 +0200 Subject: [PATCH 283/362] release/metrics: drop requiredSystemFeatures Lack of a "benchmark" machine on Hydra prevents it from building, and that blocks channels. --- pkgs/top-level/metrics.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 77f620da7249..f4e778aed127 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,7 +4,7 @@ with pkgs; runCommand "nixpkgs-metrics" { buildInputs = [ nix time ]; - requiredSystemFeatures = [ "benchmark" ]; + # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra? } '' export NIX_DB_DIR=$TMPDIR From 330c501be009f18888e9ce92c54ea18ce950968a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 26 Jul 2018 16:46:33 +0200 Subject: [PATCH 284/362] pari: 2.9.5 -> 2.11.0 The pari update makes it necessary to disable a giac test that only fails because it directly tests the pari interface. --- pkgs/applications/science/math/giac/default.nix | 10 +++++++++- pkgs/applications/science/math/pari/default.nix | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d32beeef4f48..6a0b686602ff 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,7 +9,7 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9-59"; + version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; @@ -50,6 +50,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; doCheck = true; + preCheck = '' + # One test in this file fails. That test just tests a part of the pari + # interface that isn't actually used in giac. Of course it would be better + # to only remove that one test, but that would require a patch. + # Removing the whole test set should be good enough for now. + # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326 + echo > check/chk_fhan11 + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a811c9da8c27..9fe1d9df46dc 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.5"; + version = "2.11.0"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; + sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q"; }; buildInputs = [ @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = "http://pari.math.u-bordeaux.fr/"; - downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + homepage = http://pari.math.u-bordeaux.fr; + downloadPage = http://pari.math.u-bordeaux.fr/download.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin; From 4f5837668bd02ff2df7865b50c1f679a25d51a53 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 26 Jul 2018 15:34:39 -0500 Subject: [PATCH 285/362] hindent: build Emacs package with latest Melpa recipe The hindent Emacs package is built with the latest Melpa recipe, but the same source version as in haskellPackages. --- .../editors/emacs-modes/melpa-packages.nix | 8 ++++++++ .../emacs-modes/melpa-stable-packages.nix | 8 ++++++++ pkgs/top-level/emacs-packages.nix | 17 ----------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 2e474ed3410c..56b17a865df8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -94,6 +94,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index c0febd803cc0..f3b77c708a7b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -108,6 +108,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5d042c3385e1..ba82bd217fdc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -298,23 +298,6 @@ let helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; - hindent = melpaBuild rec { - pname = "hindent"; - version = external.hindent.version; - src = external.hindent.src; - packageRequires = [ haskell-mode ]; - propagatedUserEnvPkgs = [ external.hindent ]; - recipe = writeText "recipe" '' - (hindent - :repo "commercialhaskell/hindent" :fetcher github - :files ("elisp/*.el")) - ''; - meta = { - description = "Indent haskell code using the \"hindent\" program"; - license = bsd3; - }; - }; - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; redshank = callPackage ../applications/editors/emacs-modes/redshank { }; From 6d2ab189159e9438be83da4ee251e4e620f6730e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 22 Jul 2018 20:49:28 +0200 Subject: [PATCH 286/362] sieve-connect: Init at 0.89 --- .../networking/sieve-connect/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/networking/sieve-connect/default.nix diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix new file mode 100644 index 000000000000..78910d1ecf6e --- /dev/null +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { + name = "sieve-connect-${version}"; + version = "0.89"; + + src = fetchFromGitHub { + owner = "philpennock"; + repo = "sieve-connect"; + rev = "v${version}"; + sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + # Fixes failing build when not building in git repo + mkdir .git + touch .git/HEAD + echo "${version}" > versionfile + echo "$(date +%Y-%m-%d)" > datefile + ''; + + buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 sieve-connect $out/bin + gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + + wrapProgram $out/bin/sieve-connect \ + --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + TermReadKey TermReadLineGnu ])}" + ''; + + meta = with stdenv.lib; { + description = "A client for the MANAGESIEVE Protocol"; + longDescription = '' + This is sieve-connect. A client for the ManageSieve protocol, + as specifed in RFC 5804. Historically, this was MANAGESIEVE as + implemented by timsieved in Cyrus IMAP. + ''; + homepage = https://github.com/philpennock/sieve-connect; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1bcfaced0ad..c9f6c16e9928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5065,6 +5065,8 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; + sieve-connect = callPackage ../applications/networking/sieve-connect {}; + sigal = callPackage ../applications/misc/sigal { inherit (pythonPackages) buildPythonApplication fetchPypi; }; From af44ab8400de82ce16bb846164b55fd7b779b230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 26 Jul 2018 15:23:07 +0200 Subject: [PATCH 287/362] plasma.kwin: Adds libdrm depdency Libdrm is required to enable the DRM backend that is used by Wayland. --- pkgs/desktops/plasma-5/kwin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a0b09e30338f..b8f381e97149 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap + plasma-framework, qtsensors, libcap, libdrm }: mkDerivation { @@ -27,7 +27,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap + libcap libdrm ]; outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); From 6e5d977b97966c832dfbb51c9dfded86e2bde172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 26 Jul 2018 15:24:17 +0200 Subject: [PATCH 288/362] plasma-workspace: Improve the NixOS patch set We changed some if condition that is not required to be changed. --- .../plasma-5/plasma-workspace/plasma-workspace.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 272088b72b7b..7f45d51d1609 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644 - } fi - kstartupconfig5 +-kstartupconfig5 ++@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5 returncode=$? --if test $returncode -ne 0; then -+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then + if test $returncode -ne 0; then exit 1 fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig From a14a75a5676a942311976b1c0644a3a803099909 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 26 Jul 2018 18:43:45 -0500 Subject: [PATCH 289/362] foundationdb: include debug info in all builds This puts the debug information in a separate output, as expected. This allows meaningful symbol names to appear in DWARF-based tools like perf and gdb. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 461b90bc978c..bb0d5e84e789 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -85,6 +85,7 @@ let --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; + separateDebugInfo = true; enableParallelBuilding = true; makeFlags = [ "all" "fdb_java" ] @@ -92,7 +93,9 @@ let # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] # Needed environment overrides - ++ [ "KVRELEASE=1" ]; + ++ [ "KVRELEASE=1" + "NOSTRIP=1" + ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' From f8e8ecde51b49132d7f8d5adb971c0e37eddcdc2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 26 Jul 2018 18:58:40 -0500 Subject: [PATCH 290/362] foundationdb60: 6.0.2pre2430 -> 6.0.3pre2446 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index bb0d5e84e789..7c7da3612465 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -155,9 +155,9 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.2pre2430_${substring 0 8 rev}"; + version = "6.0.3pre2446_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "7938d247a5eaf886a176575de6592b76374df58c"; - sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; + rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; + sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; }; } From 04f0c2522294c75e298ed756ffa8ad14e841d4e6 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 24 Jul 2018 20:31:21 +0200 Subject: [PATCH 291/362] Fix pname to ename propagation if null --- pkgs/build-support/emacs/melpa.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 4ceaf77373e6..2ee99ce973ef 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -13,7 +13,7 @@ with lib; /* ename: Original Emacs package name, possibly containing special symbols. */ -, ename ? pname +, ename ? null , version , recipe , meta ? {} @@ -30,6 +30,11 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + ename = + if isNull(ename) + then pname + else ename; + melpa = fetchFromGitHub { owner = "melpa"; repo = "melpa"; From 264077482e32f7de846a8d124c876e19d5d520c9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 14:55:02 +0300 Subject: [PATCH 292/362] zsh-command-time: disable exec flag --- pkgs/shells/zsh/zsh-command-time/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 390039944c09..c82b455200a9 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; + phases = [ "installPhase" ]; + installPhase = '' - install -D $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time + install -Dm444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time ''; meta = with stdenv.lib; { From cd3283f9218b70fdf39640ba1be6fa16e137c209 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 26 Jul 2018 20:06:46 +0400 Subject: [PATCH 293/362] chromium: 67.0.3396.99 -> 68.0.3440.75 --- .../networking/browsers/chromium/common.nix | 4 -- .../patches/nix_plugin_paths_52.patch | 70 ------------------- .../browsers/chromium/upstream-info.nix | 18 ++--- 3 files changed, 9 insertions(+), 83 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c2471d8a0eaa..ff9b8b10b18e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,10 +138,6 @@ let # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch - ] ++ optionals (versionRange "66" "68") [ - ./patches/nix_plugin_paths_52.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch ] ++ optionals (versionRange "68" "69") [ ./patches/remove-webp-include-68.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch deleted file mode 100644 index fc1b609479b2..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index f4e119d..d9775bd 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -68,21 +68,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - // Gets the path for bundled implementations of components. Note that these -@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_COMPONENTS: -@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 16873ead34f3..7f2f4387da54 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4"; - sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp"; - version = "68.0.3440.59"; + sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57"; + sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv"; + version = "68.0.3440.68"; }; dev = { - sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg"; - sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8"; - version = "69.0.3486.0"; + sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv"; + sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx"; + version = "69.0.3497.12"; }; stable = { - sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5"; - sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3"; - version = "67.0.3396.99"; + sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw"; + sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij"; + version = "68.0.3440.75"; }; } From 28b2c8b27ac3c98e1f7db7569b9ae80076b1c5cc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Jul 2018 19:18:57 -0500 Subject: [PATCH 294/362] universal-ctags: 2018-01-0 -> 2018-07-23 --- pkgs/development/tools/misc/universal-ctags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index eb51abe03214..57de59605f30 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2018-01-05"; + version = "2018-07-23"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65"; - sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi"; + rev = "3522685695ad3312cf4b19399e0c44f3395dd089"; + sha256 = "1f67hy8c2yr9z4ydsqd7wg8iagzn01qjw2ccx6g8mngv3i3jz9mv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; From 993937d09e03202f0cee42c4ccb730cf9bcc925e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 27 Jul 2018 08:53:42 -0500 Subject: [PATCH 295/362] gcc8: 8.1 -> 8.2 https://gcc.gnu.org/gcc-8/changes.html --- pkgs/development/compilers/gcc/8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 38d8bcd83cf5..fa19e9c533d5 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -38,7 +38,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "8.1.0"; +let version = "8.2.0"; enableParallelBuilding = true; @@ -127,7 +127,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; }; inherit patches; From 980674f08c320cbc8b7d21cd2eb6f9e6e240403b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Jul 2018 10:50:32 +0200 Subject: [PATCH 296/362] opencv: 3.4.1 -> 3.4.2 --- pkgs/development/libraries/opencv/3.x.nix | 48 +++++++------------ .../libraries/opencv/fix-dnn.patch | 13 +++++ 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/libraries/opencv/fix-dnn.patch diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 264c05e1af9d..cc970483fb01 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -35,20 +35,20 @@ }: let - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h"; + sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3"; + sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz"; }; # Contrib must be built in order to enable Tesseract support: @@ -59,16 +59,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "dfe3162c237af211e98b8960018b564bc209261d"; - sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif"; + rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a"; + sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8"; } + "/ippicv"; - files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in + files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in if stdenv.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; } + { ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; } else if stdenv.system == "i686-linux" then - { ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; } + { ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; } else if stdenv.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; } + { ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -132,17 +132,6 @@ let ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '') extra.files); - # See opencv_contrib/modules/dnn_modern/CMakeLists.txt - tinyDnn = rec { - src = fetchurl { - url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}"; - sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2"; - }; - name = "v1.0.0a3.tar.gz"; - md5 = "adb1c512e09ca2c7a6faef36f9c53e59"; - dst = ".cache/tiny_dnn"; - }; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; printEnabled = enabled : if enabled then "ON" else "OFF"; @@ -156,6 +145,11 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + # TODO: remove the following patch once commit + # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f + # is released. + patches = [ ./fix-dnn.patch ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with @@ -174,9 +168,6 @@ stdenv.mkDerivation rec { ${installExtraFiles vgg} ${installExtraFiles boostdesc} ${installExtraFiles face} - - mkdir -p "${tinyDnn.dst}" - ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = @@ -243,9 +234,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" ]; enableParallelBuilding = true; @@ -273,11 +261,11 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = { + meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; - license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = with licenses; if enableUnfree then unfree else bsd3; + maintainers = with maintainers; [viric mdaiter basvandijk]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch new file mode 100644 index 000000000000..62234a43e461 --- /dev/null +++ b/pkgs/development/libraries/opencv/fix-dnn.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 730c752ce..abbce0453 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { + std::ifstream fs(filename, std::ifstream::in); + CHECK(fs.is_open()) << "Can't open \"" << filename << "\""; + IstreamInputStream input(&fs); +- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto); ++ return google::protobuf::TextFormat::Parser().Parse(&input, proto); + } + + bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { From e0d23b12ef9d51ca4618e702917b2669bb683fe4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 26 Jul 2018 12:58:43 +0200 Subject: [PATCH 297/362] php: Enable mysqlnd as default MySQL Native Driver was implemented by PHP back in 5.3.0 and has been default in most distributions for a very long time. The option was added in 41cd4f2459d63c5ad19a227c3dd5d7704df6161c and I don't see any reason why it would default to false. Overview of mysqlnd by PHP: https://secure.php.net/manual/en/mysqlnd.overview.php --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7c866911c593..9bf8577923c8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -17,7 +17,7 @@ let , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true , mysqlSupport ? (config.php.mysql or true) && (!php7) - , mysqlndSupport ? config.php.mysqlnd or false + , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true , libxml2Support ? config.php.libxml2 or true From c83584515297638f135089ed5a71ecf01f1ef59a Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 26 Jul 2018 14:34:09 -0700 Subject: [PATCH 298/362] altcoins.mist: 0.10.0 -> 0.11.1 * Add gtk2 as dependency, see #43297 * Don't include version number in mist executable name --- pkgs/applications/altcoins/mist.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index f809b30189f4..5f89b0a0c173 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -1,8 +1,8 @@ -{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: +{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }: let - version = "0.10.0"; - name = "mist-${version}"; + version = "0.11.1"; + name = "mist"; throwSystem = throw "Unsupported system: ${stdenv.system}"; @@ -31,11 +31,11 @@ let src = { i686-linux = fetchurl { url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; - sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk"; + sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7"; }; x86_64-linux = fetchurl { url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; - sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi"; + sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3"; }; }.${stdenv.system} or throwSystem; @@ -50,13 +50,14 @@ let ln -s ${desktopItem}/share/applications/* $out/share/applications patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \ $out/lib/mist/mist ''; }); in buildFHSUserEnv { - inherit name meta; + name = "mist"; + inherit meta; targetPkgs = pkgs: with pkgs; [ mist From fcb4e32e9a939db0fca1796c8abd4e14e0acde04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Fri, 27 Jul 2018 12:27:42 -0300 Subject: [PATCH 299/362] fzf: fix invalid symlink on vim-plugins The fzf vim plugin wasn't working because it was making a symlink to a directory with the full source code. This directory isn't present anymore since the commit e95f17e2720e67e2eabd59d7754c814d3e27a0b2 wich removes it because it isn't so useful for the go packages. I fixed it by manually copying the plugin/ directory into the out derivation, which is the only part of the source that contains the vim plugin. --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e8e2152f7110..b85d2bffc341 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -42,8 +42,8 @@ buildGoPackage rec { cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins - ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} + mkdir -p $out/share/vim-plugins/${name} + cp -r $src/plugin $out/share/vim-plugins/${name} cp -R $src/shell $bin/share/fzf cat <