From 6d87f8dc4951bee3af8688074f9c35635e0eea6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 10:16:02 -0800
Subject: [PATCH 001/494] libev: 4.24 -> 4.25
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libev/versions
---
pkgs/development/libraries/libev/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index d77337c912b..922207f1cce 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libev-${version}";
- version="4.24";
+ version="4.25";
src = fetchurl {
url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
- sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp";
+ sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq";
};
meta = {
From be5181bc479a36d499c56af1a7d0cf9cdb50a6fd Mon Sep 17 00:00:00 2001
From: Yorick <yorickvanpelt@gmail.com>
Date: Thu, 31 Jan 2019 15:47:51 +0100
Subject: [PATCH 002/494] wayland: separateDebugInfo = true
---
pkgs/development/libraries/wayland/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 25cbde63129..8a5a5dc070e 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
};
+ separateDebugInfo = true;
+
configureFlags = [
"--disable-documentation"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
From 1610427425949dd62b748f2f35d4940c3c755e5c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 Jan 2019 08:58:56 -0600
Subject: [PATCH 003/494] openconnect: 7.08 -> 8.02
---
pkgs/tools/networking/openconnect/default.nix | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 132ae3cf0da..b0c4a0199c4 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -3,23 +3,18 @@
assert (openssl != null) == (gnutls == null);
stdenv.mkDerivation rec {
- name = "openconnect-7.08";
+ pname = "openconnect";
+ version = "8.02";
src = fetchurl {
urls = [
- "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
+ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
];
- sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
+ sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w";
};
outputs = [ "out" "dev" ];
- preConfigure = ''
- export PKG_CONFIG=${pkgconfig}/bin/pkg-config
- export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
- export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"
- '';
-
configureFlags = [
"--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
"--disable-nls"
From b64024e70ce759e4ff2b531c8ed720a1b874f533 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 31 Jan 2019 17:54:03 -0600
Subject: [PATCH 004/494] mpfr: 4.0.1 -> 4.0.2
https://www.mpfr.org/mpfr-4.0.2/
---
pkgs/development/libraries/mpfr/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index ea94a55a619..e32c83af8a7 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,12 +1,15 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
- version = "4.0.1";
+ version = "4.0.2";
name = "mpfr-${version}";
src = fetchurl {
- url = "mirror://gnu/mpfr/${name}.tar.xz";
- sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7";
+ urls = [
+ #"https://www.mpfr.org/${name}/${name}.tar.xz"
+ "mirror://gnu/mpfr/${name}.tar.xz"
+ ];
+ sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx";
};
outputs = [ "out" "dev" "doc" "info" ];
From a2d07bc72545d6363698fa59c2974637d14af0b0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 2 Feb 2019 02:43:17 -0600
Subject: [PATCH 005/494] iw: 4.14 -> 5.0
---
pkgs/os-specific/linux/iw/default.nix | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index 7e50babc80a..94ba595343a 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -1,17 +1,18 @@
{stdenv, fetchurl, libnl, pkgconfig}:
stdenv.mkDerivation rec {
- name = "iw-4.14";
+ pname = "iw";
+ version = "5.0";
src = fetchurl {
- url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
- sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph";
+ url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1ydgdsf3iycg3mx96aygwa7gcfddi5srxinlws5yxsa2rllnq5y7";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libnl ];
- makeFlags = [ "PREFIX=\${out}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = {
description = "Tool to use nl80211";
From b3d8b2d6ec936555e0b5d40380373f669bf47a21 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 3 Feb 2019 22:54:03 -0600
Subject: [PATCH 006/494] bison: 3.3.1 -> 3.3.2
http://lists.gnu.org/archive/html/bison-announce/2019-02/msg00000.html
---
pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 09d7daa97bf..57fed5c9e8d 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bison";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1";
+ sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg";
};
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
From 17ac9070b42c3e6a27686e1cef0e73defaaef28e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 4 Feb 2019 22:18:03 -0600
Subject: [PATCH 007/494] iw: 5.0 -> 5.0.1
---
pkgs/os-specific/linux/iw/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index 94ba595343a..387792b8631 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iw";
- version = "5.0";
+ version = "5.0.1";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1ydgdsf3iycg3mx96aygwa7gcfddi5srxinlws5yxsa2rllnq5y7";
+ sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y";
};
nativeBuildInputs = [ pkgconfig ];
From 09665fee2b72ccdd100ca8fc169ba649b15339d0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 7 Feb 2019 22:19:26 +0000
Subject: [PATCH 008/494] buildEnv: allowSubstitutes = false
trivial derivation
---
pkgs/build-support/buildenv/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 41a1e67ef42..337963106b4 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -63,6 +63,7 @@ runCommand name
priority = drv.meta.priority or 5;
}) paths);
preferLocalBuild = true;
+ allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
}
From 18e5db37bfa3c5ed31ed0e943cca66927c38a431 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 7 Feb 2019 22:20:42 +0000
Subject: [PATCH 009/494] substituteAll: allowSubstitutes = false;
trivial derivation
---
pkgs/build-support/substitute/substitute-all.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix
index 7fd46f95f99..57b160bbe90 100644
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
builder = ./substitute-all.sh;
inherit (args) src;
preferLocalBuild = true;
+ allowSubstitutes = false;
} // args)
From 5c28152a95cda27cac12048811ec3986aa578c63 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Feb 2019 00:22:51 +0000
Subject: [PATCH 010/494] substituteAllFiles: allowSubstitutes = false
trivial builder
---
pkgs/build-support/substitute-files/substitute-all-files.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix
index aa600a76650..66feb695c41 100644
--- a/pkgs/build-support/substitute-files/substitute-all-files.nix
+++ b/pkgs/build-support/substitute-files/substitute-all-files.nix
@@ -22,4 +22,5 @@ stdenv.mkDerivation ({
eval "$postInstall"
'';
preferLocalBuild = true;
+ allowSubstitutes = false;
} // args)
From 98e2820f593082b654a34f6de18851518001a503 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Feb 2019 00:24:14 +0000
Subject: [PATCH 011/494] makeFontsCache: allowSubstitutes = false
trivial builder
---
pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 1c88235b925..2ee0af8cfc1 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -4,6 +4,7 @@ runCommand "fc-cache"
rec {
buildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
+ allowSubstitutes = false;
passAsFile = [ "fontDirs" ];
fontDirs = ''
<!-- Font directories -->
From c706233f2e722aba83b7379b173341dd2afa27ce Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Feb 2019 00:27:40 +0000
Subject: [PATCH 012/494] buildFHSEnv: allowSubstitutes = false
trivial builder
---
pkgs/build-support/build-fhs-userenv/env.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 23568f51b23..c0f741b6288 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -196,4 +196,5 @@ in stdenv.mkDerivation {
${if isMultiBuild then extraBuildCommandsMulti else ""}
'';
preferLocalBuild = true;
+ allowSubstitutes = false;
}
From 015b0294b317f72bbffc577fcbb36054f339cf30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 11 Feb 2019 08:46:36 -0800
Subject: [PATCH 013/494] gnome3.librsvg: 2.44.11 -> 2.44.12 (#54779)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/librsvg/versions
---
pkgs/development/libraries/librsvg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 4f9619bdf56..9cd68cacfe7 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,14 +5,14 @@
let
pname = "librsvg";
- version = "2.44.11";
+ version = "2.44.12";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4";
+ sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6";
};
outputs = [ "out" "dev" "installedTests" ];
From 051fcba987a8d0ed6f8c5bd783661782cb0b86d7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 12 Feb 2019 00:29:28 +0100
Subject: [PATCH 014/494] swift-corefoundation: fix sandboxed build
---
.../darwin/swift-corelibs/corefoundation.nix | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index f819429f4de..6f7caa8ec02 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -8,7 +8,9 @@ let
url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c";
sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc";
};
-in stdenv.mkDerivation {
+in
+
+stdenv.mkDerivation {
name = "swift-corefoundation";
src = fetchFromGitHub {
@@ -34,6 +36,10 @@ in stdenv.mkDerivation {
--replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \
--replace "cf.LDFLAGS += '-ldispatch" '#'
+ # Fix sandbox impurities.
+ substituteInPlace ../lib/script.py \
+ --replace '/bin/cp' cp
+
# Includes xpc for some initialization routine that they don't define anyway, so no harm here
substituteInPlace PlugIn.subproj/CFBundlePriv.h \
--replace '#if (TARGET_OS_MAC' '#if (0'
@@ -53,7 +59,7 @@ in stdenv.mkDerivation {
BUILD_DIR = "./Build";
CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs
-
+
# I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra"
# and this version is a version from there. No idea how accurate it is.
LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize";
From 683dcb8e8a4b6425b6e8e85734df14d5ee8b279b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 11 Feb 2019 16:03:49 -0600
Subject: [PATCH 015/494] dhcpcd: 7.0.8 -> 7.1.1
---
pkgs/tools/networking/dhcpcd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index b9aa7156e86..04652ea868d 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
- name = "dhcpcd-7.0.8";
+ name = "dhcpcd-7.1.1";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.xz";
- sha256 = "1df95lv3cbs3dk718a2vyvzmv7qhpgcxzagb27ylmav96f48x5ln";
+ sha256 = "0h94g5nl9bg3x3qaajqaz6izl6mlvyjgp93nifnlfb7r7n3j8yd2";
};
nativeBuildInputs = [ pkgconfig ];
From b3171efe3b9d99ca4966afaa79dc3d86b794d7ae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 11 Feb 2019 16:02:54 -0600
Subject: [PATCH 016/494] ffmpeg: 4.1 -> 4.1.1
https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1.1
---
pkgs/development/libraries/ffmpeg/4.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 9821357de3b..738411d398d 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "4.1";
- sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n";
+ branch = "4.1.1";
+ sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c";
darwinFrameworks = [ Cocoa CoreMedia ];
})
From 3517d9c963d04b07687a366ef02a8497e527f1a6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 11 Feb 2019 17:06:07 -0600
Subject: [PATCH 017/494] libidn2: 2.1.0 -> 2.1.1
http://lists.gnu.org/archive/html/info-gnu/2019-02/msg00002.html
---
pkgs/development/libraries/libidn2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 3ff6b600193..b79cad7cb69 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libidn2-${version}";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
- sha256 = "0chxs75212qknd72l6vvai48hwg3czlr938sym1sydwmmbdrh8q3";
+ sha256 = "1cbq439dzf14jjpayk5mk0yyq32k3c27acg1d4ra364j6a060hcm";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
From 0f14c9cd8fe370b72eb2f39204e055f02440b80e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 11 Feb 2019 22:29:34 -0600
Subject: [PATCH 018/494] ninja: patch to fix w/musl, see upstream issue
---
pkgs/development/tools/build-managers/ninja/default.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 8cce2b88317..796747bf6e9 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9";
})
+ # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs?
+ #
+ (fetchpatch {
+ name = "fix-issue-1510.patch";
+ url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch;
+ sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69";
+ })
];
nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
From 2973f1780fa77425aa537e45fb319f4da90bbc9b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 12 Feb 2019 03:52:33 -0600
Subject: [PATCH 019/494] libuv: 1.24.1 -> 1.26.0
https://github.com/libuv/libuv/releases/tag/v1.26.0
https://github.com/libuv/libuv/releases/tag/v1.25.0
---
pkgs/development/libraries/libuv/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 10a2124199b..0a75fcbeda6 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
- version = "1.24.1";
- name = "libuv-${version}";
+ version = "1.26.0";
+ pname = "libuv";
src = fetchFromGitHub {
- owner = "libuv";
- repo = "libuv";
+ owner = pname;
+ repo = pname;
rev = "v${version}";
- sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab";
+ sha256 = "08jvjyn5bp4xnzd5g4pi534mklm6hz5pw6wbzbaq3cnwb6a04iwj";
};
postPatch = let
From a3db3e5d1296f37a9369f3a15ddf631c280013a6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 12 Feb 2019 12:19:41 -0600
Subject: [PATCH 020/494] gnupg: 2.2.12 -> 2.2.13
https://dev.gnupg.org/T4290
---
pkgs/tools/security/gnupg/22.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index ad4eae9578c..254a345839b 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
- version = "2.2.12";
+ version = "2.2.13";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
- sha256 = "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv";
+ sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn";
};
nativeBuildInputs = [ pkgconfig ];
From e27fa435f7dd15506e96ee6b794b447998e77997 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 13 Feb 2019 08:10:13 -0500
Subject: [PATCH 021/494] nss: 3.42 -> 3.42.1
---
pkgs/development/libraries/nss/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 57eab750695..056f98472be 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.42";
+ version = "3.42.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
- sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x";
+ sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88";
};
buildInputs = [ perl zlib sqlite ]
From 5888faeee617792cbb1991f812827f392f402c86 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Wed, 13 Feb 2019 21:38:42 +0100
Subject: [PATCH 022/494] groff: Remove indeterminism in manpages
It was caused by including the modification date
---
pkgs/tools/text/groff/default.nix | 5 ++++-
pkgs/tools/text/groff/mdate-determinism.patch | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 pkgs/tools/text/groff/mdate-determinism.patch
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 88d487da9b9..082c61635ba 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
- patches = [ ./look-for-ar.patch ];
+ patches = [
+ ./look-for-ar.patch
+ ./mdate-determinism.patch
+ ];
postPatch = stdenv.lib.optionalString (psutils != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \
diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/pkgs/tools/text/groff/mdate-determinism.patch
new file mode 100644
index 00000000000..1253d113394
--- /dev/null
+++ b/pkgs/tools/text/groff/mdate-determinism.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.comm b/Makefile.comm
+index 75efc22..b757000 100644
+--- a/Makefile.comm
++++ b/Makefile.comm
+@@ -155,7 +155,7 @@ extraclean: distclean
+ -e "s|@MAN1EXT@|$(man1ext)|g" \
+ -e "s|@MAN5EXT@|$(man5ext)|g" \
+ -e "s|@MAN7EXT@|$(man7ext)|g" \
+- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
++ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
+ -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
+ -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
+ -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
From 606ceda352de9830cc5e01c169571e742d88fb15 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 13 Feb 2019 22:47:50 +0100
Subject: [PATCH 023/494] gnome3: stop using aliases
---
.../services/x11/desktop-managers/xfce.nix | 2 +-
.../display-managers/lightdm-greeters/gtk.nix | 8 +--
pkgs/applications/audio/audacious/default.nix | 2 +-
.../audio/cozy-audiobooks/default.nix | 2 +-
pkgs/applications/audio/easytag/default.nix | 2 +-
pkgs/applications/audio/gpodder/default.nix | 2 +-
pkgs/applications/audio/gtkpod/default.nix | 2 +-
.../audio/pavucontrol/default.nix | 2 +-
pkgs/applications/audio/quodlibet/default.nix | 2 +-
pkgs/applications/audio/rhythmbox/default.nix | 2 +-
pkgs/applications/audio/sonata/default.nix | 2 +-
.../audio/sound-juicer/default.nix | 2 +-
.../applications/editors/bluefish/default.nix | 2 +-
.../editors/gnome-latex/default.nix | 6 +-
.../applications/graphics/avocode/default.nix | 2 +-
pkgs/applications/graphics/gthumb/default.nix | 7 +-
.../graphics/shotwell/default.nix | 2 +-
.../graphics/synfigstudio/default.nix | 4 +-
pkgs/applications/graphics/vimiv/default.nix | 4 +-
.../misc/font-manager/default.nix | 2 +-
.../misc/gnome-recipes/default.nix | 4 +-
.../applications/misc/gnome-usage/default.nix | 2 +-
pkgs/applications/misc/gummi/default.nix | 2 +-
pkgs/applications/misc/pcmanfm/default.nix | 2 +-
pkgs/applications/misc/safeeyes/default.nix | 2 +-
pkgs/applications/misc/tootle/default.nix | 4 +-
.../networking/browsers/brave/default.nix | 2 +-
.../networking/browsers/chromium/default.nix | 2 +-
.../browsers/firefox-bin/default.nix | 4 +-
.../networking/browsers/firefox/wrapper.nix | 2 +-
.../browsers/google-chrome/default.nix | 2 +-
.../networking/browsers/midori/default.nix | 4 +-
.../tor-browser-bundle-bin/default.nix | 4 +-
.../feedreaders/feedreader/default.nix | 6 +-
.../networking/ftp/taxi/default.nix | 4 +-
.../instant-messengers/coyim/default.nix | 4 +-
.../instant-messengers/dino/default.nix | 6 +-
.../instant-messengers/ekiga/default.nix | 2 +-
.../instant-messengers/gajim/default.nix | 4 +-
.../mailreaders/astroid/default.nix | 11 +--
.../mailreaders/mailnag/default.nix | 2 +-
.../mailreaders/thunderbird-bin/default.nix | 4 +-
.../mailreaders/thunderbird/default.nix | 2 +-
.../networking/remote/remmina/default.nix | 4 +-
.../networking/weather/meteo/default.nix | 4 +-
pkgs/applications/office/abiword/default.nix | 4 +-
pkgs/applications/office/gnumeric/default.nix | 2 +-
pkgs/applications/office/grisbi/default.nix | 2 +-
pkgs/applications/office/homebank/default.nix | 2 +-
.../office/libreoffice/default.nix | 4 +-
.../applications/office/libreoffice/still.nix | 4 +-
.../applications/office/paperwork/default.nix | 4 +-
pkgs/applications/office/tryton/default.nix | 2 +-
.../science/math/nasc/default.nix | 6 +-
.../science/math/wxmaxima/default.nix | 2 +-
.../version-management/meld/default.nix | 2 +-
pkgs/applications/video/pitivi/default.nix | 2 +-
pkgs/applications/video/screenkey/default.nix | 4 +-
.../virtualization/open-vm-tools/default.nix | 4 +-
.../virtualization/virt-manager/default.nix | 2 +-
.../gnome-3/apps/accerciser/default.nix | 2 +-
.../gnome-3/apps/evolution/default.nix | 20 +++---
.../gnome-3/apps/file-roller/default.nix | 4 +-
pkgs/desktops/gnome-3/apps/gedit/default.nix | 9 +--
pkgs/desktops/gnome-3/apps/ghex/default.nix | 15 +++--
pkgs/desktops/gnome-3/apps/glade/default.nix | 2 +-
.../gnome-3/apps/gnome-boxes/default.nix | 2 +-
.../gnome-3/apps/gnome-calendar/default.nix | 6 +-
.../gnome-3/apps/gnome-characters/default.nix | 8 +--
.../gnome-3/apps/gnome-clocks/default.nix | 5 +-
.../gnome-3/apps/gnome-documents/default.nix | 2 +-
.../gnome-3/apps/gnome-logs/default.nix | 2 +-
.../gnome-3/apps/gnome-maps/default.nix | 2 +-
.../gnome-3/apps/gnome-music/default.nix | 2 +-
.../gnome-3/apps/gnome-nettool/default.nix | 2 +-
.../gnome-3/apps/gnome-notes/default.nix | 2 +-
.../gnome-3/apps/gnome-photos/default.nix | 2 +-
.../apps/gnome-power-manager/default.nix | 2 +-
.../gnome-3/apps/gnome-todo/default.nix | 10 +--
.../gnome-3/apps/gnome-weather/default.nix | 2 +-
.../gnome-3/apps/seahorse/default.nix | 2 +-
.../desktops/gnome-3/apps/vinagre/default.nix | 2 +-
.../core/adwaita-icon-theme/default.nix | 4 +-
pkgs/desktops/gnome-3/core/baobab/default.nix | 2 +-
.../desktops/gnome-3/core/caribou/default.nix | 4 +-
.../desktops/gnome-3/core/empathy/default.nix | 2 +-
.../gnome-3/core/epiphany/default.nix | 6 +-
pkgs/desktops/gnome-3/core/evince/default.nix | 11 +--
.../core/evolution-data-server/default.nix | 7 +-
pkgs/desktops/gnome-3/core/gdm/default.nix | 4 +-
.../gnome-3/core/gnome-bluetooth/default.nix | 2 +-
.../gnome-3/core/gnome-calculator/default.nix | 2 +-
.../gnome-3/core/gnome-contacts/default.nix | 2 +-
.../core/gnome-control-center/default.nix | 11 +--
.../gnome-3/core/gnome-dictionary/default.nix | 4 +-
.../core/gnome-disk-utility/default.nix | 18 +++--
.../core/gnome-font-viewer/default.nix | 15 +++--
.../core/gnome-online-accounts/default.nix | 6 +-
.../core/gnome-online-miners/default.nix | 26 ++++---
.../gnome-3/core/gnome-screenshot/default.nix | 2 +-
.../gnome-3/core/gnome-session/default.nix | 4 +-
.../core/gnome-settings-daemon/default.nix | 10 +--
.../gnome-3/core/gnome-shell/default.nix | 19 +++---
.../gnome-3/core/gnome-software/default.nix | 5 +-
.../core/gnome-system-monitor/default.nix | 2 +-
.../gnome-3/core/gnome-terminal/default.nix | 4 +-
.../core/gnome-themes-extra/default.nix | 2 +-
.../gnome-3/core/gnome-user-share/default.nix | 22 +++---
.../gnome-3/core/grilo-plugins/default.nix | 10 +--
.../gnome-3/core/gucharmap/default.nix | 4 +-
pkgs/desktops/gnome-3/core/mutter/3.28.nix | 11 +--
pkgs/desktops/gnome-3/core/mutter/default.nix | 20 +++---
.../gnome-3/core/nautilus/default.nix | 4 +-
.../gnome-3/core/simple-scan/default.nix | 6 +-
pkgs/desktops/gnome-3/core/totem/default.nix | 13 ++--
.../gnome-3/core/tracker-miners/default.nix | 6 +-
pkgs/desktops/gnome-3/core/vino/default.nix | 2 +-
pkgs/desktops/gnome-3/core/yelp/default.nix | 2 +-
pkgs/desktops/gnome-3/core/zenity/default.nix | 15 +++--
pkgs/desktops/gnome-3/default.nix | 28 ++++----
.../gnome-3/devtools/devhelp/default.nix | 2 +-
.../gnome-3/devtools/nemiver/default.nix | 4 +-
.../desktops/gnome-3/games/atomix/default.nix | 2 +-
.../gnome-3/games/five-or-more/default.nix | 2 +-
.../gnome-3/games/four-in-a-row/default.nix | 2 +-
.../gnome-3/games/gnome-chess/default.nix | 2 +-
.../gnome-3/games/gnome-klotski/default.nix | 2 +-
.../gnome-3/games/gnome-mahjongg/default.nix | 2 +-
.../gnome-3/games/gnome-mines/default.nix | 2 +-
.../gnome-3/games/gnome-nibbles/default.nix | 2 +-
.../gnome-3/games/gnome-robots/default.nix | 2 +-
.../gnome-3/games/gnome-sudoku/default.nix | 4 +-
.../gnome-3/games/gnome-taquin/default.nix | 2 +-
.../gnome-3/games/gnome-tetravex/default.nix | 2 +-
.../desktops/gnome-3/games/hitori/default.nix | 2 +-
pkgs/desktops/gnome-3/games/iagno/default.nix | 2 +-
.../gnome-3/games/lightsoff/default.nix | 2 +-
.../gnome-3/games/quadrapassel/default.nix | 2 +-
.../gnome-3/games/swell-foop/default.nix | 2 +-
pkgs/desktops/gnome-3/games/tali/default.nix | 2 +-
pkgs/desktops/gnome-3/misc/geary/default.nix | 9 +--
pkgs/desktops/gnome-3/misc/gitg/default.nix | 7 +-
.../gnome-3/misc/gnome-flashback/default.nix | 4 +-
.../gnome-3/misc/gnome-packagekit/default.nix | 4 +-
.../gnome-3/misc/gnome-panel/default.nix | 4 +-
.../misc/gnome-screensaver/default.nix | 4 +-
.../gnome-3/misc/gnome-tweaks/default.nix | 2 +-
.../gnome-3/misc/metacity/default.nix | 4 +-
.../gnome-3/misc/pomodoro/default.nix | 2 +-
pkgs/desktops/mate/pluma/default.nix | 2 +-
.../elementary-settings-daemon/default.nix | 9 +--
.../haskell-modules/configuration-nix.nix | 2 +-
.../haskell-modules/hackage-packages.nix | 45 ++++++-------
pkgs/development/libraries/amtk/default.nix | 4 +-
pkgs/development/libraries/aravis/default.nix | 2 +-
pkgs/development/libraries/gegl/4.0.nix | 4 +-
.../libraries/geocode-glib/default.nix | 6 +-
pkgs/development/libraries/libgda/default.nix | 4 +-
.../libraries/libgdata/default.nix | 3 +-
.../libraries/osm-gps-map/default.nix | 7 +-
.../development/tools/misc/d-feet/default.nix | 2 +-
.../tools/profiling/sysprof/default.nix | 2 +-
pkgs/misc/emulators/cdemu/analyzer.nix | 2 +-
pkgs/misc/emulators/cdemu/gui.nix | 2 +-
pkgs/os-specific/linux/piper/default.nix | 2 +-
pkgs/tools/audio/gvolicon/default.nix | 2 +-
pkgs/tools/audio/pasystray/default.nix | 2 +-
pkgs/tools/graphics/luxcorerender/default.nix | 4 +-
.../inputmethods/fcitx/fcitx-configtool.nix | 2 +-
pkgs/tools/networking/gupnp-tools/default.nix | 2 +-
.../networking/network-manager/applet.nix | 6 +-
.../network-manager/fortisslvpn/default.nix | 4 +-
.../network-manager/iodine/default.nix | 4 +-
.../network-manager/l2tp/default.nix | 4 +-
.../network-manager/openconnect/default.nix | 4 +-
.../network-manager/openvpn/default.nix | 4 +-
.../network-manager/vpnc/default.nix | 4 +-
pkgs/tools/security/onioncircuits/default.nix | 4 +-
pkgs/top-level/all-packages.nix | 67 ++++++-------------
179 files changed, 464 insertions(+), 447 deletions(-)
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index dabf09418da..6852154378d 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -53,7 +53,7 @@ in
# Supplies some abstract icons such as:
# utilities-terminal, accessories-text-editor
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
hicolor-icon-theme
tango-icon-theme
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index efec943c007..76fb0e619d7 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -95,8 +95,8 @@ in
package = mkOption {
type = types.package;
- default = pkgs.gnome3.defaultIconTheme;
- defaultText = "pkgs.gnome3.defaultIconTheme";
+ default = pkgs.gnome3.adwaita-icon-theme;
+ defaultText = "pkgs.gnome3.adwaita-icon-theme";
description = ''
The package path that contains the icon theme given in the name option.
'';
@@ -115,8 +115,8 @@ in
cursorTheme = {
package = mkOption {
- default = pkgs.gnome3.defaultIconTheme;
- defaultText = "pkgs.gnome3.defaultIconTheme";
+ default = pkgs.gnome3.adwaita-icon-theme;
+ defaultText = "pkgs.gnome3.adwaita-icon-theme";
description = ''
The package path that contains the cursor theme given in the name option.
'';
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 19cb55d93c9..68660b5d054 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gettext glib gtk3 libmowgli dbus-glib libxml2
- xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
+ xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
index b7b8a4410b7..53ab4fd6f2f 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
gtk3
cairo
gettext
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
] ++ (with gst_all_1; [
gstreamer
gst-plugins-good
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index e61b9d8b290..c6fb7c67d58 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
- gsettings-desktop-schemas gnome3.defaultIconTheme
+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
doCheck = false; # fails 1 out of 9 tests
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 2544be383e5..9a3ad5e0bc3 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
python3
gobject-introspection
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
checkInputs = with python3Packages; [
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index c40f84348de..0727ab56f7d 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
- gdl gnome3.defaultIconTheme gnome3.anjuta
+ gdl gnome3.adwaita-icon-theme gnome3.anjuta
] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 06398324491..4d9b856499a 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index a1d85ac91e8..d457f25e316 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
- buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
+ buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1;
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index e540016ac81..eab50c90479 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
gtk3
gnome3.libpeas
totem-pl-parser
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 012270905cc..4e24f1edf49 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -19,7 +19,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
intltool wrapGAppsHook
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index 686b27223a6..303532aca63 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
- glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme
+ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 1c2e3a42578..f78f7fbf914 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.defaultIconTheme gtk libxml2
+ buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
enchant gucharmap python ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
index 71d0f9450f2..ff6439c8654 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wrapGAppsHook
+{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let
version = "3.30.2";
@@ -21,9 +21,9 @@ in stdenv.mkDerivation {
intltool
];
- buildInputs = with gnome3; [
+ buildInputs = [
amtk
- defaultIconTheme
+ gnome3.adwaita-icon-theme
glib
gsettings-desktop-schemas
gspell
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 7777be91897..962940d076b 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
};
- libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
+ libPath = stdenv.lib.makeLibraryPath (with xorg; [
stdenv.cc.cc.lib
gdk_pixbuf
glib
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index e8f831a21c2..e88c9222b87 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
+ glib, gtk3, gsettings-desktop-schemas,
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
flex, wrapGAppsHook, shared-mime-info }:
@@ -16,10 +17,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
- buildInputs = with gnome3; [
- glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ buildInputs = [
+ glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
- librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme
+ librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 2f06451438d..da9fae2441c 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
- gcr gnome3.defaultIconTheme libgdata
+ gcr gnome3.adwaita-icon-theme libgdata
];
postPatch = ''
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 63d35cc5453..b399dd2d228 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
-, imagemagick, intltool, autoreconfHook, which, defaultIconTheme
+, imagemagick, intltool, autoreconfHook, which, gnome3
}:
let
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
- synfig which defaultIconTheme
+ synfig which gnome3.adwaita-icon-theme
];
postInstall = ''
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index e790ef49acb..5fc7e309f4d 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
-, hicolor-icon-theme, defaultIconTheme
+, hicolor-icon-theme, gnome3
# Test requirements
, dbus, xvfb_run, xdotool
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
- buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
+ buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index bf97cff5030..da5cf83c02c 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
sqlite
librsvg
gnome3.gtk
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
patches = [ ./correct-post-install.patch ];
diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix
index 154af4efc9b..1cf6f547c30 100644
--- a/pkgs/applications/misc/gnome-recipes/default.nix
+++ b/pkgs/applications/misc/gnome-recipes/default.nix
@@ -13,7 +13,7 @@
, glib
, libsoup
, gnome-online-accounts
-, rest
+, librest
, json-glib
, gnome-autoar
, gspell
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
glib
libsoup
gnome-online-accounts
- rest
+ librest
json-glib
gnome-autoar
gspell
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index f5420a0c944..724707d0be5 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
- buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x build-aux/meson/postinstall.sh
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 6c84f3cbd32..1e237923d05 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
preConfigure = ''
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 2649c7cbd6a..633c1d82159 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
};
- buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index deb456e53ed..dfacdc75f1c 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -17,7 +17,7 @@ in buildPythonApplication rec {
buildInputs = [
gtk3
gobject-introspection
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.adwaita-icon-theme
];
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 5a856a5f2b2..413f082fb22 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, python3
+, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
- gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
+ libgee gnome3.libsoup gsettings-desktop-schemas
];
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index f74e64d3798..b1ed151f4dd 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg wrapGAppsHook ];
- buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ];
+ buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 88b0a89db4b..a909759bedf 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -78,7 +78,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
outputs = ["out" "sandbox"];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 2d9692c0528..bcebb321a2c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -31,7 +31,7 @@
, libgnome
, libgnomeui
, libnotify
-, defaultIconTheme
+, gnome3
, libGLU_combined
, nspr
, nss
@@ -141,7 +141,7 @@ stdenv.mkDerivation {
inherit gtk3;
- buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
+ buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
# "strip" after "patchelf" may break binaries.
# See: https://github.com/NixOS/patchelf/issues/10
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bc3a1ed844a..90df5c40395 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -131,7 +131,7 @@ let
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)
''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
''
}
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 6043744f296..b0ae61c761d 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
gsettings-desktop-schemas glib gtk
# needed for XDG_ICON_DIRS
- gnome.defaultIconTheme
+ gnome.adwaita-icon-theme
];
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 290810198ad..13120903383 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr
+{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
- (libsoup.override { gnomeSupport = true; }) gnome3.libpeas
+ (libsoup.override { gnomeSupport = true; }) libpeas
glib-networking
];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 74ee7c302e6..99c70f01241 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -39,7 +39,7 @@
# Wrapper runtime
, coreutils
, glibcLocales
-, defaultIconTheme
+, gnome3
, runtimeShell
, shared-mime-info
, gsettings-desktop-schemas
@@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
EOF
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
- defaultIconTheme
+ gnome3.adwaita-icon-theme
shared-mime-info
]}
WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index a7cfc605824..f93b34b52f5 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
+, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo
}:
@@ -29,10 +30,9 @@ stdenv.mkDerivation rec {
buildInputs = [
curl glib json-glib libnotify libsecret sqlite gumbo
- ] ++ (with gnome3; [
- gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
+ gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gnome3.gnome-online-accounts
gsettings-desktop-schemas
- ]) ++ (with gst_all_1; [
+ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
]);
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
index 9252b95a00c..25ec5d29613 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
-, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
+, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "taxi";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pantheon.granite
- gnome3.libgee
+ libgee
gtk3
libsecret
libsoup
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 1e88456e6b2..86fb3d7de2c 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
- cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }:
+ cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
buildGoPackage rec {
name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "a safe and secure chat client";
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 0ee051a87fb..6e57ae85ef5 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,7 +2,7 @@
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon
-, libnotify, libsoup
+, libnotify, libsoup, libgee
, libgcrypt
, epoxy
, at-spi2-core
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
gobject-introspection
glib-networking
glib
- gnome3.libgee
- gnome3.defaultIconTheme
+ libgee
+ gnome3.adwaita-icon-theme
sqlite
gdk_pixbuf
gtk3
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 18d593bbdec..0fea8f0574b 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
- gnome3.libsoup glib gnome3.defaultIconTheme boost
+ gnome3.libsoup glib gnome3.adwaita-icon-theme boost
autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1
gmp nettle makeWrapper ]
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index cf4e6358dff..8c1af783602 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, wrapGAppsHook
# Native dependencies
-, python3, gtk3, gobject-introspection, defaultIconTheme
+, python3, gtk3, gobject-introspection, gnome3
# Test dependencies
, xvfb_run, dbus
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
'';
buildInputs = [
- gobject-introspection gtk3 defaultIconTheme
+ gobject-introspection gtk3 gnome3.adwaita-icon-theme
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 006684ecc10..41f3a271a69 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
+, gtkmm3, libpeas, gsettings-desktop-schemas
, makeWrapper, python3, python3Packages
, vim ? vim_configurable.override {
features = "normal";
@@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
- python3 python3Packages.pygobject3
- notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
- glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
+ buildInputs = [
+ gtkmm3 gmime3 webkitgtk libsass libpeas
+ python3 python3Packages.pygobject3
+ notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
+ glib-networking protobuf
+ ] ++ (if vim == null then [] else [ vim ]);
postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 2b62db069bc..56a676178cc 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -21,7 +21,7 @@ in pythonPackages.buildPythonApplication rec {
gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index ed798ee9233..5ca6b52d8c4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -30,7 +30,7 @@
, libcanberra-gtk2
, libgnome
, libgnomeui
-, defaultIconTheme
+, gnome3
, libGLU_combined
, nspr
, nss
@@ -117,7 +117,7 @@ stdenv.mkDerivation {
stdenv.cc.cc
];
- buildInputs = [ gtk3 defaultIconTheme ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index c8132585fb0..ff090aac769 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
hunspell libevent libstartup_notification /* cairo */
icu libpng jemalloc
]
- ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ];
+ ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
# from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index a53bea23e19..a4324f3c4a2 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -6,7 +6,7 @@
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them.
-, hicolor-icon-theme, adwaita-icon-theme
+, hicolor-icon-theme, gnome3
}:
with stdenv.lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
- openssl hicolor-icon-theme adwaita-icon-theme json-glib
+ openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib
];
cmakeFlags = [
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 149e126d6e8..67418838d74 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
-, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
+, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter
clutter-gtk
- gnome3.geocode-glib
+ geocode-glib
gtk3
json-glib
libappindicator
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 8dd127715ae..6808a81bec1 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt, goffice, wrapGAppsHook, iconTheme
+, boost, libxslt, goffice, wrapGAppsHook, gnome3
}:
stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt
- libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
+ libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e42777bdd00..87aaf85d950 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection?
buildInputs = [
- goffice gtk3 gnome3.defaultIconTheme
+ goffice gtk3 gnome3.adwaita-icon-theme
python pygobject3
] ++ (with perlPackages; [ perl XMLParser ]);
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 7c07082b304..f901123065f 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "A personnal accounting application.";
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 12b5aef898d..f93b7f42c68 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "Free, easy, personal accounting for everyone";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b60874e7c3c..5853face10c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, epoxy, gpgme
+, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
@@ -277,7 +277,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index ff8823e3d9c..64b12263e9a 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, epoxy, gpgme
+, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
@@ -272,7 +272,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index a48b6e1e116..8d76f160d7b 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
# Patch out a few paths that assume that we're using the FHS:
postPatch = ''
- themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)"
+ themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)"
sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
sed -i -e 's,sys\.prefix,"",g' \
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = [ xvfb_run dbus.daemon ];
buildInputs = [
- gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg
+ gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
];
# A few parts of chkdeps need to have a display and a dbus session, so we not
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 833cb7fc56a..4422aaa2b44 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec {
buildInputs = [
atk
gtk3
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gtkspell3
goocanvas2
];
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index fb0ea206735..aef18abaedf 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -4,6 +4,8 @@
, gtk3
, pantheon
, gnome3
+, gtksourceview
+, libgee
, cmake
, libqalculate
, gobject-introspection
@@ -35,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [
pantheon.elementary-icon-theme
- gnome3.gtksourceview
- gnome3.libgee
+ gtksourceview
+ libgee
gnome3.libsoup
pantheon.granite
gtk3
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 67cdaa4055a..d9de12d4576 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
};
- buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
+ buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6456dd75b52..83f26fa08fc 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
intltool itstool libxml2 gobject-introspection wrapGAppsHook
];
buildInputs = [
- gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
+ gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 2cd4f19ca93..6e0b7412558 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify
gst-transcoder
] ++ (with gst_all_1; [
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
index 6042f490dfa..1671c3f14d0 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -9,7 +9,7 @@
, libX11
, libXtst
, wrapGAppsHook
-, defaultIconTheme
+, gnome3
, hicolor-icon-theme
}:
buildPythonApplication rec {
@@ -39,7 +39,7 @@ buildPythonApplication rec {
];
buildInputs = [
- defaultIconTheme
+ gnome3.adwaita-icon-theme
hicolor-icon-theme
];
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index a43e1733f06..0668400d28c 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
- pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
+ pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
withX ? true }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
- ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
+ ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [ ./recognize_nixos.patch ];
postPatch = ''
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 52732f0c5f1..3163ab50150 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
];
buildInputs =
- [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
+ [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
gsettings-desktop-schemas libosinfo gtk3
] ++ optional spiceSupport spice-gtk;
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 5de7d93f49c..4815103893f 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
- at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
+ at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
];
wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index dc598267c4b..0b86cfbf86a 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -1,5 +1,7 @@
{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3
+, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
+, adwaita-icon-theme, gnome-desktop, libgdata
+, libgweather, glib-networking, gsettings-desktop-schemas
, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
@@ -14,17 +16,17 @@ in stdenv.mkDerivation rec {
sha256 = "10dy08xpizvvj7r8xgs3lr6migm3ipr199yryqz7wgkycq6nf53b";
};
- propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
+ propagatedUserEnvPkgs = [ evolution-data-server ];
buildInputs = [
- gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
- gnome3.evolution-data-server libsecret libical gcr
- webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
- libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
+ gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
+ evolution-data-server libsecret libical gcr
+ webkitgtk shared-mime-info gnome-desktop gtkspell3
+ libcanberra-gtk3 bogofilter libgdata sqlite
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
- nss nspr libnotify procps highlight gnome3.libgweather
- gnome3.gsettings-desktop-schemas
- gnome3.glib-networking openldap
+ nss nspr libnotify procps highlight libgweather
+ gsettings-desktop-schemas
+ glib-networking openldap
];
nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index fe307bca797..5ee26eba6b7 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
+{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
- buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
+ buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 61eda942194..8310f426be6 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,5 +1,6 @@
{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
+, pkgconfig, gtk3, glib, adwaita-icon-theme
+, libpeas, gtksourceview, gsettings-desktop-schemas
, wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, gspell }:
@@ -16,9 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib
- gnome3.defaultIconTheme libsoup
- gnome3.libpeas gnome3.gtksourceview
- gnome3.gsettings-desktop-schemas gspell
+ adwaita-icon-theme libsoup
+ libpeas gtksourceview
+ gsettings-desktop-schemas gspell
];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
index d9f1e7850af..388808b7d64 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2,
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
- };
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.gtk intltool itstool libxml2 ];
+ buildInputs = [ gtk3 intltool itstool libxml2 ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "ghex";
+ attrPath = "gnome3.ghex";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Ghex;
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 39e0f2ba23e..9adffc7922c 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 357cd42d66b..21690287245 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
- gnome3.defaultIconTheme librsvg acl libgudev libsecret
+ gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
libcap_ng numactl xen libapparmor
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 8cc8712a15d..9b48e323191 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
-, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
+, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
let
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
buildInputs = [
- gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
- gsettings-desktop-schemas gnome3.defaultIconTheme
+ gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 047f9bc2210..101b9f4a62e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
-, gobject-introspection, gjs, libunistring }:
+, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
stdenv.mkDerivation rec {
name = "gnome-characters-${version}";
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
buildInputs = [
- glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
- gnome3.defaultIconTheme libunistring
+ glib gtk3 gjs pango gsettings-desktop-schemas
+ adwaita-icon-theme libunistring
# typelib
- gnome3.gnome-desktop
+ gnome-desktop
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 30323cf62f5..c614dc6486c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
+, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
gobject-introspection # for finding vapi files
];
buildInputs = [
- gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
- gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
+ gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
+ gnome-desktop geocode-glib geoclue2 libgweather gsound
];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index d2792304016..186f3a14d27 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme evince
+ gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata
gnome-desktop libzapojit libgepub
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c6140a53fd9..89f4cc01e50 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
];
- buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 2f7e5bbe807..d7df923339a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server
- gnome-online-accounts gnome3.defaultIconTheme
+ gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 3edf1f5dd40..ea12dff14fc 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = with gst_all_1; [
gtk3 glib libmediaart gnome-online-accounts
- gdk_pixbuf gnome3.defaultIconTheme python3
+ gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup
gnome3.gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index dcee87dc799..9bc71bb4338 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook libgtop intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
propagatedUserEnvPkgs = [ nmap inetutils ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index e39ce00fd65..78c39651ad6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas
evolution-data-server
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 508b8af3f4f..8c0c216965d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo
gnome-online-accounts tracker
gexiv2 geocode-glib dleyna-renderer
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index 3f8ce7f4a51..2d9c313e641 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
gtk3
glib
upower
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 37b48a74482..23b671ebfc0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
-, gettext, gnome3, glib, gtk, libpeas
+, gettext, gnome3, glib, gtk3, libpeas
, gnome-online-accounts, gsettings-desktop-schemas
-, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
+, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
let
pname = "gnome-todo";
@@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext python3 wrapGAppsHook
];
buildInputs = [
- glib gtk libpeas gnome-online-accounts
- gsettings-desktop-schemas gnome3.defaultIconTheme
+ glib gtk3 libpeas gnome-online-accounts
+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
# Plug-ins
evolution-data-server libxml2 libsoup libical
- rest json-glib
+ librest json-glib
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 6a827b7f0e3..5ae279f57f0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop
- libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
+ libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
];
# The .service file isn't wrapped with the correct environment
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 9ef2b57e6d1..84f7b519d1e 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg
- gnome3.defaultIconTheme gpgme
+ gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit
openssh openldap
];
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 00037f526b6..ae360d73b87 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
- gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
+ gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
];
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 4fa40a6c1b0..b091395ab37 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }:
+, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "adwaita-icon-theme-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gdk_pixbuf librsvg ];
- nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ];
# remove a tree of dirs with no files within
postInstall = '' rm -rf "$out/locale" '';
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index c29e3ff5200..cf73524a0ca 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
- buildInputs = [ gtk3 glib gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index fe2b50f296a..bad06bae405 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
-, wrapGAppsHook }:
+, wrapGAppsHook, libgee }:
let
pname = "caribou";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
libXtst gtk2
];
- propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+ propagatedBuildInputs = [ libgee libxklavier ];
postPatch = ''
patchShebangs .
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 1a4ef2a1cf4..19f2783be3d 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11-kit
libcanberra-gtk3 telepathy-farstream farstream
- gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
librsvg
# Spell-checking
enchant isocodes
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index c8ca0016d57..37cdce40f34 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
+{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils, python3
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
+ gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
sqlite isocodes p11-kit icu
- gdk_pixbuf gnome3.defaultIconTheme gcr
+ gdk_pixbuf gnome3.adwaita-icon-theme gcr
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav json-glib libdazzle
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 94d39964bc4..1a01bd307ea 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, pkgconfig, intltool, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
-, librsvg, gobject-introspection, yelp-tools, gspell
+, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas
+, libgxps
, recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps
, autoreconfHook, pruneLibtoolFiles
@@ -26,10 +27,10 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 pango atk gdk_pixbuf libxml2
- gnome3.gsettings-desktop-schemas
+ gsettings-desktop-schemas
poppler ghostscriptX djvulibre libspectre libarchive
- libsecret librsvg gnome3.adwaita-icon-theme gspell
- ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
+ libsecret librsvg adwaita-icon-theme gspell
+ ] ++ stdenv.lib.optional supportXPS libgxps;
configureFlags = [
"--disable-nautilus" # Do not build nautilus plugin
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
(if supportXPS then "--enable-xps" else "--disable-xps")
];
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 89f6ccc1710..3daeb8d6155 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
-, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
+, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib
+, glib, gtk3, gnome-online-accounts, libgweather, libgdata }:
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala
];
- buildInputs = with gnome3; [
- glib libsoup libxml2 gtk gnome-online-accounts
+ buildInputs = [
+ glib libsoup libxml2 gtk3 gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib
icu sqlite kerberos openldap webkitgtk glib-networking
libcanberra-gtk3 pcre
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 135200ee3c4..aa6374d00ec 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
+, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
, librsvg, coreutils, xwayland, fetchpatch }:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
buildInputs = [
glib accountsservice systemd
- gobject-introspection libX11 gtk
+ gobject-introspection libX11 gtk3
libcanberra-gtk3 pam plymouth librsvg
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index b065025327f..e09d0b4e6f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3
- gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 4a37599b136..037509b9c54 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 gtksourceview3 mpfr gmp
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libsoup libmpc
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a7347f74ca4..253bbc4e196 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
folks gnome-desktop telepathy-glib
libxml2 gnome-online-accounts cheese
- gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib
+ gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index f1423f883d4..0862cda759a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -5,7 +5,10 @@
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
-, fontconfig, sound-theme-freedesktop, grilo, python3 }:
+, fontconfig, sound-theme-freedesktop, grilo, python3
+, gtk3, glib, glib-networking, gsettings-desktop-schemas
+, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
+, vino, gnome-bluetooth, tracker, adwaita-icon-theme }:
let
pname = "gnome-control-center";
@@ -23,13 +26,13 @@ in stdenv.mkDerivation rec {
shared-mime-info python3
];
- buildInputs = with gnome3; [
- ibus gtk glib glib-networking upower gsettings-desktop-schemas
+ buildInputs = [
+ ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
- gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
+ gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 1019a809d7f..a15d2d7f6e6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
-, gnome3, gtk, glib }:
+, gnome3, gtk3, glib }:
stdenv.mkDerivation rec {
name = "gnome-dictionary-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
];
- buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 5d224623c3c..629dfe0421b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,5 +1,5 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify
+, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
@@ -12,17 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; };
- };
-
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt docbook_xsl
wrapGAppsHook python3 libxml2
];
+
buildInputs = [
- gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
- udisks2 gnome3.defaultIconTheme
+ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
+ udisks2 gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
];
@@ -31,6 +28,13 @@ stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-disk-utility";
+ attrPath = "gnome3.gnome-disk-utility";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
description = "A udisks graphical front-end";
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 06a5b258c80..3e8f7d3617f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl
-, pkgconfig, gtk3, glib, libxml2
+, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
, wrapGAppsHook, gnome3 }:
stdenv.mkDerivation rec {
@@ -11,18 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; };
- };
-
doCheck = true;
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
- buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ];
# Do not run meson-postinstall.sh
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-font-viewer";
+ attrPath = "gnome3.gnome-font-viewer";
+ };
+ };
+
meta = with stdenv.lib; {
description = "Program that can preview fonts and create thumbnails for fonts";
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 4ceb0335c18..f797c6b8914 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection
+{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
+, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
, gettext, icu, glib-networking
, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
}:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
];
buildInputs = [
- glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup
+ glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
gcr kerberos
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 6deefaa3673..ed4c1a3da13 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
+, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
+, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gnome-online-miners-${version}";
@@ -10,19 +11,24 @@ stdenv.mkDerivation rec {
sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; };
- };
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
- gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
- gnome3.gnome-online-accounts gnome3.libmediaart
- gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest
- dleyna-server ];
+ buildInputs = [
+ glib libgdata libxml2 libsoup gmp openssl
+ grilo libzapojit grilo-plugins
+ gnome-online-accounts libmediaart
+ tracker gfbgraph json-glib librest
+ dleyna-server
+ ];
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-online-miners";
+ attrPath = "gnome3.gnome-online-miners";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
description = "A set of crawlers that go through your online content and index them locally in Tracker";
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index fc39ea81223..3ce2a4433ac 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
- gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
+ gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 2f44a4e168d..34921d46b4c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
+{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
+ glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index c76ba218c9a..7a2271e128d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst
+, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
-, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
+, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
stdenv.mkDerivation rec {
name = "gnome-settings-daemon-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
- buildInputs = with gnome3; [
- ibus gtk glib gsettings-desktop-schemas networkmanager
+ buildInputs = [
+ ibus gtk3 glib gsettings-desktop-schemas networkmanager
libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 76e5bd13522..693a3bec486 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,9 +2,10 @@
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd
-, sassc, systemd, gst_all_1 }:
+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
+, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
+, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@@ -26,16 +27,16 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc desktop-file-utils libxslt.bin
];
- buildInputs = with gnome3; [
+ buildInputs = [
systemd caribou
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
libcroco libsecret libsoup polkit gdk_pixbuf librsvg
clutter networkmanager libstartup_notification telepathy-glib
libXtst gjs mutter libpulseaudio evolution-data-server
- libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
- defaultIconTheme gnome3.gnome-bluetooth
- gnome3.gnome-clocks # schemas needed
- at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+ libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
+ adwaita-icon-theme gnome-bluetooth
+ gnome-clocks # schemas needed
+ at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
gst_all_1.gst-plugins-good # recording
gobject-introspection
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [
# Needed to support on-screen keyboard used with touch screen devices
# see https://github.com/NixOS/nixpkgs/issues/25968
- gnome3.caribou
+ caribou
];
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 3c45842fdd4..cab777f4feb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
+, gtk3, gsettings-desktop-schemas, gnome-desktop
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
stdenv.mkDerivation rec {
@@ -24,8 +25,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.gtk glib packagekit appstream-glib libsoup
- gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
+ gtk3 glib packagekit appstream-glib libsoup
+ gsettings-desktop-schemas gnome-desktop
gspell json-glib libsecret ostree
polkit flatpak fwupd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index a1e3ece3db4..4b02411b486 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
polkit # for ITS file
];
buildInputs = [
- bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg
+ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
gnome3.gsettings-desktop-schemas systemd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 4765edbcf7e..6bde15ba762 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
-, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
+, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- gtk gsettings-desktop-schemas vte libuuid dconf
+ gtk3 gsettings-desktop-schemas vte libuuid dconf
# For extension
nautilus
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index b6c40b28ab1..3d5cfb85d67 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ];
postFixup = ''
gtk-update-icon-cache "$out"/share/icons/HighContrast
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 6a5d2fde501..134ba41d653 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, apacheHttpd, nautilus
-, pkgconfig, gtk3, glib, libxml2, systemd
+, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
@@ -26,15 +26,19 @@ stdenv.mkDerivation rec {
-i data/dav_user_2.4.conf
'';
- configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd"
- "--with-modules-path=${apacheHttpd.dev}/modules"
- "--with-systemduserunitdir=$(out)/etc/systemd/user"
- "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+ configureFlags = [
+ "--with-httpd=${apacheHttpd.out}/bin/httpd"
+ "--with-modules-path=${apacheHttpd.dev}/modules"
+ "--with-systemduserunitdir=$(out)/etc/systemd/user"
+ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
+ ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
- wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
- nautilus libnotify libcanberra-gtk3 systemd ];
+ buildInputs = [
+ gtk3 glib intltool itstool libxml2 libtool
+ wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
+ nautilus libnotify libcanberra-gtk3 systemd
+ ];
postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index ab2ead7d344..02e0c29fdaa 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart
, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }:
let
@@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ];
buildInputs = [
- gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+ gnome3.grilo libxml2 gupnp gssdp libgdata
lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts
- totem-pl-parser gnome3.rest gmime json-glib
- avahi gnome3.libmediaart tracker dleyna-server
+ totem-pl-parser librest gmime json-glib
+ avahi libmediaart tracker dleyna-server
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index a968bfd2b56..2b7794a9a8e 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme
+{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme
, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
yelp-tools libxml2 desktop-file-utils gobject-introspection
];
- buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ];
+ buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ];
configureFlags = [
"--with-unicode-data=${unicode-data}"
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index e80212713aa..2988dd1b47e 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
+, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
+, gsettings-desktop-schemas, gnome-desktop
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -32,10 +33,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
- buildInputs = with gnome3; [
- glib gobject-introspection gtk gsettings-desktop-schemas upower
+ buildInputs = [
+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
gnome-desktop cairo pango cogl clutter zenity libstartup_notification
- gnome3.geocode-glib libinput libgudev libwacom
+ geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire
];
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 9a1418cbe0a..85b4990c471 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -12,10 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
- };
-
configureFlags = [
"--with-x"
"--disable-static"
@@ -36,10 +33,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
- buildInputs = with gnome3; [
- glib gobject-introspection gtk gsettings-desktop-schemas upower
+ buildInputs = [
+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
gnome-desktop cairo pango cogl clutter zenity libstartup_notification
- gnome3.geocode-glib libinput libgudev libwacom
+ geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire
];
@@ -51,6 +48,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "mutter";
+ attrPath = "gnome3.mutter";
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index b581d8f0983..715686460a3 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
-, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
+, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
+ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index ef79f972ff0..742819e0ba1 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
-, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
+, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
- gtk libwebp packagekit sane-backends vala
+ cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb
+ gtk3 libwebp packagekit sane-backends vala
];
nativeBuildInputs = [
meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 3565931e4df..d4a66b6c493 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
-, wrapGAppsHook, itstool, libxml2, vala, gnome3
+, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
+, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
, gdk_pixbuf, tracker, nautilus }:
stdenv.mkDerivation rec {
@@ -15,15 +16,15 @@ stdenv.mkDerivation rec {
doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ];
buildInputs = [
- gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins
+ gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
- gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
- gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
- gnome3.gsettings-desktop-schemas tracker nautilus
+ gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
+ gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop
+ gsettings-desktop-schemas tracker nautilus
python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
];
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 7127ab71b1f..85bb32972f4 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt
+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker
, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
@@ -35,9 +35,9 @@ in stdenv.mkDerivation rec {
flac
giflib
glib
- gnome3.gexiv2
+ gexiv2
totem-pl-parser
- gnome3.tracker
+ tracker
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
icu
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 6ec2b0a17ed..b3f06c2dcc1 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
buildInputs = [
- gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup
+ gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
libsecret gnutls libgcrypt avahi zlib libjpeg
libXdamage libXfixes libXext networkmanager
] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 26bcb317190..644c2793831 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib webkitgtk sqlite
libxml2 libxslt gnome3.yelp-xsl
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index e80c437afda..a347c8f2f9d 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3
, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -10,18 +10,21 @@ stdenv.mkDerivation rec {
sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; };
- };
-
preBuild = ''
mkdir -p $out/include
'';
- buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+ buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "zenity";
+ attrPath = "gnome3.zenity";
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 34b3faf71a4..41b0ccf6268 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gtk3.out # for gtk-update-icon-cache
glib-networking gvfs dconf gnome-backgrounds gnome-control-center
gnome-menus gnome-settings-daemon gnome-shell
- gnome-themes-extra defaultIconTheme gnome-shell-extensions
+ gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
pkgs.hicolor-icon-theme
];
@@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; {
hitori gnome-taquin
];
- inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
- libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
- easytag meld orca rhythmbox shotwell gnome-usage
- clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
-
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
gnome3 = self // { recurseForDerivations = false; };
- gtk = gtk3;
- gtkmm = gtkmm3;
vala = pkgs.vala_0_42;
- gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
- rest = librest;
-
-# Simplify the nixos module and gnome packages
- defaultIconTheme = adwaita-icon-theme;
+ gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
# ISO installer
# installerIso = callPackage ./installer.nix {};
@@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; {
bijiben = gnome-notes; # added 2018-09-26
evolution_data_server = evolution-data-server; # added 2018-02-25
- geocode_glib = geocode-glib; # added 2018-02-25
- glib_networking = glib-networking; # added 2018-02-25
+ geocode_glib = pkgs.geocode-glib; # added 2018-02-25
+ glib_networking = pkgs.glib-networking; # added 2018-02-25
gnome_common = gnome-common; # added 2018-02-25
gnome_control_center = gnome-control-center; # added 2018-02-25
gnome_desktop = gnome-desktop; # added 2018-02-25
@@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; {
yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25
+ # added 2019-02-08
+ inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
+ libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
+ easytag meld orca rhythmbox shotwell gnome-usage
+ clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
+ defaultIconTheme = adwaita-icon-theme;
+ gtk = gtk3;
+ gtkmm = gtkmm3;
+ rest = librest;
})
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 052cd49998d..4a634de9447 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
buildInputs = [
glib gtk3 webkitgtk amtk
- gnome3.defaultIconTheme gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gsettings-desktop-schemas
];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index c8440037d3c..9fbce7c6cc0 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
- boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas,
+ boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas,
gtksourceviewmm, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 gdb boost sqlite libgtop
- glibmm gtkmm vte gtksourceview gtksourceviewmm
+ glibmm gtkmm3 vte gtksourceview gtksourceviewmm
gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index b8171ef3185..33980f2d035 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
- buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 4e302e9f8b1..a3bb2df918a 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ];
buildInputs = [
- gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme
+ gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 110e2e5c439..8955bcbc498 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
- buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index dca598ce314..e46f4ea4fac 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
- buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 0b4d6d770b0..ab1a54c0575 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
- buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 29763abba55..c64ee968f19 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook librsvg intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 7896595de18..6ec18e55cf0 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# gobject-introspection for finding vapi files
nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
- buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
+ buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ];
postPatch = ''
chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index e36ca2a639d..ad522c4f56a 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
buildInputs = [
- gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
+ gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme
libgee libgnome-games-support
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 19a6b60fb5b..b881dbbf800 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
- libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
+ libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index eaa9f3a1c8d..0996b9bf10b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook
-, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
+, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
stdenv.mkDerivation rec {
name = "gnome-sudoku-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
- buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ];
+ buildInputs = [ gtk3 libgee json-glib qqwing ];
postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 75f511b17d0..583072d8470 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook librsvg libcanberra-gtk3
- intltool itstool libxml2 gnome3.defaultIconTheme
+ intltool itstool libxml2 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index fe81b429e99..f3f1fdbc415 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
+ gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8d4be7f1c6b..ebbbe9d1cee 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index a60ebe9590b..b1996e0fd59 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index ccd90c071fe..bbc65f3e5ba 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
meson ninja python3
];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index c57ab1a9e14..d3ddcea77f7 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
buildInputs = [
- gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
libcanberra-gtk3 clutter libxml2 clutter-gtk
];
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 5e0f01174e4..3c017d71382 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
- buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
+ buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index e6cdd3c88b7..399562c0d99 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
libxml2 itstool intltool wrapGAppsHook ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 8f1080ccc2e..be9fbe943be 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
-, gobject-introspection, libpthreadstubs, sqlite, gcr
+, gobject-introspection, libpthreadstubs, sqlite, gcr, libgee
+, gsettings-desktop-schemas, adwaita-icon-theme
, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
let
@@ -40,9 +41,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];
buildInputs = [
- gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
- libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes
- gdk_pixbuf librsvg gnome3.defaultIconTheme
+ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 libgee libsecret gmime sqlite
+ libpthreadstubs gsettings-desktop-schemas gcr isocodes
+ gdk_pixbuf librsvg adwaita-icon-theme
];
cmakeFlags = [
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index a447d2aa590..9f24d04337c 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib
, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
+, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme
, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
, meson, ninja, python3
}:
@@ -35,9 +36,9 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [
- gtk3 glib json-glib libgee libpeas gnome3.libsoup
- libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
- libsecret gobject-introspection gnome3.adwaita-icon-theme
+ gtk3 glib json-glib libgee libpeas libsoup
+ libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas
+ libsecret gobject-introspection adwaita-icon-theme
];
nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index 716988252d5..f9387c11b81 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -10,7 +10,7 @@
, gnome-session
, gnome3
, gsettings-desktop-schemas
-, gtk
+, gtk3
, ibus
, intltool
, libcanberra-gtk3
@@ -85,7 +85,7 @@ let
gnome-bluetooth
gnome-desktop
gsettings-desktop-schemas
- gtk
+ gtk3
ibus
libcanberra-gtk3
libpulseaudio
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index 8fbe24220b6..3cdab30ce8d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit
-, systemd, wrapGAppsHook, desktop-file-utils }:
+, gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
stdenv.mkDerivation rec {
name = "gnome-packagekit-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
- buildInputs = [ gnome3.gtk packagekit systemd polkit ];
+ buildInputs = [ gtk3 packagekit systemd polkit ];
postPatch = ''
patchShebangs meson_post_install.sh
diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index f9cc0a8aa4f..db00758fb55 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -11,7 +11,7 @@
, gnome-flashback
, gnome-menus
, gnome3
-, gtk
+, gtk3
, itstool
, libgweather
, libsoup
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
glib
gnome-desktop
gnome-menus
- gtk
+ gtk3
libgweather
libsoup
libwnck3
diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
index be8ab81457e..5afc92aa482 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
@@ -7,7 +7,7 @@
, gnome-common
, gnome-desktop
, gnome3
-, gtk
+, gtk3
, gsettings-desktop-schemas
, pkgconfig
, intltool
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- gtk
+ gtk3
gnome-desktop
dbus-glib
pam
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 77edf27fbdd..47de1de59ca 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus
gnome3.mutter gnome3.gnome-desktop gobject-introspection
diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 86e12b58536..c42356aa16a 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -4,7 +4,7 @@
, glib
, gnome3
, gsettings-desktop-schemas
-, gtk
+, gtk3
, libcanberra-gtk3
, libgtop
, libstartup_notification
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib
gsettings-desktop-schemas
- gtk
+ gtk3
libcanberra-gtk3
libgtop
libstartup_notification
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 0a9b9bcfe9b..c77d5d89fe3 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dbus-glib libcanberra gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings-desktop-schemas
- gnome3.gnome-shell gtk3 gnome3.defaultIconTheme
+ gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index abb1b8c28a1..d71bb08dd5c 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
python
gnome3.gtksourceview
gnome3.libpeas
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
mate.mate-desktop
];
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 99ca20afe98..3829cf551f7 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -1,5 +1,6 @@
{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+, geocode-glib, gtk3
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:
@@ -75,16 +76,16 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
- buildInputs = with gnome3; [
+ buildInputs = [
accountsservice
alsaLib
colord
geoclue2
geocode-glib
glib
- gnome-desktop
- gsettings-desktop-schemas
- gtk
+ gnome3.gnome-desktop
+ gnome3.gsettings-desktop-schemas
+ gtk3
ibus
lcms2
libXtst
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cf5ba1d6ad4..2345bfbc5c0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -286,7 +286,7 @@ self: super: builtins.intersectAttrs super {
# Tries to run GUI in tests
leksah = dontCheck (overrideCabal super.leksah (drv: {
executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [
- gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ...
+ gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ...
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
]);
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f82f49dd891..abfdb0801b2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -34296,7 +34296,7 @@ self: {
description = "BDCS API Server";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome3) libgit2-glib;};
+ }) {inherit (pkgs) libgit2-glib;};
"bdd" = callPackage
({ mkDerivation, base, directory, HUnit, mtl, process
@@ -85978,7 +85978,7 @@ self: {
doHaddock = false;
description = "DbusmenuGtk bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;};
+ }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;};
"gi-gdk" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -85999,7 +85999,7 @@ self: {
libraryPkgconfigDepends = [ gtk3 ];
description = "Gdk bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"gi-gdkpixbuf" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
@@ -86040,7 +86040,7 @@ self: {
doHaddock = false;
description = "GdkX11 bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"gi-ggit" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -86060,7 +86060,7 @@ self: {
doHaddock = false;
description = "libgit2-glib bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs.gnome3) libgit2-glib;};
+ }) {inherit (pkgs) libgit2-glib;};
"gi-gio" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -86099,7 +86099,7 @@ self: {
doHaddock = false;
description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs.gnome3) gobject-introspection;};
+ }) {inherit (pkgs) gobject-introspection;};
"gi-glib" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -86283,7 +86283,7 @@ self: {
libraryPkgconfigDepends = [ gtk3 ];
description = "Gtk bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"gi-gtk-declarative" = callPackage
({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
@@ -86381,7 +86381,7 @@ self: {
doHaddock = false;
description = "GtkSource bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+ }) {gtksourceview3 = pkgs.gtksourceview;};
"gi-javascriptcore" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -86402,7 +86402,7 @@ self: {
description = "JavaScriptCore bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome3) webkitgtk;};
+ }) {inherit (pkgs) webkitgtk;};
"gi-notify" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -86533,7 +86533,7 @@ self: {
doHaddock = false;
description = "Libsecret bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs.gnome3) libsecret;};
+ }) {inherit (pkgs) libsecret;};
"gi-soup" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -86574,7 +86574,7 @@ self: {
libraryPkgconfigDepends = [ vte_291 ];
description = "Vte bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {vte_291 = pkgs.gnome3.vte;};
+ }) {vte_291 = pkgs.vte;};
"gi-webkit" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -86620,7 +86620,7 @@ self: {
description = "WebKit2 bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome3) webkitgtk;};
+ }) {inherit (pkgs) webkitgtk;};
"gi-webkit2webextension" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -93206,7 +93206,7 @@ self: {
description = "A standalone StatusNotifierItem/AppIndicator tray";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"gtk-strut" = callPackage
({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
@@ -93545,7 +93545,7 @@ self: {
description = "Binding to the GtkSourceView library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+ }) {gtksourceview3 = pkgs.gtksourceview;};
"guarded-allocation" = callPackage
({ mkDerivation, base }:
@@ -99232,8 +99232,7 @@ self: {
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs) glib;
- inherit (pkgs.gnome3) gobject-introspection;};
+ }) {inherit (pkgs) glib gobject-introspection;};
"haskell-gi-base" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -133830,7 +133829,7 @@ self: {
description = "Haskell IDE written in Haskell";
license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"leksah-server" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, binary
@@ -139415,7 +139414,7 @@ self: {
description = "Leksah tool kit";
license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"ltl" = callPackage
({ mkDerivation, base, vcd }:
@@ -205341,7 +205340,7 @@ self: {
description = "Binding to the libsvg-cairo library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome3) librsvg;};
+ }) {inherit (pkgs) librsvg;};
"svgutils" = callPackage
({ mkDerivation, base, filepath, xml }:
@@ -207154,7 +207153,7 @@ self: {
description = "A desktop bar similar to xmobar, but with more GUI";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gtk3;};
"tag-bits" = callPackage
({ mkDerivation, base, ghc-prim }:
@@ -209964,7 +209963,7 @@ self: {
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;};
+ }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;};
"termplot" = callPackage
({ mkDerivation, base, brick, data-default, optparse-applicative
@@ -212903,7 +212902,7 @@ self: {
description = "A desktop bar based on WebKit";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;};
+ }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;};
"tibetan-utils" = callPackage
({ mkDerivation, base, composition-prelude, either, hspec
@@ -228411,7 +228410,7 @@ self: {
description = "JavaScriptCore FFI from webkitgtk";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome3) webkitgtk;};
+ }) {inherit (pkgs) webkitgtk;};
"webkitgtk3" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, glib
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index 8ef8353e4e0..cb22c9ee790 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, gtk3
, pkgconfig, gnome3, dbus, xvfb_run }:
let
version = "5.0.0";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
];
buildInputs = [
- gnome3.gtk
+ gtk3
];
doCheck = stdenv.isLinux;
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index dc98de1c2cb..e147a05d3cd 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -55,7 +55,7 @@ in
++ stdenv.lib.optional enableUsb libusb
++ stdenv.lib.optional enablePacketSocket audit
++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
- ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ];
+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
preAutoreconf = ''./autogen.sh'';
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index cb7f2621353..0fdf0a09be6 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
-, libwebp, gnome3, libintl }:
+, gexiv2, libwebp, gnome3, libintl }:
let
version = "0.4.12";
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
libpng cairo libjpeg librsvg pango gtk bzip2
- libraw libwebp gnome3.gexiv2
+ libraw libwebp gexiv2
];
propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix
index 2d308add87a..ebb9b354ff1 100644
--- a/pkgs/development/libraries/geocode-glib/default.nix
+++ b/pkgs/development/libraries/geocode-glib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
stdenv.mkDerivation rec {
pname = "geocode-glib";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
};
- nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
- buildInputs = with gnome3; [ glib libsoup json-glib ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
+ buildInputs = [ glib libsoup json-glib ];
patches = [
./installed-tests-path.patch
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index 9bf03f25c9c..cab04438dd3 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
, overrideCC, gcc6
, mysqlSupport ? false, mysql ? null
, postgresSupport ? false, postgresql ? null
@@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null;
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
- buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
+ buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
++ optional (mysqlSupport) mysql.connector-c
++ optional (postgresSupport) postgresql;
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index f22cc568a97..3f20236d17f 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
- buildInputs = with gnome3;
- [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];
+ buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ];
propagatedBuildInputs = [ json-glib ];
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index 981ec2f0a3a..a1e7215fd9a 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,4 +1,4 @@
-{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }:
+{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
stdenv.mkDerivation rec {
name = "osm-gps-map-${version}";
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo glib gobject-introspection
- ] ++ (with gnome3; [
- gnome-common gtk libsoup
- ]);
+ gnome3.gnome-common gtk3 gnome3.libsoup
+ ];
meta = with stdenv.lib; {
description = "Gtk+ widget for displaying OpenStreetMap tiles";
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index ae27ff72c84..b96f65c2ecc 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec {
};
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
- buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ];
+ buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ];
propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 8cd6a3f09ee..b2f7b52d325 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
pkgconfig
shared-mime-info
wrapGAppsHook
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 64b485bea31..87893a93136 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -6,7 +6,7 @@ let pkg = import ./base.nix {
};
in callPackage pkg {
buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
- gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ];
+ gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ];
drvParams = {
postFixup = ''
wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 9403a969e8f..14560919b71 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -8,7 +8,7 @@ let
inherit (pythonPackages) python pygobject3;
in callPackage pkg {
buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
- gnome3.defaultIconTheme gdk_pixbuf librsvg ];
+ gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
drvParams = {
postFixup = ''
wrapProgram $out/bin/gcdemu \
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index 9be17ade149..288201e804a 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
- buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ];
+ buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
postPatch = ''
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 8fed569f140..f611055a434 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme
+ makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook
];
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 41b3b15738d..cb6853c9a44 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index 85713a300ec..3115b1b7243 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gnome3.gtk
# needed for XDG_ICON_DIRS
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
makeWrapper
(stdenv.lib.getLib gnome3.dconf)
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/luxcoreui" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \
+ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
'';
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
index 7943903d6f7..e10ffae4a51 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
preFixup = ''
wrapProgram $out/bin/fcitx-config-gtk3 \
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index cef5c5538a7..80ea61249c6 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
- buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ];
+ buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index f3fe14e4f24..3c9a34d524a 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
-, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3
+, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
, libappindicator-gtk3, withGnome ? false, gcr }:
let
@@ -25,10 +25,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "devdoc" "man" ];
buildInputs = [
- gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
+ gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas
polkit isocodes mobile-broadband-provider-info libgudev
modemmanager jansson glib-networking
- libappindicator-gtk3 gnome3.defaultIconTheme
+ libappindicator-gtk3 gnome3.adwaita-icon-theme
] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser
nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index facf1b6a667..1fcbce28cc4 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig,
+{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3,
networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ openfortivpn networkmanager ppp ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index ad58dc97b0a..d3eb3f79933 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
, withGnome ? true, gnome3 }:
let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ iodine networkmanager ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index b44933f7f5f..5fc591f0a43 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -1,5 +1,5 @@
{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
-, networkmanager, ppp, xl2tpd, strongswan, libsecret
+, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3, networkmanagerapplet }:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ networkmanager ppp ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 0c02569aa27..566179d85b3 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, kmod }:
+, gtk3, withGnome ? true, gnome3, kmod }:
let
pname = "NetworkManager-openconnect";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ openconnect networkmanager ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 952bbf4999e..3fe4db87036 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
-, withGnome ? true, gnome3, kmod }:
+, gtk3, withGnome ? true, gnome3, kmod }:
let
pname = "NetworkManager-openvpn";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ openvpn networkmanager ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index 5d77be86dff..3231c276be5 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, kmod, file }:
+, gtk3, withGnome ? true, gnome3, kmod, file }:
let
pname = "NetworkManager-vpnc";
version = "1.2.6";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [ vpnc networkmanager ]
- ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig file ];
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 81164c1eb77..88076abc4f6 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }:
+{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
pythonPackages.buildPythonApplication rec {
name = "onioncircuits-${version}";
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
postFixup = ''
wrapProgram "$out/bin/onioncircuits" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share"
+ --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54836458cc1..91c84839a4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1985,7 +1985,7 @@ in
ibus = callPackage ../tools/inputmethods/ibus {
gconf = gnome2.GConf;
- inherit (gnome3) dconf glib;
+ inherit (gnome3) dconf;
};
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
@@ -4551,9 +4551,7 @@ in
omping = callPackage ../applications/networking/omping { };
- onioncircuits = callPackage ../tools/security/onioncircuits {
- inherit (gnome3) defaultIconTheme;
- };
+ onioncircuits = callPackage ../tools/security/onioncircuits { };
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
@@ -5157,7 +5155,6 @@ in
remind = callPackage ../tools/misc/remind { };
remmina = callPackage ../applications/networking/remote/remmina {
- adwaita-icon-theme = gnome3.adwaita-icon-theme;
gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;
};
@@ -5324,9 +5321,7 @@ in
quazip = quazip_qt4;
};
- screenkey = python2Packages.callPackage ../applications/video/screenkey {
- inherit (gnome3) defaultIconTheme;
- };
+ screenkey = python2Packages.callPackage ../applications/video/screenkey { };
quazip_qt4 = libsForQt5.quazip.override {
qtbase = qt4; qmake = qmake4Hook;
@@ -5803,9 +5798,7 @@ in
tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
- tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin {
- inherit (gnome3) defaultIconTheme;
- };
+ tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
stdenv = stdenvNoCC;
@@ -12158,7 +12151,8 @@ in
inherit perl;
inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
- inherit (gnome3) gtk3 dconf;
+ inherit gtk3;
+ inherit (gnome3) dconf;
});
libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5;
@@ -12173,7 +12167,8 @@ in
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
- inherit (gnome3) gtk3 dconf;
+ inherit gtk3;
+ inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
});
@@ -12189,7 +12184,8 @@ in
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
- inherit (gnome3) gtk3 dconf;
+ inherit gtk3;
+ inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
});
@@ -14983,9 +14979,7 @@ in
nvme-cli = callPackage ../os-specific/linux/nvme-cli { };
- open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
- inherit (gnome3) gtk gtkmm;
- };
+ open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { };
open-vm-tools-headless = open-vm-tools.override { withX = false; };
delve = callPackage ../development/tools/delve { };
@@ -16022,9 +16016,7 @@ in
inherit (pythonPackages) eyeD3;
};
- abiword = callPackage ../applications/office/abiword {
- iconTheme = gnome3.defaultIconTheme;
- };
+ abiword = callPackage ../applications/office/abiword { };
abook = callPackage ../applications/misc/abook { };
@@ -16654,9 +16646,7 @@ in
devede = callPackage ../applications/video/devede { };
- denemo = callPackage ../applications/audio/denemo {
- inherit (gnome3) gtksourceview;
- };
+ denemo = callPackage ../applications/audio/denemo { };
dvb_apps = callPackage ../applications/video/dvb-apps { };
@@ -17246,7 +17236,6 @@ in
generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
gconf = pkgs.gnome2.GConf;
inherit (pkgs.gnome2) libgnome libgnomeui;
- inherit (pkgs.gnome3) defaultIconTheme;
};
firefox-bin = wrapFirefox firefox-bin-unwrapped {
@@ -17261,7 +17250,6 @@ in
generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
gconf = pkgs.gnome2.GConf;
inherit (pkgs.gnome2) libgnome libgnomeui;
- inherit (pkgs.gnome3) defaultIconTheme;
};
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
@@ -17276,7 +17264,6 @@ in
generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
gconf = pkgs.gnome2.GConf;
inherit (pkgs.gnome2) libgnome libgnomeui;
- inherit (pkgs.gnome3) defaultIconTheme;
};
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
@@ -17509,7 +17496,7 @@ in
gnome-mpv = callPackage ../applications/video/gnome-mpv { };
gnome-recipes = callPackage ../applications/misc/gnome-recipes {
- inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell;
+ inherit (gnome3) gnome-online-accounts gnome-autoar;
};
gollum = callPackage ../applications/misc/gollum { };
@@ -18033,7 +18020,6 @@ in
libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress;
inherit (gnome2) GConf ORBit2 gnome_vfs;
- inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; };
fontsConf = makeFontsConf {
fontDirectories = [
@@ -18555,7 +18541,6 @@ in
};
synfigstudio = callPackage ../applications/graphics/synfigstudio {
- inherit (gnome3) defaultIconTheme;
mlt-qt5 = libsForQt5.mlt;
};
@@ -18891,9 +18876,7 @@ in
pinfo = callPackage ../applications/misc/pinfo { };
- pinpoint = callPackage ../applications/office/pinpoint {
- inherit (gnome3) clutter clutter-gtk;
- };
+ pinpoint = callPackage ../applications/office/pinpoint { };
pinta = callPackage ../applications/graphics/pinta {
gtksharp = gtk-sharp-2_0;
@@ -19091,7 +19074,7 @@ in
quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; };
quodlibet-full = quodlibet.override {
- inherit (gnome3) gtksourceview webkitgtk;
+ inherit gtksourceview webkitgtk;
withDbusPython = true;
withPyInotify = true;
withMusicBrainzNgs = true;
@@ -19677,7 +19660,6 @@ in
thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
gconf = pkgs.gnome2.GConf;
inherit (pkgs.gnome2) libgnome libgnomeui;
- inherit (pkgs.gnome3) defaultIconTheme;
};
tig = gitAndTools.tig;
@@ -19838,9 +19820,7 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
- vimiv = callPackage ../applications/graphics/vimiv {
- inherit (gnome3) defaultIconTheme;
- };
+ vimiv = callPackage ../applications/graphics/vimiv { };
macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };
@@ -22115,9 +22095,7 @@ in
bcal = callPackage ../applications/science/math/bcal { };
- pspp = callPackage ../applications/science/math/pspp {
- inherit (gnome3) gtksourceview;
- };
+ pspp = callPackage ../applications/science/math/pspp { };
pynac = callPackage ../applications/science/math/pynac { };
@@ -22432,7 +22410,6 @@ in
gajim = callPackage ../applications/networking/instant-messengers/gajim {
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
- inherit (gnome3) gspell defaultIconTheme;
};
gammu = callPackage ../applications/misc/gammu { };
@@ -23149,9 +23126,7 @@ in
xosview2 = callPackage ../tools/X11/xosview2 { };
- xpad = callPackage ../applications/misc/xpad {
- inherit (gnome3) gtksourceview;
- };
+ xpad = callPackage ../applications/misc/xpad { };
xsane = callPackage ../applications/graphics/sane/xsane.nix {
libpng = libpng12;
@@ -23262,9 +23237,7 @@ in
iterm2 = callPackage ../applications/misc/iterm2 {};
- sequeler = callPackage ../applications/misc/sequeler {
- inherit (gnome3) gtksourceview libgda;
- };
+ sequeler = callPackage ../applications/misc/sequeler { };
sequelpro = callPackage ../applications/misc/sequelpro {};
From 53a349d1fdc1c7be48759dd15ce59cd068b5eb8c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 22 Jan 2019 22:09:46 +0100
Subject: [PATCH 024/494] python37Packages.cryptography_vectors: 2.4.2 -> 2.5
---
.../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 00c726cee89..f02a986ec02 100644
--- a/pkgs/development/python-modules/cryptography_vectors/default.nix
+++ b/pkgs/development/python-modules/cryptography_vectors/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
# also bump cryptography
pname = "cryptography_vectors";
- version = "2.4.2";
+ version = "2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi";
+ sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik";
};
# No tests included
From ecfa775439918c49caa678cf5dafa8db35d1f8d7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 22 Jan 2019 22:12:43 +0100
Subject: [PATCH 025/494] python37Packages.cryptography: 2.4.2 -> 2.5
Changelog:
https://cryptography.io/en/latest/changelog/#v2-5
Important changes:
- BACKWARDS INCOMPATIBLE: U-label strings were deprecated in version
2.1, but this version removes the default idna dependency as well.
- BACKWARDS INCOMPATIBLE: The minimum supported PyPy version is now 5.4.
---
pkgs/development/python-modules/cryptography/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index a58591f4b05..dfbb14eb7e6 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -4,7 +4,6 @@
, openssl
, cryptography_vectors
, darwin
-, idna
, asn1crypto
, packaging
, six
@@ -23,11 +22,11 @@
buildPythonPackage rec {
# also bump cryptography_vectors
pname = "cryptography";
- version = "2.4.2";
+ version = "2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5";
+ sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9";
};
outputs = [ "out" "dev" ];
@@ -35,7 +34,6 @@ buildPythonPackage rec {
buildInputs = [ openssl cryptography_vectors ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
propagatedBuildInputs = [
- idna
asn1crypto
packaging
six
From f044cf23b4274d3b285ccd74c75b5dedd26d970c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 026/494] python: Cython: 0.29.2 -> 0.29.5
---
pkgs/development/python-modules/Cython/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 90a605063b0..9a2925dcaf1 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -26,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
- version = "0.29.2";
+ version = "0.29.5";
src = fetchPypi {
inherit pname version;
- sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e";
+ sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1";
};
nativeBuildInputs = [
From 494c021c6d9f45e693a5bb750e5b74b82333ee96 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 027/494] python: Pygments: 2.2.0 -> 2.3.1
---
pkgs/development/python-modules/Pygments/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index d05bd081e0d..92c8f6223d5 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Pygments";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+ sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
};
propagatedBuildInputs = [ docutils ];
From 8c800a803163c6abe5baf4757966473069e78917 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 028/494] python: WazeRouteCalculator: 0.6 -> 0.7
---
.../python-modules/WazeRouteCalculator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index e67d81eccf7..88248b8a15a 100644
--- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "WazeRouteCalculator";
- version = "0.6";
+ version = "0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0zmnw4198a2kvqvsz1i4a3aa20r4afp2lai6fxbpq1ppv120h857";
+ sha256 = "ff6fe5524e18ea150e49cec69acd700275b52a31204a4eea1b11831637a3c0f3";
};
propagatedBuildInputs = [ requests ];
From 5e3df28423544f5777a9dcacdacb5ca4018933a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 029/494] python: XlsxWriter: 1.1.2 -> 1.1.4
---
pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 41318347e53..7ae01e5cc36 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "XlsxWriter";
- version = "1.1.2";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf";
+ sha256 = "07e38c73b687e2f867151adce821e43e02856c4d8c6e482807b6ea7f4ac9506c";
};
meta = {
From 3550bdb90507dde0387fc3609f6aae418b6fbc81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 030/494] python: absl-py: 0.6.1 -> 0.7.0
---
pkgs/development/python-modules/absl-py/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index a80cd99f73f..1e4f2f76b0b 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "absl-py";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
+ sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23";
};
propagatedBuildInputs = [
From e06990e6fbf2e83c610f5a6182d0984240035601 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 031/494] python: adal: 1.2.0 -> 1.2.1
---
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 003bd516657..9f764df3376 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "adal";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms";
+ sha256 = "b6edd095be66561382bdaa59d40b04490e93149fb3b7fa44c1fa5504eed5b8b9";
};
propagatedBuildInputs = [ requests pyjwt dateutil ];
From fa0b52a0ea28cce813638a74691232efa46284cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 032/494] python: aioconsole: 0.1.11 -> 0.1.13
---
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 bbfd08e03aa..afe9c6fb29c 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.11";
+ version = "0.1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c";
+ sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f";
};
# hardcodes a test dependency on an old version of pytest-asyncio
From da6c773c6c32edcb4939c011a8428baf9899a20e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 033/494] python: aiodns: 1.1.1 -> 1.2.0
---
pkgs/development/python-modules/aiodns/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 204f7bfc0df..154d98de1c6 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "aiodns";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
+ sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
};
propagatedBuildInputs = with stdenv.lib; [ pycares ]
From a837e68760f731f2653cb9c0edfa2a8db50e8410 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 034/494] python: aiohue: 1.7.0 -> 1.9.0
---
pkgs/development/python-modules/aiohue/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index d5572bb6d1d..2e4102a80ef 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "aiohue";
- version = "1.7.0";
+ version = "1.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8";
+ sha256 = "3b6cb87652cf1ffc904443b9c5514873c331e159953f2ebf77a051444b350594";
};
propagatedBuildInputs = [ aiohttp ];
From 1fb9b309b6339d871de9e5ff1cfd3018bbcb817c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 035/494] python: alembic: 1.0.6 -> 1.0.7
---
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 b93843acea1..ff9901765fb 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "alembic";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3";
+ sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2";
};
buildInputs = [ pytest pytestcov mock coverage ];
From 2cd6c89fa2d4cbf87780cc35a5f91eb0132663c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 036/494] python: alerta-server: 6.3.2 -> 6.7.3
---
pkgs/development/python-modules/alerta-server/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index a16d54af260..7d118f41f35 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta-server";
- version = "6.3.2";
+ version = "6.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0mp97scdz2scdzi9va99hghmjz25zssgwg07i6cldzkc8j71kax5";
+ sha256 = "9ce0ff9bdf1faef2c2bfaef5b213824dc9a307ba1c85f9627dd3f4b88616f4d4";
};
buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ];
From ffe6ed9a21d377c776f883e42caecdd10e9a4a7f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:09 +0100
Subject: [PATCH 037/494] python: alerta: 6.3.1 -> 6.5.0
---
pkgs/development/python-modules/alerta/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix
index 47125894e5b..0b45ce4c128 100644
--- a/pkgs/development/python-modules/alerta/default.nix
+++ b/pkgs/development/python-modules/alerta/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta";
- version = "6.3.1";
+ version = "6.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "08l366g0arpd23bm7bzk0hpmfd3z6brb8p24rjwkb3gvafhk7cz9";
+ sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881";
};
buildInputs = [ six click requests pytz tabulate ];
From 03e6ac7783b311fc6047ef357961c18ec7c2f4c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 038/494] python: altair: 2.2.2 -> 2.3.0
---
pkgs/development/python-modules/altair/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 5f21f4662cb..313e8e22f3e 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "altair";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a";
+ sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6";
};
checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
From 338efb0a7da183f101a07cd3b827f60cb543f32f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 039/494] python: amqp: 2.3.2 -> 2.4.1
---
pkgs/development/python-modules/amqp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index fc984d40cc6..54b6e87a1ce 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "amqp";
- version = "2.3.2";
+ version = "2.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb";
+ sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb";
};
checkInputs = [ pytest case pytest-sugar ];
From 72ed15de6945bda3cbdad706a16bc287e2803b16 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 040/494] python: argon2_cffi: 18.3.0 -> 19.1.0
---
pkgs/development/python-modules/argon2_cffi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
index 120928656b4..e0ea40f87eb 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "argon2_cffi";
- version = "18.3.0";
+ version = "19.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d";
+ sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26";
};
propagatedBuildInputs = [ cffi six ];
From 01d74a53828ac589852258843b3351906a58ce53 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 14 Feb 2019 13:51:47 +0000
Subject: [PATCH 041/494] nasm: build from source
https://nasm.us is currently down. This way is also preferable, IMHO.
---
pkgs/development/compilers/nasm/default.nix | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 8709c718649..bfb3c154a3c 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.14.02";
- src = fetchurl {
- url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
- sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l";
+ src = fetchFromRepoOrCz {
+ repo = "nasm";
+ rev = name;
+ sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
};
- nativeBuildInputs = [ perl ];
+ nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
+
+ postBuild = "make manpages";
doCheck = true;
From 7ec53a932f314bd9a04ec1e23424e51b26d475bf Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 14 Feb 2019 20:32:08 +0100
Subject: [PATCH 042/494] stdenv: only set __darwinAllowLocalNetworking on
darwin
This is a darwin only nix attribute for sandbox builds, it can be
ignored on other platforms to avoid unnecessary rebuilds.
---
pkgs/stdenv/generic/make-derivation.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index cafd1031ab8..3e3bbab40ab 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -70,6 +70,7 @@ rec {
else builtins.unsafeGetAttrPos "name" attrs)
, separateDebugInfo ? false
, outputs ? [ "out" ]
+ , __darwinAllowLocalNetworking ? false
, __impureHostDeps ? []
, __propagatedImpureHostDeps ? []
, sandboxProfile ? ""
@@ -175,6 +176,7 @@ rec {
(removeAttrs attrs
["meta" "passthru" "pos"
"checkInputs" "installCheckInputs"
+ "__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"])
// (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) {
@@ -245,6 +247,7 @@ rec {
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
NIX_HARDENING_ENABLE = enabledHardeningOptions;
} // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
+ inherit __darwinAllowLocalNetworking;
# TODO: remove lib.unique once nix has a list canonicalization primitive
__sandboxProfile =
let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
From 91047d75e12f38a998a9bfc2b9eccf5174b6eeb3 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 14 Feb 2019 16:16:04 -0600
Subject: [PATCH 043/494] xorg.bitmap: 1.0.8 -> 1.0.9 (#55594)
https://lists.x.org/archives/xorg-announce/2019-February/002941.html
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 90ebe4fad44..5ddc0bff902 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; {
}) {};
bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
- name = "bitmap-1.0.8";
+ name = "bitmap-1.0.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
- sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
+ url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz;
+ sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ec1e6a413b4..8193ddc8098 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
mirror://xorg/individual/app/appres-1.0.5.tar.bz2
mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
-mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
+mirror://xorg/individual/app/bitmap-1.0.9.tar.gz
mirror://xorg/individual/app/editres-1.0.7.tar.bz2
mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
From c84e7d1b6dbc823c2e212d7e4c48a9ae55ead21e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 15 Feb 2019 02:45:27 -0800
Subject: [PATCH 044/494] unbound: 1.8.3 -> 1.9.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unbound/versions
---
pkgs/tools/networking/unbound/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 0c7acaad49f..25e03d80369 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unbound-${version}";
- version = "1.8.3";
+ version = "1.9.0";
src = fetchurl {
url = "https://unbound.net/downloads/${name}.tar.gz";
- sha256 = "1k6fljr7k721vg2ivn5dfr0hs1kn8p1sm003glgd9ypd261jns9b";
+ sha256 = "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
From a0eb6c1f81e1d294726c644ff47f1e851afb2f10 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Fri, 15 Feb 2019 17:29:35 -0800
Subject: [PATCH 045/494] gnome3.dconf: fix the build on Darwin (#55800)
Fix the build on Darwin.
Please see https://gitlab.gnome.org/GNOME/dconf/issues/47 for more information.
---
pkgs/desktops/gnome-3/core/dconf/default.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9c1d7d7d1a9..1f55071c83d 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
-, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
let
pname = "dconf";
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
};
+ patches = [
+ # Fix the build on Darwin
+ # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
+ sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
+ })
+ ];
+
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
From b9392ac9a6bf80f4d4a921944436ff79eb495980 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 22 Jan 2019 11:05:11 -0600
Subject: [PATCH 046/494] libdrm: 2.4.96 -> 2.4.97
https://lists.x.org/archives/xorg-announce/2019-January/002937.html
---
pkgs/development/libraries/libdrm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 3d236ab5851..a0bd7d86454 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.96";
+ name = "libdrm-2.4.97";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd";
+ sha256 = "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p";
};
outputs = [ "out" "dev" "bin" ];
From 7c28cb299d7892d14a59f7fdcd3f0c6e2b65d905 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sat, 16 Feb 2019 02:58:07 -0800
Subject: [PATCH 047/494] cairo: apply patch for CVE-2018-19876
This applies the patch from the following upstream merge request:
https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5
This resulted in the following merge commit, which we fetch as a patch
and apply:
https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d
---
pkgs/development/libraries/cairo/default.nix | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 8f7a04cbb68..f161e0f511a 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libiconv
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12
@@ -20,6 +20,19 @@ in stdenv.mkDerivation rec {
sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
};
+ patches = [
+ # Fixes CVE-2018-19876; see Nixpkgs issue #55384
+ # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876
+ # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5
+ #
+ # This patch is the merged commit from the above PR.
+ (fetchpatch {
+ name = "CVE-2018-19876.patch";
+ url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
+ sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
+ })
+ ];
+
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; # very small
From 0a743603e585f301108682f502e0432f721dd4f5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 048/494] python: arrow: 0.12.1 -> 0.13.1
---
pkgs/development/python-modules/arrow/default.nix | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index 65f4ae79f4b..0a8e7e6f482 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -1,21 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi
, nose, chai, simplejson, backports_functools_lru_cache
-, dateutil }:
+, dateutil, pytz
+}:
buildPythonPackage rec {
pname = "arrow";
- version = "0.12.1";
+ version = "0.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd";
+ sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a";
};
checkPhase = ''
nosetests --cover-package=arrow
'';
- checkInputs = [ nose chai simplejson ];
+ checkInputs = [ nose chai simplejson pytz ];
propagatedBuildInputs = [ dateutil backports_functools_lru_cache ];
postPatch = ''
From 3508c0800b96208b7175f10dd8b3a88ad1cd9852 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 049/494] python: aspy.yaml: 1.1.1 -> 1.1.2
---
pkgs/development/python-modules/aspy.yaml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix
index 4f07c09e159..c6d06772c9b 100644
--- a/pkgs/development/python-modules/aspy.yaml/default.nix
+++ b/pkgs/development/python-modules/aspy.yaml/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "aspy.yaml";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1ajb97kn044ximkzq2090h4yblrhw77540pwiw345cp7mwzy4xqa";
+ sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf";
};
propagatedBuildInputs = [ pyyaml ];
From 9aba584e78b1d737e8a1178d843a4920bb007ee8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 050/494] python: astral: 1.9.2 -> 1.10.1
---
pkgs/development/python-modules/astral/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 3c5839267bd..75f0b632e87 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "astral";
- version = "1.9.2";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b";
+ sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1";
};
propagatedBuildInputs = [ pytz requests ];
From e40eaf46997b2ff8e9c8f350bc460a0cd1706a25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 051/494] python: astunparse: 1.6.1 -> 1.6.2
---
pkgs/development/python-modules/astunparse/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index 703a6e68167..8dbb4da7060 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "astunparse";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca";
+ sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67";
};
propagatedBuildInputs = [ six wheel ];
From d3415f62c73e79e593188070e97ec36049de1082 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 052/494] python: asyncssh: 1.14.0 -> 1.15.1
---
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 82723163a5e..bea0857f0cf 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "asyncssh";
- version = "1.14.0";
+ version = "1.15.1";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058";
+ sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35";
};
propagatedBuildInputs = [
From 99163d22078e2a3343b44a0bf55b2f2163977bb1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 053/494] python: atom: 0.4.1 -> 0.4.2
---
pkgs/development/python-modules/atom/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index 0a7dbf561a0..4b6ef50c8c2 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "atom";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv";
+ sha256 = "5b1c15599681398e343fcfcf2c00d26071964f5305a403fc590c45388bacdf16";
};
propagatedBuildInputs = [ future ];
From de2cced181306b39d94449bd4301a2aaedc354b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 054/494] python: atomicwrites: 1.2.1 -> 1.3.0
---
pkgs/development/python-modules/atomicwrites/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix
index 44eb1b09d83..e34f937b509 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/pkgs/development/python-modules/atomicwrites/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "atomicwrites";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee";
+ sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6";
};
meta = with stdenv.lib; {
From ff2545e867135d738812a27096172daf6cecd930 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 055/494] python: atomman: 1.2.3 -> 1.2.4
---
pkgs/development/python-modules/atomman/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index ce4408b8441..d2a25cf738a 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -13,12 +13,12 @@
}:
buildPythonPackage rec {
- version = "1.2.3";
+ version = "1.2.4";
pname = "atomman";
src = fetchPypi {
inherit pname version;
- sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c";
+ sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e";
};
checkInputs = [ pytest ];
From a7610810db02bc3dc0e9d7c67f89544a99d07d5c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 056/494] python: attrdict: 2.0.0 -> 2.0.1
---
pkgs/development/python-modules/attrdict/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix
index c6a9151d911..29e3ca09cc5 100644
--- a/pkgs/development/python-modules/attrdict/default.nix
+++ b/pkgs/development/python-modules/attrdict/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "attrdict";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6";
+ sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70";
};
propagatedBuildInputs = [ coverage nose six ];
From 964cdc39d96933540cddf53da877a8316298c5d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 057/494] python: audio-metadata: 0.3.0 -> 0.4.0
---
pkgs/development/python-modules/audio-metadata/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix
index 633daab7d4e..bbba8deb459 100644
--- a/pkgs/development/python-modules/audio-metadata/default.nix
+++ b/pkgs/development/python-modules/audio-metadata/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "audio-metadata";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7";
+ sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2";
};
propagatedBuildInputs = [
From 720e12c5afd86a4ca36dc7f8f6b8ad0444007603 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:10 +0100
Subject: [PATCH 058/494] python: autobahn: 18.10.1 -> 19.1.1
---
pkgs/development/python-modules/autobahn/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 0174bb3a029..d2d1e48b4c6 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
- version = "18.10.1";
+ version = "19.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40";
+ sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
From 606440977bc2474c1d50a621a20377eaa03683b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 059/494] python: av: 6.1.0 -> 6.1.2
---
pkgs/development/python-modules/av/default.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index f736b9f8623..84c9b21f933 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -2,24 +2,25 @@
, buildPythonPackage
, fetchPypi
, nose
-, pillow
, numpy
, ffmpeg_4
-, git
, libav
, pkgconfig
}:
buildPythonPackage rec {
pname = "av";
- version = "6.1.0";
+ version = "6.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
+ sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f";
};
- buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];
+ checkInputs = [ nose numpy ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ffmpeg_4 ];
# Tests require downloading files from internet
doCheck = false;
From 8937c80c9bb19d90510187300d167ad4f6878dab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 060/494] python: awkward: 0.5.6 -> 0.8.4
---
pkgs/development/python-modules/awkward/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index d02ffc4770c..28e1d60113f 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "awkward";
- version = "0.5.6";
+ version = "0.8.4";
src = fetchPypi {
inherit pname version;
- sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f";
+ sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2";
};
buildInputs = [ pytestrunner h5py ];
From 9f88ef68fabcca743b6727681c3ccbe24585333c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 061/494] python: aws-adfs: 1.12.2 -> 1.12.3
---
pkgs/development/python-modules/aws-adfs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index dc7e3148400..9e761b3698d 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -2,12 +2,12 @@
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
buildPythonPackage rec {
- version = "1.12.2";
+ version = "1.12.3";
pname = "aws-adfs";
src = fetchPypi {
inherit pname version;
- sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3";
+ sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
};
# Relax version constraint
From 6c5d973b658f490629ee22e791eb828826ade8b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 062/494] python: aws-sam-translator: 1.9.0 -> 1.9.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 917a9379882..56d183988dc 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.9.0";
+ version = "1.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d";
+ sha256 = "1008d149599d5d629b0c7bdfaa249d59eaab6d194faf5f0f941fa7209e68e6f2";
};
# Tests are not included in the PyPI package
From 12c6c3d39fe9fa7158cf3144e575a95b8010797f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 063/494] python: aws-xray-sdk: 2.2.0 -> 2.3.0
---
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 10511c9f439..1a17d2650b5 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-xray-sdk";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a";
+ sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a";
};
propagatedBuildInputs = [
From f4c569c2dafc81425bd45c9d7c7d40e335b5fc80 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 064/494] python: azure-common: 1.1.17 -> 1.1.18
---
pkgs/development/python-modules/azure-common/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index 5ea04cd19c8..d6d1ba832d6 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -7,14 +7,14 @@
}:
buildPythonPackage rec {
- version = "1.1.17";
+ version = "1.1.18";
pname = "azure-common";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be";
+ sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424";
};
propagatedBuildInputs = [ azure-nspkg ];
From 7f80b2fda5637b0a95cef05564278bcdddfc12f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 065/494] python: azure-mgmt-compute: 0.20.1 -> 4.4.0
---
.../development/python-modules/azure-mgmt-compute/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 462c9e615a1..69f4313a149 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "0.20.1";
+ version = "4.4.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a";
+ sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00";
};
preConfigure = ''
From 9f97782601cb7458f4ca7dfb826857d42d0fa24c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 066/494] python: azure-mgmt-network: 0.20.1 -> 2.5.1
---
.../development/python-modules/azure-mgmt-network/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index fd47f8895fd..d8e9e7eb179 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "0.20.1";
+ version = "2.5.1";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
+ sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45";
};
preConfigure = ''
From 808e5d95b74e5bac910db471cd25ac09ebfc17cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 067/494] python: azure-mgmt-nspkg: 1.0.0 -> 3.0.2
---
pkgs/development/python-modules/azure-mgmt-nspkg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index aa037b48b4f..cf977539d5d 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "3.0.2";
pname = "azure-mgmt-nspkg";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
+ sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
};
propagatedBuildInputs = [ azure-nspkg ];
From 2eb9ded88659784c1ca451691816f90cc5a194bb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 068/494] python: azure-mgmt-resource: 0.20.1 -> 2.1.0
---
.../python-modules/azure-mgmt-resource/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index b60e3aee340..afcc58ec7e4 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
- version = "0.20.1";
+ version = "2.1.0";
pname = "azure-mgmt-resource";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
+ sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be";
};
preConfigure = ''
From 3a49f9825af94ef5162fed1052786d1f805718ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 069/494] python: azure-mgmt-storage: 0.20.0 -> 3.1.1
---
.../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 2e0523bb25c..4dd4c692490 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "0.20.0";
+ version = "3.1.1";
pname = "azure-mgmt-storage";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
+ sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f";
};
preConfigure = ''
From c11eba29aa2ef25807279873aa64ae0fcdfd4953 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 070/494] python: backports.ssl_match_hostname: 3.5.0.1 ->
3.7.0.1
---
.../python-modules/backports_ssl_match_hostname/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
index 1dbca3943a9..013fe9f446f 100644
--- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
+++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "backports.ssl_match_hostname";
- version = "3.5.0.1";
+ version = "3.7.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
+ sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2";
};
meta = with lib; {
From a696666ca58a8b3401d4bfbf6c42c2a4ee878b8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 071/494] python: beautifulsoup4: 4.6.3 -> 4.7.1
---
.../python-modules/beautifulsoup4/default.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index f230d5e4c05..1b9ba31f035 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
buildPythonPackage rec {
pname = "beautifulsoup4";
- version = "4.6.3";
+ version = "4.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
+ sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348";
};
- checkInputs = [ nose ];
+ checkInputs = [ pytest ];
checkPhase = ''
- nosetests build
+ py.test $out/${python.sitePackages}/bs4/tests
'';
+ propagatedBuildInputs = [ soupsieve ];
+
meta = with stdenv.lib; {
homepage = http://crummy.com/software/BeautifulSoup/bs4/;
description = "HTML and XML parser";
From 54fea179153de053622632446ec757281d735737 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 072/494] python: bidict: 0.17.5 -> 0.18.0
---
pkgs/development/python-modules/bidict/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index ed99686ed27..61dc1db1a48 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bidict";
- version = "0.17.5";
+ version = "0.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c";
+ sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a";
};
nativeBuildInputs = [ setuptools_scm ];
From d84fb4bd6159c69d68df65c0da49358925534007 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:11 +0100
Subject: [PATCH 073/494] python: billiard: 3.5.0.5 -> 3.6.0.0
---
pkgs/development/python-modules/billiard/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 3e301e03993..7193f3e9bcf 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.5";
+ version = "3.6.0.0";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2";
+ sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84";
};
buildInputs = [ pytest case ];
From 30975fb58b2dab31ba010b5c6908c4da40f7cd9f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 074/494] python: bleach: 3.0.2 -> 3.1.0
---
pkgs/development/python-modules/bleach/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 7cd55c9e647..c2b0db61cbb 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718";
+ sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa";
};
checkInputs = [ pytest pytestrunner ];
From acc86e9dfff37d37bccbe3f48a81002cdf950147 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 075/494] python: BoltzTraP2: 18.9.1 -> 19.1.1
---
pkgs/development/python-modules/boltztrap2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index 56036fc97b3..823b9ab8c6a 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -14,13 +14,13 @@
}:
buildPythonPackage rec {
- version = "18.9.1";
+ version = "19.1.1";
pname = "BoltzTraP2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913";
+ sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a";
};
buildInputs = [ cython cmake ];
From 970a952380c7d8948699c15fe0ae8cc6e44571e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 076/494] python: boto3: 1.9.80 -> 1.9.94
---
pkgs/development/python-modules/boto3/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index ba7f4393dbd..dd8de063cff 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.9.80"; # N.B: if you change this, change botocore too
+ version = "1.9.94"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b";
+ sha256 = "fa81dc71b23f98abe9a90de3c42ffcd98451b29ad7408465eb7c0a63e1fba95e";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
From 6f00aa5a55b73ce7d9427c0c641349e2df7f5e2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 077/494] python: botocore: 1.12.80 -> 1.12.94
---
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 7eb9f3d44af..17a223f20ed 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.12.94"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d";
+ sha256 = "48f780477904795b0ce559b335d0aab4c3bb9efa96fbdf24c418e22ef0745e08";
};
propagatedBuildInputs = [
From 9fa13bba968915b7c2683e2c54241008d83baae8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 078/494] python: zc.buildout: 2.12.2 -> 2.13.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 c76a930c965..70dd13cf3b4 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.12.2";
+ version = "2.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
+ sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484";
};
patches = [ ./nix.patch ];
From 48bb7ac9d392bbebcdfb456db76e470230717828 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 079/494] python: zc.buildout: 2.12.2 -> 2.13.1
---
pkgs/development/python-modules/buildout/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index ede09373f90..755c39287f1 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
- version = "2.12.2";
+ version = "2.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
+ sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484";
};
meta = with stdenv.lib; {
From e0abf7c956027d9ebe3c6b2b26513ea675419064 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 080/494] python: cachetools: 2.1.0 -> 3.1.0
---
pkgs/development/python-modules/cachetools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index d4b9195c555..2581ba9c95f 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cachetools";
- version = "2.1.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3";
+ sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460";
};
meta = with stdenv.lib; {
From 564b69896ae79064f4dbc1bc79c670075ebf95a9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 081/494] python: cairocffi: 0.9.0 -> 1.0.1
---
pkgs/development/python-modules/cairocffi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index bdd11fb3de6..93031b12840 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "cairocffi";
- version = "0.9.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337";
+ sha256 = "9ca49d9bb0a52bd6a8263de137b4818e0889f3cd8d933165fb122669924ae3b9";
};
LC_ALL = "en_US.UTF-8";
From 1455d07699374a7d42ddd5f848856172fe1726a6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 082/494] python: cassandra-driver: 3.15.1 -> 3.16.0
---
pkgs/development/python-modules/cassandra-driver/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index c445c21478b..519a06adcc0 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "cassandra-driver";
- version = "3.15.1";
+ version = "3.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg";
+ sha256 = "42bcb167a90da6604081872ef609a327a63273842da81120fc462de031155abe";
};
buildInputs = [ pkgs.libev cython ];
From fbdbc5f894f776596597d19d3ffd18e04cc83d34 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 083/494] python: cffi: 1.11.5 -> 1.12.0
---
pkgs/development/python-modules/cffi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 2f634bf21e5..e8bcf6e5e01 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec {
pname = "cffi";
- version = "1.11.5";
+ version = "1.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4";
+ sha256 = "08090454ff236239e583a9119d0502a6b9817594c0a3714dd1d8593f2350ba11";
};
outputs = [ "out" "dev" ];
From 3075af42978f4b7c0d2a33de261c52f4ab3e05e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 084/494] python: chainer: 5.0.0 -> 5.2.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 2b9441b7662..42e24dedba2 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 = "5.0.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee";
+ sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4";
};
checkInputs = [
From 6baab451c35e2b85aded74e7783433ac78b4f905 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:12 +0100
Subject: [PATCH 085/494] python: chalice: 1.6.2 -> 1.7.0
---
pkgs/development/python-modules/chalice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index a3e945bc916..f982ffefb2a 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.6.2";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f";
+ sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa";
};
checkInputs = [ watchdog pytest hypothesis mock ];
From 3ca427d737ba8b44f21e8b0feb62699f8fbe47b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 086/494] python: channels: 2.1.6 -> 2.1.7
---
pkgs/development/python-modules/channels/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index 6719c666902..ef8456d376c 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,11 +3,11 @@
}:
buildPythonPackage rec {
pname = "channels";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd";
+ sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad";
};
# Files are missing in the distribution
From 3d1de07069612bbbb03b5d311d44615eb0776482 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 087/494] python: cloudpickle: 0.6.1 -> 0.8.0
---
pkgs/development/python-modules/cloudpickle/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index feb215a6e7a..548317a9835 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cloudpickle";
- version = "0.6.1";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1";
+ sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc";
};
buildInputs = [ pytest mock ];
From 0357494a422cabbe2175ffcd41a2ee1dc1c9f195 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 088/494] python: cmd2: 0.9.7 -> 0.9.8
---
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 4e8b76f9106..cd343d35ba5 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchPypi {
inherit pname version;
- sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379";
+ sha256 = "22c3461af56769e74225e3aeecab0e98ef86ab8d9b4ded29ba84722449fe7608";
};
LC_ALL="en_US.UTF-8";
From d49d2cc2e6847624cfef820e26b5ebe3f641baa5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 089/494] python: cmdline: 0.1.8 -> 0.2.0
---
pkgs/development/python-modules/cmdline/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix
index 1f8d913aa2a..cf0cff1f155 100644
--- a/pkgs/development/python-modules/cmdline/default.nix
+++ b/pkgs/development/python-modules/cmdline/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cmdline";
- version = "0.1.8";
+ version = "0.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7";
+ sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a";
};
# No tests, https://github.com/rca/cmdline/issues/1
From f686b06231829b98e4037a3d4bff1aa3cf8d0496 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 090/494] python: colander: 1.5.1 -> 1.7.0
---
pkgs/development/python-modules/colander/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
index 5cfa1862f48..896ee51537b 100644
--- a/pkgs/development/python-modules/colander/default.nix
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "colander";
- version = "1.5.1";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
+ sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2";
};
propagatedBuildInputs = [ translationstring iso8601 enum34 ];
From 78695ebabbad23cadd63d060e3981622d04137a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 091/494] python: colorama: 0.3.9 -> 0.4.1
---
pkgs/development/python-modules/colorama/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index bce14db7704..e85c95b85bd 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "colorama";
- version = "0.3.9";
+ version = "0.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8";
+ sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d";
};
# No tests in archive
From 6e87bed9c9c1f83b48d720172c90bb67332bfd8d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 092/494] python: colorlover: 0.2.1 -> 0.3.0
---
pkgs/development/python-modules/colorlover/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 14bae27592a..2e57ea538c9 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "colorlover";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi";
+ sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2";
};
# no tests included in distributed archive
From d80c0548b9054fb2934572d1e17336cc8ecd1661 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 093/494] python: configparser: 3.5.0 -> 3.7.1
---
.../python-modules/configparser/default.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 7bef3e82935..682c5b83215 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -2,22 +2,23 @@
buildPythonPackage rec {
pname = "configparser";
- version = "3.5.0";
+ version = "3.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k";
+ sha256 = "5bd5fa2a491dc3cfe920a3f2a107510d65eceae10e9c6e547b90261a4710df32";
};
# No tests available
doCheck = false;
- # Fix issue when used together with other namespace packages
- # https://github.com/NixOS/nixpkgs/issues/23855
- patches = [
- ./0001-namespace-fix.patch
- ];
+ preConfigure = ''
+ export LC_ALL=C.UTF-8
+ '';
meta = with stdenv.lib; {
+ description = "Updated configparser from Python 3.7 for Python 2.6+.";
+ license = licenses.mit;
+ homepage = https://github.com/jaraco/configparser;
};
}
From 504321e198534ac91c5afc5a55d8ab6399d5cc69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 094/494] python: cornice: 3.4.4 -> 3.5.1
---
pkgs/development/python-modules/cornice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 5a341168e8d..2b0c0665fa3 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "cornice";
- version = "3.4.4";
+ version = "3.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb";
+ sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687";
};
propagatedBuildInputs = [ pyramid simplejson six venusian ];
From b3e2dd1d1478db74a44702336bbcad4902d54fec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 095/494] python: cupy: 5.0.0 -> 5.2.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 908506bcd9c..d23d5bef0e4 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 = "5.0.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d";
+ sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2";
};
checkInputs = [
From bb2b606db7f2b0c1916d1acbf00bf3c59528b0fe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 096/494] python: cvxopt: 1.2.2 -> 1.2.3
---
pkgs/development/python-modules/cvxopt/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 2411e8251a0..4847d57b67b 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "cvxopt";
- version = "1.2.2";
+ version = "1.2.3";
disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi {
inherit pname version;
- sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
+ sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21";
};
# similar to Gsl, glpk, fftw there is also a dsdp interface
From 3d2c0c52c2c5be243f4ab72a2b6175395078d044 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 097/494] python: cx_Oracle: 7.0.0 -> 7.1.0
---
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 cd61c8b4ac7..c28fc99f00b 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 = "7.0.0";
+ version = "7.1.0";
buildInputs = [ odpic ];
src = fetchPypi {
inherit pname version;
- sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828";
+ sha256 = "57f084bbd7d28af4deff22ef358188c06dec885c818df92fb74e093ab22fdd8f";
};
preConfigure = ''
From 6733ec9e1ccc925939c004ae14d8051ebb3f2ead Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 098/494] python: dask: 0.20.2 -> 1.1.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 86fc85f8d69..93351de1125 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.20.2";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3";
+ sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c";
};
checkInputs = [ pytest ];
From d9d067c88b641489e38e7586dfbc66b3c7ad2ed4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:13 +0100
Subject: [PATCH 099/494] python: datadog: 0.25.0 -> 0.26.0
---
pkgs/development/python-modules/datadog/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 51809aeccac..2c3cd4a3e01 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "datadog";
- version = "0.25.0";
+ version = "0.26.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1";
+ sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";
};
postPatch = ''
From cd5c0561065c0f0b6858df9795cd9a60f36acfd5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 100/494] python: python-dateutil: 2.7.5 -> 2.8.0
No longer possible to run tests with `python setup.py tests` so we have
to explicitly use `pytest`. This is going to need further fixing.
---
.../python-modules/dateutil/default.nix | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index fc8f5671490..63366d93056 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
+{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
buildPythonPackage rec {
pname = "python-dateutil";
- version = "2.7.5";
+ version = "2.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02";
+ sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e";
};
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ six setuptools_scm ];
+ checkPhase = ''
+ py.test dateutil/test
+ '';
+
+ # Requires fixing
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Powerful extensions to the standard datetime module";
homepage = https://pypi.python.org/pypi/python-dateutil;
From bcfd325781907e2a296c976454400de95f192064 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 101/494] python: decorator: 4.3.0 -> 4.3.2
---
pkgs/development/python-modules/decorator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index e3b1bebcccb..f4395245a81 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "decorator";
- version = "4.3.0";
+ version = "4.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c";
+ sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e";
};
meta = {
From d663e05464db9411193b5ea2bc123d933924347a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 102/494] python: deluge-client: 1.6.0 -> 1.7.0
---
pkgs/development/python-modules/deluge-client/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index 6e79119b6a8..477468a0eb3 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deluge-client";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb";
+ sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092";
};
# it will try to connect to a running instance
From 9a68b3dda7924c178df818c8e57bee2ac2faafd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 103/494] python: derpconf: 0.8.2 -> 0.8.3
---
pkgs/development/python-modules/derpconf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix
index 3a0ecffe526..84f30b7edf6 100644
--- a/pkgs/development/python-modules/derpconf/default.nix
+++ b/pkgs/development/python-modules/derpconf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "derpconf";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchPypi {
inherit pname version;
- sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f";
+ sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15";
};
propagatedBuildInputs = [ six ];
From b51b39965bd2264cfd385119874cf8bb1ac5ad4e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 104/494] python: detox: 0.18 -> 0.19
---
pkgs/development/python-modules/detox/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix
index 00cea5180cd..0fbbf03d2c2 100644
--- a/pkgs/development/python-modules/detox/default.nix
+++ b/pkgs/development/python-modules/detox/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "detox";
- version = "0.18";
+ version = "0.19";
src = fetchPypi {
inherit pname version;
- sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90";
+ sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3";
};
buildInputs = [ pytest ];
From 4a1c2f1413a4d3fc731b56d5695d94dda32cba79 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 105/494] python: diff-match-patch: 20121119 -> 20181111
---
pkgs/development/python-modules/diff-match-patch/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix
index 062fb00e48b..cf1bebad144 100644
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "diff-match-patch";
- version = "20121119";
+ version = "20181111";
meta = {
homepage = https://code.google.com/p/google-diff-match-patch/;
@@ -12,6 +12,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx";
+ sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb";
};
}
From 115b28e3bec2ae1aa9a77957b819d30af506b6d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 106/494] python: dill: 0.2.8.2 -> 0.2.9
---
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 3f01d56ac91..af24ad8ed04 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.2";
+ version = "0.2.9";
src = fetchPypi {
inherit pname version;
- sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3";
+ sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f";
};
# Messy test suite. Even when running the tests like tox does, it fails
From 3644424455bb1ff9c996fe475756733483cbad88 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 107/494] python: distro: 1.3.0 -> 1.4.0
---
pkgs/development/python-modules/distro/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index e69b6366a80..0ab37155c98 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "distro";
- version = "1.3.0";
+ version = "1.4.0";
checkInputs = [ pytest pytestcov tox];
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742";
+ sha256 = "362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57";
};
meta = with stdenv.lib; {
From 332ae71b29a8d9e471528c3ea634810eae7100af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 108/494] python: django-picklefield: 1.1.0 -> 2.0
---
.../development/python-modules/django-picklefield/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 694b11c6ca8..683c0bc0ceb 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "django-picklefield";
- version = "1.1.0";
+ version = "2.0";
meta = {
description = "A pickled object field for Django";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf";
+ sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
};
}
From b67226fab2757c5d35f371e7401d6d93190966ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 109/494] python: Django: 2.1.5 -> 2.1.7
---
pkgs/development/python-modules/django/2_1.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index ab2e83e3370..e15f2213f14 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.1.5";
+ version = "2.1.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn";
+ sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
};
patches = stdenv.lib.optionals withGdal [
From 6d00cda77c63e295d833e260532ae88a26e427e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 110/494] python: django-guardian: 1.4.9 -> 1.5.0
---
pkgs/development/python-modules/django_guardian/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index 4e256a38c86..5c8dab79f00 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "django-guardian";
- version = "1.4.9";
+ version = "1.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191";
+ sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637";
};
checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
From d3e8281441c65fbc8a0c5c27c26eb8af18802f78 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 111/494] python: django-modelcluster: 4.2 -> 4.3
---
.../python-modules/django_modelcluster/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 0b0ddf5f0f2..7f89335c192 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "django-modelcluster";
- version = "4.2";
+ version = "4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8";
+ sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9";
};
doCheck = false;
From 99b5005e59729233218c29d23fece868e94cf87b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 112/494] python: dnspython: 1.15.0 -> 1.16.0
---
pkgs/development/python-modules/dnspython/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index cf37c9de4e0..74b49d1fa5a 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "dnspython";
- version = "1.15.0";
+ version = "1.16.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0";
+ sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
};
# needs networking for some tests
From ad7535f6cbbab0f1c6188f13f0014c07d8c74101 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:14 +0100
Subject: [PATCH 113/494] python: docker-pycreds: 0.3.0 -> 0.4.0
---
pkgs/development/python-modules/docker-pycreds/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 491ab814e3b..e47196df07a 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "docker-pycreds";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff";
+ sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4";
};
# require docker-credential-helpers binaries
From 1bef0b8a66b7d4044217caa60b97cf3a7f7d434f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 114/494] python: docker: 3.5.1 -> 3.7.0
---
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 961b0125c1a..3bf2e62d699 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.5.1";
+ version = "3.7.0";
pname = "docker";
src = fetchPypi {
inherit pname version;
- sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e";
+ sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152";
};
propagatedBuildInputs = [
From 71fde40c293981655af76f2737832e42ffbf3a0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 115/494] python: dogpile.cache: 0.6.8 -> 0.7.1
---
.../python-modules/dogpile.cache/default.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 9f739aae4ba..b44597b8d13 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,14 +1,14 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, Mako
+, pytest, pytestcov, mock, Mako, decorator
}:
buildPythonPackage rec {
pname = "dogpile.cache";
- version = "0.6.8";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0";
+ sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31";
};
# Disable concurrency tests that often fail,
@@ -19,12 +19,13 @@ buildPythonPackage rec {
rm tests/cache/test_memcached_backend.py
'';
- buildInputs = [ pytest pytestcov mock Mako ];
+ checkInputs = [ pytest pytestcov mock Mako ];
+
+ propagatedBuildInputs = [ decorator ];
meta = with stdenv.lib; {
description = "A caching front-end based on the Dogpile lock";
homepage = https://bitbucket.org/zzzeek/dogpile.cache;
- platforms = platforms.unix;
license = licenses.bsd3;
};
}
From b6b0f70c20de2ee963a1e5f256c4a47b706c942e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 116/494] python: dulwich: 0.19.10 -> 0.19.11
---
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 e852076d8a2..5ab65ace69f 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.10";
+ version = "0.19.11";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4";
+ sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725";
};
LC_ALL = "en_US.UTF-8";
From 114881753da116f9927629211071649ba86c23ea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 117/494] python: easy-thumbnails: 2.5 -> 2.6
---
pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index 83b35dc8c89..dae1df69562 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "easy-thumbnails";
- version = "2.5";
+ version = "2.6";
meta = {
description = "Easy thumbnails for Django";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95";
+ sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275";
};
propagatedBuildInputs = [ django pillow ];
From 4fb381218b2bd35374474976607d348f3aee6c7a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 118/494] python: entrypoints: 0.2.3 -> 0.3
---
pkgs/development/python-modules/entrypoints/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index 3f79e663455..466014715ba 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "entrypoints";
- version = "0.2.3";
+ version = "0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f";
+ sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451";
};
checkInputs = [ pytest ];
From 42f5c284b61547b0a648067c0670460a975bcbec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 119/494] python: envs: 1.2.6 -> 1.3
---
pkgs/development/python-modules/envs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix
index 43446b407af..e39292049da 100644
--- a/pkgs/development/python-modules/envs/default.nix
+++ b/pkgs/development/python-modules/envs/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "envs";
- version = "1.2.6";
+ version = "1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba";
+ sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42";
};
checkInputs = [ click jinja2 terminaltables ];
From c72673ad5a8732a14ea9e55ab03b5fdd65a73a01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 120/494] python: fb-re2: 1.0.6 -> 1.0.7
---
pkgs/development/python-modules/fb-re2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
index 88a75d29fd1..0cdfd287647 100644
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ b/pkgs/development/python-modules/fb-re2/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "fb-re2";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c";
+ sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
};
buildInputs = [ re2 ];
From d36ef92ac5dd57ec072efbf9e2408ad00b77ebac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 121/494] python: fints: 2.0.0 -> 2.0.1
---
pkgs/development/python-modules/fints/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index 4f6d8d0dc17..5ac7ccd1adc 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -2,13 +2,13 @@
requests, mt-940, sepaxml, bleach, isPy3k }:
buildPythonPackage rec {
- version = "2.0.0";
+ version = "2.0.1";
pname = "fints";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1";
+ sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78";
};
propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
From 45e2993c80024c1ac33626c00eb93404cdb82ee5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 122/494] python: flaky: 3.4.0 -> 3.5.3
---
pkgs/development/python-modules/flaky/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index 00f4fe8488c..523e6ac53e6 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "flaky";
- version = "3.4.0";
+ version = "3.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2";
+ sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da";
};
buildInputs = [ mock pytest ];
From 45e033fcf924a5b22a950b5afa144524e43328c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 123/494] python: Flask-JWT-Extended: 3.14.0 -> 3.17.0
---
.../development/python-modules/flask-jwt-extended/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
index 8b20146f212..d61f5a77600 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-JWT-Extended";
- version = "3.14.0";
+ version = "3.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "133s9js7j1b2m6vv56a2xd9in0rmx5zrdp4r005qwbvr5qxld39s";
+ sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
};
propagatedBuildInputs = [ flask pyjwt werkzeug ];
From ccba5e96e49d43c0860885ee0c254693dbf8e3c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 124/494] python: flask-paginate: 0.5.1 -> 0.5.2
---
pkgs/development/python-modules/flask-paginate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index 7af4aa2b8dd..a2c372c8bee 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flask-paginate";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn";
+ sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b";
};
propagatedBuildInputs = [ flask ];
From bb69a2c3ffb1a6e2dde8568943b50502a59b08ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 125/494] python: Flask-SocketIO: 3.1.2 -> 3.2.2
---
pkgs/development/python-modules/flask-socketio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix
index f9f23859748..c2f7caf1b81 100644
--- a/pkgs/development/python-modules/flask-socketio/default.nix
+++ b/pkgs/development/python-modules/flask-socketio/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "Flask-SocketIO";
- version = "3.1.2";
+ version = "3.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6";
+ sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d";
};
propagatedBuildInputs = [
From 72b6ead8ec166c85aa8fc5acd225ad1982f4323c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 126/494] python: flit: 1.2.1 -> 1.3
---
pkgs/development/python-modules/flit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 7c64d9bd183..64decd9c41c 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "flit";
- version = "1.2.1";
+ version = "1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1";
+ sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36";
};
disabled = !isPy3k;
From cf7d4100710aee2c85720eb25c8355a98b728251 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 127/494] python: fonttools: 3.37.0 -> 3.37.3
---
pkgs/development/python-modules/fonttools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 58df04c17c8..21780ccb9fc 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "3.37.0";
+ version = "3.37.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1";
+ sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d";
extension = "zip";
};
From 83d84444cbe81394be5c05a664d8c055f24ebba4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:15 +0100
Subject: [PATCH 128/494] python: fs-s3fs: 1.0.0 -> 1.1.0
---
pkgs/development/python-modules/fs-s3fs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix
index 156b0fdd76e..26277161b0b 100644
--- a/pkgs/development/python-modules/fs-s3fs/default.nix
+++ b/pkgs/development/python-modules/fs-s3fs/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "fs-s3fs";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak";
+ sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418";
};
propagatedBuildInputs = [ fs six boto3 ];
From b3a8b46895296d8218453f6c0d4773af6f44d741 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 129/494] python: fs: 2.1.3 -> 2.3.1
---
pkgs/development/python-modules/fs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 1ab01cf7d89..cdbdcf7d16e 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "fs";
- version = "2.1.3";
+ version = "2.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d";
+ sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e";
};
buildInputs = [ glibcLocales ];
From 0e2b7100cf534c34dee3914d89017be298b4211e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 130/494] python: gensim: 3.6.0 -> 3.7.1
---
pkgs/development/python-modules/gensim/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 5cd6ad8bf87..eeceb975985 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -10,10 +10,10 @@
buildPythonPackage rec {
pname = "gensim";
- version = "3.6.0";
+ version = "3.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07";
+ sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8";
};
propagatedBuildInputs = [ smart_open numpy six scipy ];
From 28cee643b7c42032f91e3b4ee8caf001e093a43e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 131/494] python: geopy: 1.17.0 -> 1.18.1
---
pkgs/development/python-modules/geopy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index b3767fd2dbd..da338648e4c 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "geopy";
- version = "1.17.0";
+ version = "1.18.1";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374";
+ sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8";
};
doCheck = false; # too much
From c0c2c061a05ae12b805c15eb7b31be0651c1d434 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 132/494] python: gevent: 1.3.7 -> 1.4.0
---
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 09cc5d573db..a8caf650016 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.7";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c";
+ sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1";
};
buildInputs = [ libev ];
From 11725fae5a9b1ea647fd00fd90bb7673aef68bef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 133/494] python: github3.py: 1.2.0 -> 1.3.0
---
pkgs/development/python-modules/github3_py/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
index cab7ca68ef6..a57c9c3353a 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "github3.py";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af";
+ sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda";
};
checkInputs = [ betamax pytest betamax-matchers ]
From ab5e84d8a78fd1f58492a8060f52f32a62db87ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 134/494] python: globus-sdk: 1.6.1 -> 1.7.0
---
pkgs/development/python-modules/globus-sdk/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 02ad8f0f6fb..827dc6fec7a 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "globus-sdk";
- version = "1.6.1";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a";
+ sha256 = "b8adcbe355c2baf610e9f5751967d7e910fa48604b39d6d2f083750a7a805a64";
};
checkPhase = ''
From 4c42376169a100753bd395c4088d2d1679022172 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 135/494] python: glom: 18.4.0 -> 19.1.0
---
pkgs/development/python-modules/glom/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index f24dd2b7249..ac193e61dcb 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "glom";
- version = "18.4.0";
+ version = "19.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0rfikq27a9wwfkd4k3bk7x4fssw6r7z138g9i3wpzvjc7anlzk24";
+ sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2";
};
propagatedBuildInputs = [ boltons attrs face ];
From 2b1ee6cb826e83cd8abce996a6787d6cee82ba3e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 136/494] python: gmusicapi: 11.0.4 -> 12.0.0
---
pkgs/development/python-modules/gmusicapi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix
index d2bf002cd5f..f8dfc4ff2d3 100644
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "gmusicapi";
- version = "11.0.4";
+ version = "12.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8";
+ sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b";
};
propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
From caa67167fedffc0ed069641ed5c42eb6e5561b78 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 137/494] python: google-music-proto: 2.2.0 -> 2.4.0
---
.../development/python-modules/google-music-proto/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix
index b2196c8748c..6a882e29c19 100644
--- a/pkgs/development/python-modules/google-music-proto/default.nix
+++ b/pkgs/development/python-modules/google-music-proto/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-music-proto";
- version = "2.2.0";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc";
+ sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528";
};
propagatedBuildInputs = [
From bafd6928f311d898e701d19d187339fa21453895 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 138/494] python: google-auth: 1.5.1 -> 1.6.2
---
pkgs/development/python-modules/google_auth/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index fde773e738b..1ade8b814db 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-auth";
- version = "1.5.1";
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530";
+ sha256 = "e8d64e9bc8cb6f0fc5360c693f86dc9ee6964081ee702e3b5ddc937f99efc950";
};
checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
From 4626cff7ae20f57e135d1a2a7b4901d3420e8ac7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 139/494] python: google-cloud-bigquery: 1.8.1 -> 1.9.0
---
.../python-modules/google_cloud_bigquery/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index 5e33b1b51ea..1646888b36a 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2";
+ sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f";
};
checkInputs = [ pytest mock ipython ];
From 9de737c62f1b1fd2d7b74d007e1b70319c5dda08 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 140/494] python: google-cloud-kms: 0.2.1 -> 1.0.0
---
pkgs/development/python-modules/google_cloud_kms/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix
index cf5476f7d1d..d4052a227bb 100644
--- a/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/pkgs/development/python-modules/google_cloud_kms/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
- version = "0.2.1";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45";
+ sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35";
};
checkInputs = [ pytest mock ];
From a12c3a898ac6ef998f3adf7dffd43a740b92c7f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 141/494] python: google-cloud-storage: 1.13.2 -> 1.14.0
---
.../python-modules/google_cloud_storage/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix
index d59f281c59a..9d6461168d4 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.13.2";
+ version = "1.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f";
+ sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437";
};
checkInputs = [ pytest mock ];
From 622e3bf7342ec14cf47993c38bda8d5589f882c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:16 +0100
Subject: [PATCH 142/494] python: google-cloud-texttospeech: 0.3.0 -> 0.4.0
---
.../python-modules/google_cloud_texttospeech/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
index c2bf189c237..74c9370dad3 100644
--- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250";
+ sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f";
};
checkInputs = [ pytest mock ];
From edb7e8cdd935846d9c9f7caa18f876c1c900a7f2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 143/494] python: googleapis-common-protos: 1.5.6 -> 1.5.8
---
.../python-modules/googleapis_common_protos/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index cc689acc48f..33dfc6e83cf 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "googleapis-common-protos";
- version = "1.5.6";
+ version = "1.5.8";
src = fetchPypi {
inherit pname version;
- sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2";
+ sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e";
};
propagatedBuildInputs = [ protobuf ];
From 543c70506f6b6f43e0fee6489781aaf12d5f0577 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 144/494] python: gphoto2: 1.8.5 -> 1.9.0
---
pkgs/development/python-modules/gphoto2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index e49012d4502..199f568322a 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
- version = "1.8.5";
+ version = "1.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1jvwq7qjr2iazmwdzkmr82iza7snylpm6x0kr9p0z5mkicg1l38l";
+ sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7";
};
nativeBuildInputs = [ pkgconfig ];
From 99448c406df1c6b206c89c946d17def17de7ec32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 145/494] python: green: 2.13.0 -> 2.13.1
---
pkgs/development/python-modules/green/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index 94332616b1e..1493c78df83 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "green";
- version = "2.13.0";
+ version = "2.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b";
+ sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d";
};
propagatedBuildInputs = [
From d531e1ec6cbbbbb7b269d788d7a7bb317bbbcde4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 146/494] python: grpcio-tools: 1.16.1 -> 1.18.0
---
pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index ad777cf4435..4e548577f90 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.16.1";
+ version = "1.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd";
+ sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa";
};
enableParallelBuilding = true;
From f0cba48e632ce7574c943899d0e2ddaae71804ed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 147/494] python: grpcio: 1.16.1 -> 1.18.0
---
pkgs/development/python-modules/grpcio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index e170c14949d..3ecc0b3294f 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
buildPythonPackage rec {
pname = "grpcio";
- version = "1.16.1";
+ version = "1.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1";
+ sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112";
};
nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;
From b725eb4ed5ef31927e29c9d73914b36ad2305712 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 148/494] python: gsd: 1.5.5 -> 1.6.0
---
pkgs/development/python-modules/gsd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index 04dc793a717..c0ad2dc3ac9 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "1.5.5";
+ version = "1.6.0";
pname = "gsd";
src = fetchPypi {
inherit pname version;
- sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42";
+ sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875";
};
propagatedBuildInputs = [ numpy ];
From 99b69b5402e721dbc9361f795cfa0b77f9b3c93c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 149/494] python: gspread: 3.0.1 -> 3.1.0
---
pkgs/development/python-modules/gspread/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index c197c265230..a2597b2e6e7 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "3.0.1";
+ version = "3.1.0";
pname = "gspread";
src = fetchPypi {
inherit pname version;
- sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552";
+ sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d";
};
meta = with stdenv.lib; {
From 22fb395d17ed7033e564b39df1fea56ca93bcb9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 150/494] python: gym: 0.10.9 -> 0.11.0
---
pkgs/development/python-modules/gym/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 2e4b58ae3ff..fe4cf01a8df 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "gym";
- version = "0.10.9";
+ version = "0.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0";
+ sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155";
};
propagatedBuildInputs = [
From 9a6b9d2551a33f55db269e9f20f522d20360bf8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 151/494] python: h2: 3.0.1 -> 3.1.0
---
pkgs/development/python-modules/h2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 015ad38d0c1..910080e679f 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "h2";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj";
+ sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb";
};
propagatedBuildInputs = [ enum34 hpack hyperframe ];
From cd2e38de5ddb214c96e664dcffff0f19b6963ba9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 152/494] python: ha-ffmpeg: 1.9 -> 1.11
---
pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 4259b7ad053..0b702901ae7 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "ha-ffmpeg";
- version = "1.9";
+ version = "1.11";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8";
+ sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3";
};
buildInputs = [ ffmpeg ];
From 94aa119e4ac32980d747c4a1e25b5692c8b69342 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 153/494] python: hdbscan: 0.8.18 -> 0.8.19
---
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 27d83d9c6c2..cbe5afcc8ed 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.18";
+ version = "0.8.19";
src = fetchPypi {
inherit pname version;
- sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02";
+ sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31";
};
checkInputs = [ nose ];
From 862799a545c8fc6fe346fa415aecd043ae1e988a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 154/494] python: httplib2: 0.11.3 -> 0.12.0
---
pkgs/development/python-modules/httplib2/default.nix | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 197e646027c..0fde449d825 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -2,13 +2,16 @@
buildPythonPackage rec {
pname = "httplib2";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7";
+ sha256 = "f61fb838a94ce3b349aa32c92fd8430f7e3511afdb18bf9640d647e30c90a6d6";
};
+ # Needs setting up
+ doCheck = false;
+
meta = with lib; {
homepage = http://code.google.com/p/httplib2;
description = "A comprehensive HTTP client library";
From aafdd980010ee98a6a2e5b9d6aef9b31fc01f751 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 155/494] python: hyperframe: 5.1.0 -> 5.2.0
---
pkgs/development/python-modules/hyperframe/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix
index 70c50c1f663..a8f847c53bb 100644
--- a/pkgs/development/python-modules/hyperframe/default.nix
+++ b/pkgs/development/python-modules/hyperframe/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "hyperframe";
- version = "5.1.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2";
+ sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f";
};
meta = with stdenv.lib; {
From 61596da49073edbb4b43ed4c1db1832e9a2b62f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 156/494] python: identify: 1.1.8 -> 1.2.1
---
pkgs/development/python-modules/identify/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 991edee90e5..b9249476a0f 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
- version = "1.1.8";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27";
+ sha256 = "0749c74180ef0f6a3874eaa0bf89a6990a523233180e83e6f3c7c27312ac9ba3";
};
# Tests not included in PyPI tarball
From 3d23167efd0b67774a415e11f8131914e36d6186 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 157/494] python: idna: 2.7 -> 2.8
---
pkgs/development/python-modules/idna/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index 9ce3ba3f668..5e5d623ff10 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "idna";
- version = "2.7";
+ version = "2.8";
src = fetchPypi {
inherit pname version;
- sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16";
+ sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407";
};
meta = {
From 0a3206351991e0126a1e5b2fde4f4096dba29c69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:17 +0100
Subject: [PATCH 158/494] python: imageio: 2.4.1 -> 2.5.0
---
pkgs/development/python-modules/imageio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index de838028067..9662007118d 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -12,10 +12,10 @@
buildPythonPackage rec {
pname = "imageio";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchPypi {
- sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n";
+ sha256 = "42e65aadfc3d57a1043615c92bdf6319b67589e49a0aae2b985b82144aceacad";
inherit pname version;
};
From 5bd94e5c463fb55f352148dcf720b2175be3a09d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 159/494] python: imgaug: 0.2.7 -> 0.2.8
---
pkgs/development/python-modules/imgaug/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix
index 678614912a8..0c5ce54a229 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/pkgs/development/python-modules/imgaug/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "imgaug";
- version = "0.2.7";
+ version = "0.2.8";
src = fetchPypi {
inherit pname version;
- sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8";
+ sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4";
};
propagatedBuildInputs = [
From fc325aeb50e9c133b498ed5909229873e8101715 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 160/494] python: inflect: 1.0.2 -> 2.1.0
---
pkgs/development/python-modules/inflect/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 9d3511e41d1..147cc8753eb 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "inflect";
- version = "1.0.2";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5";
+ sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73";
};
buildInputs = [ setuptools_scm ];
From ff0e3dd53f34d8811995d73ed18dfd0e884e1fd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 161/494] python: ipython: 7.1.1 -> 7.2.0
---
pkgs/development/python-modules/ipython/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index e4a56f85e81..5aa4b15f462 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -21,12 +21,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.1.1";
+ version = "7.2.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd";
+ sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12";
};
prePatch = lib.optionalString stdenv.isDarwin ''
From eb88cf275e29475a932c8aeb2477328660588918 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 162/494] python: jaraco.collections: 1.6.0 -> 2.0
---
.../development/python-modules/jaraco_collections/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index 62f2c259140..c0b30edb9ad 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -3,10 +3,10 @@
buildPythonPackage rec {
pname = "jaraco.collections";
- version = "1.6.0";
+ version = "2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3";
+ sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97";
};
doCheck = false;
From d90d47692aebeb2ff5c2324aca417d48bfa67631 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 163/494] python: jaraco.functools: 1.20 -> 2.0
---
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 cbff3f8b45a..7fc90d63f69 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.20";
+ version = "2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b";
+ sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345";
};
propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];
From 75a83cf61f15ce6150492fed0252f577adb28899 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 164/494] python: jaraco.itertools: 4.0.0 -> 4.4.1
---
pkgs/development/python-modules/jaraco_itertools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index 249054581fa..4057d7ad275 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "jaraco.itertools";
- version = "4.0.0";
+ version = "4.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl";
+ sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae";
};
buildInputs = [ setuptools_scm ];
From eaaee55da751a640c7cf495aae270f858a6448b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 165/494] python: jaraco.stream: 1.2 -> 2.0
---
pkgs/development/python-modules/jaraco_stream/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix
index 5788a52dfff..492d903f24d 100644
--- a/pkgs/development/python-modules/jaraco_stream/default.nix
+++ b/pkgs/development/python-modules/jaraco_stream/default.nix
@@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "jaraco.stream";
- version = "1.2";
+ version = "2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib";
+ sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4";
};
doCheck = false;
buildInputs = [ setuptools_scm ];
From be18d32fa501e8a9a0627205c9dcb4a8fa8a0f94 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 166/494] python: jaraco.text: 1.10.1 -> 2.0
---
pkgs/development/python-modules/jaraco_text/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
index 01309e0c4d9..222a92e60fb 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -3,10 +3,10 @@
buildPythonPackage rec {
pname = "jaraco.text";
- version = "1.10.1";
+ version = "2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh";
+ sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa";
};
doCheck = false;
buildInputs =[ setuptools_scm ];
From 7685f6fc74a1948660311daddfcce7af956821ce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 167/494] python: jdatetime: 3.0.2 -> 3.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 03aa9d0d0f8..675dba0ea72 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 = "3.0.2";
+ version = "3.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc";
+ sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2";
};
propagatedBuildInputs = [ six ];
From 6f80a699c1eae2dbea294573abc6da631b62952b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 168/494] python: jenkins-job-builder: 2.6.0 -> 2.9.1
---
.../python-modules/jenkins-job-builder/default.nix | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 67f115a9cc7..1b14074fad7 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -9,24 +9,28 @@
, six
, stevedore
, isPy27
+, fasteners
+, jinja2
}:
buildPythonPackage rec {
pname = "jenkins-job-builder";
- version = "2.6.0";
+ version = "2.9.1";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938";
+ sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0";
};
- patchPhase = ''
+ postPatch = ''
export HOME=$TMPDIR
'';
- buildInputs = [ pip ];
- propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ];
+ propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ];
+
+ # Need to fix test deps
+ doCheck = false;
meta = with stdenv.lib; {
description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
From 3e2ffbdbc6ea58671498290539a5564925385aae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 169/494] python: jsonpickle: 1.0 -> 1.1
---
pkgs/development/python-modules/jsonpickle/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index e5956d31b61..a6ef8e3e1fb 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "jsonpickle";
- version = "1.0";
+ version = "1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397";
+ sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1";
};
doCheck = false;
From 2fb453f9c49587a14f8147bd33fb6c28720bf7e2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:18 +0100
Subject: [PATCH 170/494] python: jupyter-repo2docker: 0.6.0 -> 0.7.0
---
.../python-modules/jupyter-repo2docker/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 0413a5badba..a400dd4d18c 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -16,13 +16,13 @@
}:
buildPythonPackage rec {
- version = "0.6.0";
+ version = "0.7.0";
pname = "jupyter-repo2docker";
disabled = !(pythonAtLeast "3.4");
src = fetchPypi {
inherit pname version;
- sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27";
+ sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4";
};
checkInputs = [ pytest pyyaml wheel pytestcov ];
From 27f20064bbeadf1c29de0188f4b10f3126d60118 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 171/494] python: kazoo: 2.5.0 -> 2.6.1
---
pkgs/development/python-modules/kazoo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix
index f7712ff6200..7d384ba7cc3 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/pkgs/development/python-modules/kazoo/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kazoo";
- version = "2.5.0";
+ version = "2.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd";
+ sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783";
};
propagatedBuildInputs = [ six ];
From 7e29f6b55225930685dc77068e8d40d2aca1a07e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 172/494] python: Keras_Preprocessing: 1.0.8 -> 1.0.9
---
.../python-modules/keras-preprocessing/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix
index 9d620233744..96c38f3cd89 100644
--- a/pkgs/development/python-modules/keras-preprocessing/default.nix
+++ b/pkgs/development/python-modules/keras-preprocessing/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Keras_Preprocessing";
- version = "1.0.8";
+ version = "1.0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d";
+ sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac";
};
propagatedBuildInputs = [
From b5c5963ddd8b4669c197e085978107353f8de0f0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 173/494] python: keyring: 16.0.2 -> 18.0.0
---
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 5714c242af5..041fafaf08c 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 = "16.0.2";
+ version = "18.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150";
+ sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d";
};
nativeBuildInputs = [ setuptools_scm ];
From e7fa663de6de68a90db2839e07326b5a307b2fbd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 174/494] python: kombu: 4.2.2.post1 -> 4.3.0
---
pkgs/development/python-modules/kombu/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 2a8c59be420..21c1035547a 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kombu";
- version = "4.2.2.post1";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78";
+ sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8";
};
postPatch = ''
From 66febdeb3cc1ca81b74c3d1cdc06fc465a8063aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 175/494] python: ldappool: 2.3.1 -> 2.4.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 1fb69e816bb..460d743b1ed 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.3.1";
+ version = "2.4.0";
src = fetchPypi {
pname = "ldappool";
inherit version;
- sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6";
+ sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3";
};
nativeBuildInputs = [ pbr ];
From f2c89e325df625d6ff9ec40c9d08943cdc96de08 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 176/494] python: libagent: 0.12.1 -> 0.13.0
---
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 eb58cc0b2d5..939e4f18898 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.12.1";
+ version = "0.13.0";
src = fetchPypi{
inherit pname version;
- sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5";
+ sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e";
};
propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
From a8586da8535c328bdf31ef210f174b12e58ac219 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 177/494] python: librosa: 0.6.2 -> 0.6.3
---
pkgs/development/python-modules/librosa/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix
index aca69066592..258c2d6932d 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "librosa";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d";
+ sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118";
};
propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ];
From 50b082c5ba42dd555438a3a39c2a7ecc00d4cc0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 178/494] python: limnoria: 2018.09.09 -> 2018.12.19
---
pkgs/development/python-modules/limnoria/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 58f2d2a9694..cce640cce36 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "limnoria";
- version = "2018.09.09";
+ version = "2018.12.19";
src = fetchPypi {
inherit pname version;
- sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y";
+ sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc";
};
patchPhase = ''
From a4e684cbdd2e9c410fc2961f19bfcccb02bbf699 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 179/494] python: luftdaten: 0.3.4 -> 0.5.0
---
pkgs/development/python-modules/luftdaten/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index 59abefb0538..10d7eda9e04 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "luftdaten";
- version = "0.3.4";
+ version = "0.5.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442";
+ sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
From 8eabecf4ee258dc1bc891d823bf2025d90627bdd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 180/494] python: lxml: 4.2.6 -> 4.3.1
---
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 a37a22318ec..117a9699e01 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.6";
+ version = "4.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2";
+ sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d";
};
nativeBuildInputs = [ libxml2.dev libxslt.dev ];
From 1fa2857c71acfa2d25bab785f22b70d108fa7846 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:19 +0100
Subject: [PATCH 181/494] python: manhole: 1.5.0 -> 1.6.0
---
pkgs/development/python-modules/manhole/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix
index 1dc90e66683..c8b77e9668f 100644
--- a/pkgs/development/python-modules/manhole/default.nix
+++ b/pkgs/development/python-modules/manhole/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "manhole";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m";
+ sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42";
};
# test_help expects architecture-dependent Linux signal numbers.
From 1c370027956495807a8a3e3b63c60adb96a89c78 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 182/494] python: MarkupSafe: 1.0 -> 1.1.0
---
pkgs/development/python-modules/markupsafe/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 069b71de00d..7a7d7f0287b 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "MarkupSafe";
- version = "1.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+ sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3";
};
meta = with stdenv.lib; {
From f5895cfa3d0e51b52c31562dfee5d7c4089b276b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 183/494] python: marshmallow-sqlalchemy: 0.15.0 -> 0.16.0
---
.../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 1bf78bc2084..8582f8a29f9 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.15.0";
+ version = "0.16.0";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1phqbbrq1xjvc7cwasy5zws4bdb050qikfp1qg8f1hqhmipkpiaz";
+ sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c";
};
propagatedBuildInputs = [ marshmallow sqlalchemy ];
From cca1a9b81fd568729be33f4fea579c0d37de45a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 184/494] python: marshmallow: 2.16.3 -> 2.18.0
---
pkgs/development/python-modules/marshmallow/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 9b8f1c0e530..ca7257faee5 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow";
- version = "2.16.3";
+ version = "2.18.0";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2";
+ sha256 = "958e6640bec9a04ca15701e3d99b12c4269d0f43be596f00eeca1f2baf530abc";
};
propagatedBuildInputs = [ dateutil simplejson ];
From f1fac795be1edf9e6185bc67952cee4c651d2248 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 185/494] python: mautrix-appservice: 0.3.7 -> 0.3.8
---
.../development/python-modules/mautrix-appservice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix
index 1420f1880a3..f181b5f4f99 100644
--- a/pkgs/development/python-modules/mautrix-appservice/default.nix
+++ b/pkgs/development/python-modules/mautrix-appservice/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "mautrix-appservice";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c";
+ sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f";
};
propagatedBuildInputs = [
From e016d1207b6bbb283650a26032cda3b0d614bd87 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 186/494] python: mecab-python3: 0.7 -> 0.996.1
---
pkgs/development/python-modules/mecab-python3/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix
index 110d1a57c82..1a2cce8f110 100644
--- a/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/pkgs/development/python-modules/mecab-python3/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "mecab-python3";
- version = "0.7";
+ version = "0.996.1";
src = fetchPypi {
inherit pname version;
- sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy";
+ sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d";
};
propagatedBuildInputs = [ mecab ];
From 79009ede6857c4cd50806d3ec8de078641ba5870 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 187/494] python: micawber: 0.3.8 -> 0.4.0
---
pkgs/development/python-modules/micawber/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix
index 3425440390d..e3dffbfcb48 100644
--- a/pkgs/development/python-modules/micawber/default.nix
+++ b/pkgs/development/python-modules/micawber/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "micawber";
- version = "0.3.8";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd";
+ sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e";
};
propagatedBuildInputs = [ beautifulsoup4 ];
From 3e4e9abae4ece9e2d2daf1c7f3b4cfbfcbafc98a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:20 +0100
Subject: [PATCH 188/494] python: more-itertools: 4.3.0 -> 5.0.0 / 6.0.0
Upgrade to 5.0.0 for 2.7 and 6.0.0 for other versions.
---
.../python-modules/more-itertools/2.7.nix | 31 +++++++++++++++++++
.../python-modules/more-itertools/default.nix | 4 +--
pkgs/top-level/python-packages.nix | 4 ++-
3 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 pkgs/development/python-modules/more-itertools/2.7.nix
diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix
new file mode 100644
index 00000000000..e0786aefa2c
--- /dev/null
+++ b/pkgs/development/python-modules/more-itertools/2.7.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, six
+, stdenv
+}:
+
+
+buildPythonPackage rec {
+ pname = "more-itertools";
+ version = "5.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4";
+ };
+
+ checkInputs = [ nose ];
+ propagatedBuildInputs = [ six ];
+
+ # iterable = range(10 ** 10) # Is efficiently reversible
+ # OverflowError: Python int too large to convert to C long
+ doCheck = !stdenv.hostPlatform.is32bit;
+
+ meta = {
+ homepage = https://more-itertools.readthedocs.org;
+ description = "Expansion of the itertools module";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index b7131902962..999708697a9 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "more-itertools";
- version = "4.3.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e";
+ sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1";
};
checkInputs = [ nose ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 33b9645a8a1..93355ba46e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5030,7 +5030,9 @@ in {
inflect = callPackage ../development/python-modules/inflect { };
- more-itertools = callPackage ../development/python-modules/more-itertools { };
+ more-itertools = if isPy27 then
+ callPackage ../development/python-modules/more-itertools/2.7.nix { }
+ else callPackage ../development/python-modules/more-itertools { };
jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
From 81246606919ced82ac068d582ac3d773c77a12f9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 189/494] python: moviepy: 0.2.3.5 -> 1.0.0
---
pkgs/development/python-modules/moviepy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 960fb604ec9..693d5cf5d7f 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "moviepy";
- version = "0.2.3.5";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1jrdpnzyk373zlh8lvjdabyvljz3sahshbdgbpk6w9vx5hfacvjk";
+ sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d";
};
# No tests
From d5be98cf421c79deac61a44ae148337da3c24b27 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 190/494] python: mpmath: 1.0.0 -> 1.1.0
---
pkgs/development/python-modules/mpmath/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index 8280ecec4a4..9da56cad881 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "mpmath";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c";
+ sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6";
};
# error: invalid command 'test'
From 972aee3d4b54fd9b611a48df8dc17780d0fd78c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 191/494] python: msgpack: 0.5.6 -> 0.6.1
---
pkgs/development/python-modules/msgpack/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index 3068a31f1e2..d48d0995a76 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "msgpack";
- version = "0.5.6";
+ version = "0.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
+ sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972";
};
checkPhase = ''
From b4ae923fc3b8bbea6d50715aadf31f33ecd270e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 192/494] python: multiprocess: 0.70.6.1 -> 0.70.7
---
pkgs/development/python-modules/multiprocess/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix
index c5c53577505..a98697039a8 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/pkgs/development/python-modules/multiprocess/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "multiprocess";
- version = "0.70.6.1";
+ version = "0.70.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq";
+ sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3";
};
propagatedBuildInputs = [ dill ];
From b58aa7457d35c679ad2974c0ab7d01f5c1484b0e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 193/494] python: mutagen: 1.41.1 -> 1.42.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 78271de6f69..f91cc5e939e 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.41.1";
+ version = "1.42.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200";
+ sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c";
};
checkInputs = [
From 8c388fa8c9c79e970f22bd57146114a253b779f8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 194/494] python: mypy-protobuf: 1.7 -> 1.9
---
pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index 1194280ef4b..a06a378a076 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "mypy-protobuf";
- version = "1.7";
+ version = "1.9";
src = fetchPypi {
inherit pname version;
- sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d";
+ sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b";
};
propagatedBuildInputs = [ protobuf ];
From ccb99258aa0fb509eb706ff618d8a419ea5d7a87 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 195/494] python: mypy: 0.650 -> 0.670
---
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 bcb252a7b49..c028eaaaa14 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "mypy";
- version = "0.650";
+ version = "0.670";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q";
+ sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d";
};
disabled = !isPy3k;
From d95ebbae7aee5a5f2758f9170183b6ba4352e945 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 196/494] python: mysqlclient: 1.3.14 -> 1.4.2.post1
---
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 71287189017..58d545da624 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.14";
+ version = "1.4.2.post1";
buildInputs = [
mysql.connector-c
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r";
+ sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7";
};
meta = with stdenv.lib; {
From 42e07932965a5d75ec89a4dd103ad5fd89e6a069 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 197/494] python: natsort: 5.5.0 -> 6.0.0
---
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 92f885d7bbd..da8e953826f 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "natsort";
- version = "5.5.0";
+ version = "6.0.0";
checkInputs = [
pytest
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09";
+ sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776";
};
# testing based on project's tox.ini
From 773e1c3e5848d3c411af484943233134520b6a55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 198/494] python: nbconvert: 5.4.0 -> 5.4.1
---
pkgs/development/python-modules/nbconvert/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 19e8e1eede9..e8e2dde5e1e 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "nbconvert";
- version = "5.4.0";
+ version = "5.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807";
+ sha256 = "302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4";
};
checkInputs = [ nose pytest glibcLocales ];
From 7d0a9da1646b9070f6d490445378933be1c856c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 199/494] python: nest_asyncio: 0.9.10 -> 1.0.0
---
pkgs/development/python-modules/nest-asyncio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index e8fa0e5e409..59c13bc0a63 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.9.10";
+ version = "1.0.0";
pname = "nest_asyncio";
disabled = !(pythonAtLeast "3.5");
src = fetchPypi {
inherit pname version;
- sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57";
+ sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e";
};
meta = with stdenv.lib; {
From 83e3df7ef8e276a9d4515847b852bdd8fd2224a3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 200/494] python: nilearn: 0.4.2 -> 0.5.0
---
pkgs/development/python-modules/nilearn/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 32ec4b74509..f697e34e999 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "nilearn";
- version = "0.4.2";
+ version = "0.5.0";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
- sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4";
+ sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca";
};
# disable some failing tests
From e6efedbbdc92b8a832be61b5eeb9c13001b00d2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 201/494] python: nipype: 1.1.7 -> 1.1.8
---
.../python-modules/nipype/default.nix | 6 ++--
.../nipype/move-uneeded-requires.patch | 31 -------------------
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 pkgs/development/python-modules/nipype/move-uneeded-requires.patch
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 1978ce81637..fe08e1f0789 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -44,15 +44,13 @@ in
buildPythonPackage rec {
pname = "nipype";
- version = "1.1.7";
+ version = "1.1.8";
src = fetchPypi {
inherit pname version;
- sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn";
+ sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc";
};
- patches = [ ./move-uneeded-requires.patch ];
-
postPatch = ''
substituteInPlace nipype/interfaces/base/tests/test_core.py \
--replace "/usr/bin/env bash" "${bash}/bin/bash"
diff --git a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch b/pkgs/development/python-modules/nipype/move-uneeded-requires.patch
deleted file mode 100644
index 89324285d18..00000000000
--- a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nipype/info.py b/nipype/info.py
-index c6503ac..4379643 100644
---- a/nipype/info.py
-+++ b/nipype/info.py
-@@ -147,9 +147,6 @@ REQUIRES = [
- 'neurdflib',
- 'click>=%s' % CLICK_MIN_VERSION,
- 'funcsigs',
-- 'pytest>=%s' % PYTEST_MIN_VERSION,
-- 'pytest-xdist',
-- 'mock',
- 'pydotplus',
- 'pydot>=%s' % PYDOT_MIN_VERSION,
- 'packaging',
-@@ -159,7 +156,15 @@ REQUIRES = [
- if sys.version_info <= (3, 4):
- REQUIRES.append('configparser')
-
--TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5']
-+TESTS_REQUIRES = [
-+ 'pytest>=%s' % PYTEST_MIN_VERSION,
-+ 'pytest-xdist',
-+ 'mock',
-+ 'pytest-cov',
-+ 'codecov',
-+ 'pytest-env',
-+ 'coverage<5'
-+]
-
- EXTRA_REQUIRES = {
- 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
From 72f74a633fc04564cedc6aefa7c79f93dfa89bd1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:21 +0100
Subject: [PATCH 202/494] python: nose-randomly: 1.2.5 -> 1.2.6
---
pkgs/development/python-modules/nose-randomly/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix
index 531994d9053..23315f9531b 100644
--- a/pkgs/development/python-modules/nose-randomly/default.nix
+++ b/pkgs/development/python-modules/nose-randomly/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "nose-randomly";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3";
+ sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c";
};
checkInputs = [ numpy nose ];
From 9106b456b5d095d51122bb512d23e9d5393e2084 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 203/494] python: numpy: 1.16.0 -> 1.16.1
---
pkgs/development/python-modules/numpy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index c9cd7f91833..291a80a521b 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -16,12 +16,12 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb";
+ sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288";
};
disabled = isPyPy;
From 38b197af2ea123c4cc26eb1617b68efa0304ce90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 204/494] python: odfpy: 1.3.6 -> 1.4.0
---
pkgs/development/python-modules/odfpy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix
index 161272ce1a7..1b732b66b38 100644
--- a/pkgs/development/python-modules/odfpy/default.nix
+++ b/pkgs/development/python-modules/odfpy/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "odfpy";
- version = "1.3.6";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b";
+ sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b";
};
# Python 2.7 uses a different ordering for xml namespaces.
From aedde810e4d702d491a3d1cdc11ffc27860267eb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 205/494] python: openpyxl: 2.5.12 -> 2.6.0
---
pkgs/development/python-modules/openpyxl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index ca05cccd037..211e7a36627 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "openpyxl";
- version = "2.5.12";
+ version = "2.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a";
+ sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c";
};
checkInputs = [ pytest ];
From 9102a9ebf7017bedd8e275bc4377f857636c3c14 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 206/494] python: ovh: 0.4.8 -> 0.5.0
---
pkgs/development/python-modules/ovh/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix
index 474609220cf..017f75d991c 100644
--- a/pkgs/development/python-modules/ovh/default.nix
+++ b/pkgs/development/python-modules/ovh/default.nix
@@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "ovh";
- version = "0.4.8";
+ version = "0.5.0";
# Needs yanc
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd";
+ sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8";
};
meta = {
From 1a06654ab906f15b182e635d38649f47f464f7bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 207/494] python: packaging: 18.0 -> 19.0
---
pkgs/development/python-modules/packaging/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index a5b7218d886..2a3302aea38 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "packaging";
- version = "18.0";
+ version = "19.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807";
+ sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af";
};
propagatedBuildInputs = [ pyparsing six ];
From 3480e2c34537f5afff031ac59f2fbfd228095fa7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 208/494] python: pamela: 0.3.0 -> 1.0.0
---
pkgs/development/python-modules/pamela/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix
index 05254e4fd43..9a55719d77f 100644
--- a/pkgs/development/python-modules/pamela/default.nix
+++ b/pkgs/development/python-modules/pamela/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pamela";
- version = "0.3.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
+ sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c";
};
postUnpack = ''
From 691965a0c5d197f2507a1725d3f3b7063398b07c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 209/494] python: pamqp: 2.0.0 -> 2.1.0
---
pkgs/development/python-modules/pamqp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index a6ef3b22e41..844a66392c6 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -9,12 +9,12 @@
}:
buildPythonPackage rec {
- version = "2.0.0";
+ version = "2.1.0";
pname = "pamqp";
src = fetchPypi {
inherit pname version;
- sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d";
+ sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c";
};
buildInputs = [ mock nose pep8 pylint mccabe ];
From c80c568467da3ee763e3e4fa2560ea6558a86670 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 210/494] python: pandas: 0.23.4 -> 0.24.1
---
pkgs/development/python-modules/pandas/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index f0c357d6ccc..2562975e592 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -16,6 +16,7 @@
, lxml
, html5lib
, beautifulsoup4
+, hypothesis
, openpyxl
, tables
, xlwt
@@ -28,16 +29,17 @@ let
in buildPythonPackage rec {
pname = "pandas";
- version = "0.23.4";
+ version = "0.24.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4";
+ sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af";
};
- checkInputs = [ pytest glibcLocales moto ];
+ checkInputs = [ pytest glibcLocales moto hypothesis ];
- buildInputs = [ cython ] ++ optional isDarwin libcxx;
+ nativeBuildInputs = [ cython ];
+ buildInputs = optional isDarwin libcxx;
propagatedBuildInputs = [
dateutil
scipy
From 01863f237bf3f003b73ff7a5cfd7d2e4b89824cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 211/494] python: paperspace: 0.0.13 -> 0.0.15
---
pkgs/development/python-modules/paperspace/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index 2d4f6a9e9f4..74a223d7f80 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "paperspace";
- version = "0.0.13";
+ version = "0.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf";
+ sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c";
};
propagatedBuildInputs = [ boto3 requests ];
From 65c5889102cf9524198a1e822648e11b3d71f343 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 212/494] python: parameterized: 0.6.1 -> 0.7.0
---
pkgs/development/python-modules/parameterized/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 14b41fe950b..62b1bcbc42e 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "parameterized";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa";
+ sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5";
};
# Tests require some python3-isms but code works without.
From e7e81d693d9253097eb152cee42b9188a2cf99e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 213/494] python: parse: 1.9.0 -> 1.11.1
---
pkgs/development/python-modules/parse/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 8a4881b730f..004b58fec6a 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -3,11 +3,11 @@
}:
buildPythonPackage rec {
pname = "parse";
- version = "1.9.0";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437";
+ sha256 = "870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2";
};
checkPhase = ''
From 3b2d381c03fe69e6a7d2da3004f2ddf5f412a48a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 214/494] python: parso: 0.3.1 -> 0.3.4
---
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 c29901b2e99..f5ecb64d232 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.3.1";
+ version = "0.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2";
+ sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db";
};
checkInputs = [ pytest ];
From 36e7ae9d091071d073b8c8e51286163050148dd7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 215/494] python: PasteDeploy: 1.5.2 -> 2.0.1
---
pkgs/development/python-modules/pastedeploy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix
index 433a67da51c..34fb090179b 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/pkgs/development/python-modules/pastedeploy/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "1.5.2";
+ version = "2.0.1";
pname = "PasteDeploy";
src = fetchPypi {
inherit pname version;
- sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb";
+ sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a";
};
buildInputs = [ nose ];
From 795d996cacb10e9584cacae5592249f82422e91a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:22 +0100
Subject: [PATCH 216/494] python: PasteScript: 2.0.2 -> 3.0.0
---
pkgs/development/python-modules/pastescript/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix
index ac85b4be120..fe89e6e5aea 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/pkgs/development/python-modules/pastescript/default.nix
@@ -9,12 +9,12 @@
}:
buildPythonPackage rec {
- version = "2.0.2";
+ version = "3.0.0";
pname = "PasteScript";
src = fetchPypi {
inherit pname version;
- sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0";
+ sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3";
};
buildInputs = [ nose ];
From fca2e7fd282b2efa1a85f87c62f8021d1452f9b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 217/494] python: pathos: 0.2.2.1 -> 0.2.3
---
pkgs/development/python-modules/pathos/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 0756174fec6..814854596e9 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pathos";
- version = "0.2.2.1";
+ version = "0.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892";
+ sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9";
};
propagatedBuildInputs = [ dill pox ppft multiprocess ];
From c9bff08c38888cc064e50f0d74201dd3f74bc559 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 218/494] python: pbr: 5.1.1 -> 5.1.2
---
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 b3d13a0f648..6beba771701 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 = "5.1.1";
+ version = "5.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68";
+ sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b";
};
# circular dependencies with fixtures
From b87cb9b0f0b0a233be3124397457b45c7cd8ffd4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 219/494] python: pdf2image: 1.3.1 -> 1.4.1
---
pkgs/development/python-modules/pdf2image/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index 32a4581676b..d8fa26abf74 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pdf2image";
- version = "1.3.1";
+ version = "1.4.1";
propagatedBuildInputs = [ pillow poppler_utils ];
src = fetchPypi {
inherit pname version;
- sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky";
+ sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08";
};
meta = with stdenv.lib; {
From db1a6f50484038283349bb7e923c12cad1d65897 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 220/494] python: pex: 1.5.3 -> 1.6.2
---
pkgs/development/python-modules/pex/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 90f6d5a85e0..8bac0c1c537 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pex";
- version = "1.5.3";
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd";
+ sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415";
};
prePatch = ''
From 1901d103f67906954a6bc41c379591db7476e59b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 221/494] python: pg8000: 1.12.4 -> 1.13.1
---
pkgs/development/python-modules/pg8000/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index a0e8d08a2c7..5073b91f82e 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pg8000";
- version = "1.12.4";
+ version = "1.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39";
+ sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b";
};
propagatedBuildInputs = [ pytz six ];
From adbcf0f622c517f80a925477697652683ce5dfc9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 222/494] python: phonenumbers: 8.10.3 -> 8.10.5
---
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 4e94c1a7140..c082412d094 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.10.3";
+ version = "8.10.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097";
+ sha256 = "aed1483d6d97fe5176715b87fa2b8a572b8695ba9d27b810ad618320198529b3";
};
meta = {
From af2cf6aec6249112ff9aa75aa04329c20ed6ee3f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 223/494] python: phonopy: 1.13.2.107 -> 2.0.0
---
pkgs/development/python-modules/phonopy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index 903b2b90c30..026d466d218 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonopy";
- version = "1.13.2.107";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905";
+ sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495";
};
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
From afe899fde2317c94e00a4c43b6540ad2ffba25c5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 224/494] python: pid: 2.2.1 -> 2.2.2
---
pkgs/development/python-modules/pid/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index bbf2c687ce5..08f7e9b9f1f 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pid";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b";
+ sha256 = "daa52ff1aa4f3e21cee0df5d8862be5db96dde6e5abf7613964a626a78eca5f8";
};
buildInputs = [ nose ];
From 4528d7f61765a36d2b20d5a694e6a49ca5c16885 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 225/494] python: Pillow: 5.3.0 -> 5.4.1
---
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 5651884928c..e0791248e26 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.3.0";
+ version = "5.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93";
+ sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f";
};
doCheck = !stdenv.isDarwin && !isPyPy;
From 6d5231eb41a1f947abbec28a513ad3776344436c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 226/494] python: pint: 0.8.1 -> 0.9
---
pkgs/development/python-modules/pint/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index d6806308e55..1bd5853ba72 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pint";
- version = "0.8.1";
+ version = "0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4";
+ sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2";
};
meta = with stdenv.lib; {
From 3eb0a16f92971d681ee8a93610da6621d1c6fcae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 227/494] python: pip-tools: 3.1.0 -> 3.3.2
---
pkgs/development/python-modules/pip-tools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index de35a06d6d4..3c3183da273 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "3.1.0";
+ version = "3.3.2";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
- sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi";
+ sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda";
};
LC_ALL = "en_US.UTF-8";
From ff4d22adfc3e14b66ce3a509bd39992fb2093809 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:23 +0100
Subject: [PATCH 228/494] python: pip: 18.1 -> 19.0.2
---
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 7fc5adee7fb..41faefed34e 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 = "18.1";
+ version = "19.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1";
+ sha256 = "f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5";
};
# pip detects that we already have bootstrapped_pip "installed", so we need
From 688285c0bcbfb6493ff278330480fdce4fc20c88 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 229/494] python: pkginfo: 1.4.2 -> 1.5.0.1
---
pkgs/development/python-modules/pkginfo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix
index db323e671d4..879274a16c3 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pkginfo";
- version = "1.4.2";
+ version = "1.5.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474";
+ sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb";
};
doCheck = false; # I don't know why, but with doCheck = true it fails.
From 9cfa9a8fba872364083045d6ba99f7478aaabeef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 230/494] python: plaid-python: 2.3.4 -> 2.4.0
---
pkgs/development/python-modules/plaid-python/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index 87c594e473d..5c52b407566 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, requests, pytest }:
buildPythonPackage rec {
- version = "2.3.4";
+ version = "2.4.0";
pname = "plaid-python";
src = fetchPypi {
inherit pname version;
- sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db";
+ sha256 = "734fe8328b7fc9a52f8e204b4cce99dd475fe5add784a57fdf0f0cb99eb752a0";
};
checkInputs = [ pytest ];
From fb15279c163480296568561a83ae4add76a0ba42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 231/494] python: plotly: 3.4.2 -> 3.6.1
---
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 20a9c7ca981..6a2d49996b3 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "3.4.2";
+ version = "3.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269";
+ sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91";
};
propagatedBuildInputs = [
From 3358f38ef2ed6c9c7810a1d5a26ffdd059174a89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 232/494] python: pluginbase: 0.7 -> 1.0.0
---
pkgs/development/python-modules/pluginbase/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix
index c4b884e1d3d..98d189d62b1 100644
--- a/pkgs/development/python-modules/pluginbase/default.nix
+++ b/pkgs/development/python-modules/pluginbase/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
buildPythonPackage rec {
- version = "0.7";
+ version = "1.0.0";
pname = "pluginbase";
buildInputs = [ pytest tox ];
src = fetchPypi {
inherit pname version;
- sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
+ sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005";
};
meta = with stdenv.lib; {
From ead3a6f9184ad9f4d25cdbf7a95fe0df5f0f4329 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 233/494] python: plyfile: 0.6 -> 0.7
---
pkgs/development/python-modules/plyfile/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index 6a7f09a1451..3f6f3ab13bf 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "plyfile";
- version = "0.6";
+ version = "0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce";
+ sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089";
};
propagatedBuildInputs = [ numpy ];
From 1c7dddd6d0c5089ed815e8c37ea0add1dede27cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 234/494] python: portpicker: 1.2.0 -> 1.3.0
---
pkgs/development/python-modules/portpicker/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix
index a4538b260fd..b51a226c859 100644
--- a/pkgs/development/python-modules/portpicker/default.nix
+++ b/pkgs/development/python-modules/portpicker/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "portpicker";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y";
+ sha256 = "6f5e9ab798d5d764f14de547bc858d3126d351510fbad974b384940e4a7280a5";
};
meta = {
From 87da87c719c5cb59a56030cf6467bfc3ae8e2d0b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 235/494] python: pox: 0.2.4 -> 0.2.5
---
pkgs/development/python-modules/pox/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix
index ef1a18e7ab1..18aa9cb7369 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/pkgs/development/python-modules/pox/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pox";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea";
+ sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8";
};
meta = with stdenv.lib; {
From 93cceae425857a5f56746bb58be2221c80700a1a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 236/494] python: ppft: 1.6.4.8 -> 1.6.4.9
---
pkgs/development/python-modules/ppft/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index 69c4da786fe..0cac4cb1b1e 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "ppft";
- version = "1.6.4.8";
+ version = "1.6.4.9";
src = fetchPypi {
inherit pname version;
- sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2";
+ sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791";
};
propagatedBuildInputs = [ six ];
From e3c87a02b9b379ad43bf6aba9b813e87313cd266 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 237/494] python: premailer: 3.2.0 -> 3.3.0
---
pkgs/development/python-modules/premailer/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index 5e169306b2f..14fa0d2f59d 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "premailer";
- version = "3.2.0";
+ version = "3.3.0";
meta = {
description = "Turns CSS blocks into style attributes ";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735";
+ sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1";
};
buildInputs = [ mock nose ];
From 1aeb0dcdda4dd61c3ac02c5b91e3df1970b02f80 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 238/494] python: process-tests: 2.0.1 -> 2.0.2
---
pkgs/development/python-modules/process-tests/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix
index c986cc6b990..5ab27b67da4 100644
--- a/pkgs/development/python-modules/process-tests/default.nix
+++ b/pkgs/development/python-modules/process-tests/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "process-tests";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06";
+ sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431";
};
# No tests
From 313a74c35866dcc8dc1c005be7392d2e9575c067 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:24 +0100
Subject: [PATCH 239/494] python: prometheus_client: 0.4.2 -> 0.5.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 d358bbec1da..67b82838798 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.4.2";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9";
+ sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c";
};
doCheck = false;
From 1267770fff380faca1290beb747fd8c05517373e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 240/494] python: prompt_toolkit: 2.0.7 -> 2.0.8
---
pkgs/development/python-modules/prompt_toolkit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix
index cd0df6c52be..de362b2dab4 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "prompt_toolkit";
- version = "2.0.7";
+ version = "2.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx";
+ sha256 = "c6655a12e9b08edb8cf5aeab4815fd1e1bdea4ad73d3bbf269cf2e0c4eb75d5e";
};
checkPhase = ''
py.test -k 'not test_pathcompleter_can_expanduser'
From 953fce82f340ff485110e819a172957bfcbb0cc4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 241/494] python: psycopg2: 2.7.6.1 -> 2.7.7
---
pkgs/development/python-modules/psycopg2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 82b3edfdc0f..081ea4c699d 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.7.6.1";
+ version = "2.7.7";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82";
+ sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e";
};
buildInputs = lib.optional stdenv.isDarwin openssl;
From 03ee1da58948f07582aa62ac25ad4c5c711111ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 242/494] python: pvlib: 0.6.0 -> 0.6.1
---
pkgs/development/python-modules/pvlib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 34134546f56..8142f0acc61 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pvlib";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj";
+ sha256 = "56e70747add2e50846dd8bbef9a4735e82c1224ce630d1db7590b96bd59dd3f7";
};
checkInputs = [ pytest ];
From 996e6843e8482f4b34da398910feac8a08e1be79 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 243/494] python: scrypt: 0.8.6 -> 0.8.13
---
pkgs/development/python-modules/py_scrypt/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix
index 11fe98c664e..0c2d5eb5c02 100644
--- a/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/pkgs/development/python-modules/py_scrypt/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "scrypt";
- version = "0.8.6";
+ version = "0.8.13";
src = fetchPypi {
inherit pname version;
- sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d";
+ sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea";
};
buildInputs = [ openssl ];
From f87f1c2c121f75d1d85b8a2593241982fd3f7465 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 244/494] python: pyaml: 17.12.1 -> 18.11.0
---
pkgs/development/python-modules/pyaml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index fd1866d22f4..927963cec8d 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pyaml";
- version = "17.12.1";
+ version = "18.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3";
+ sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a";
};
propagatedBuildInputs = [ pyyaml ];
From e51bf41f44c715091566d7b6b766215a5ff61af2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 245/494] python: pyasn1-modules: 0.2.3 -> 0.2.4
---
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 96304606cdf..0bef3f9e69f 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.3";
+ version = "0.2.4";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261";
+ sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c";
};
propagatedBuildInputs = [ pyasn1 ];
From 92f366ffd82037f8781c413c54aa3cc21fce85cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 246/494] python: pybase64: 0.4.0 -> 0.5.0
---
pkgs/development/python-modules/pybase64/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 60ab6465555..afc353d182c 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pybase64";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf";
+ sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50";
};
propagatedBuildInputs = [ six ];
From d6dc80967f78f4b9663e1d6bf5476576e870f41a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 247/494] python: pycapnp: 0.6.3 -> 0.6.4
---
pkgs/development/python-modules/pycapnp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix
index 2ba0e653e77..629fdd0114d 100644
--- a/pkgs/development/python-modules/pycapnp/default.nix
+++ b/pkgs/development/python-modules/pycapnp/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pycapnp";
- version = "0.6.3";
+ version = "0.6.4";
disabled = isPyPy || isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b3c5a1fcc93fd02fdc070aeccb89654b87f20bdc740f643cc6378925ed6d4c17";
+ sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf";
};
buildInputs = [ capnproto cython ];
From 1a9048cd801fc241be9c93da6b4845a502401d1c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 248/494] python: PyChromecast: 2.4.0 -> 2.5.0
---
pkgs/development/python-modules/pychromecast/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index bda05a58e15..a08f5f44ea2 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyChromecast";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2";
+ sha256 = "29f586ace15e672eeb6d37f96be2098b8566403183d78011c9d3b647a8e521bd";
};
disabled = !isPy3k;
From a9f11ad93249905977ccfd4adccfc801aa7c0d7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 249/494] python: PyContracts: 1.8.8 -> 1.8.12
---
pkgs/development/python-modules/pycontracts/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix
index 6ae90ac5524..7594c7c1e57 100644
--- a/pkgs/development/python-modules/pycontracts/default.nix
+++ b/pkgs/development/python-modules/pycontracts/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "PyContracts";
- version = "1.8.8";
+ version = "1.8.12";
src = fetchPypi {
inherit pname version;
- sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va";
+ sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a";
};
buildInputs = [ nose ];
From 87ca1e712c628716247bb39f004facd1b14f5246 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 250/494] python: pycryptodome: 3.7.2 -> 3.7.3
---
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 473d81c73bd..e4b66b907ca 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.7.2";
+ version = "3.7.3";
pname = "pycryptodome";
src = fetchPypi {
inherit pname version;
- sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7";
+ sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636";
};
meta = {
From 223f1260391e8c9f31c0d1e97ad5e0be380ebb36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 251/494] python: pycryptodomex: 3.7.2 -> 3.7.3
---
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 61a0df7accd..62613c74765 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.7.2";
+ version = "3.7.3";
meta = {
description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b";
+ sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175";
};
}
From 7111b59c70156932e80271b209bffa2faa90aed6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 252/494] python: pyepsg: 0.3.2 -> 0.4.0
---
pkgs/development/python-modules/pyepsg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix
index dd8c987401d..4822e528dee 100644
--- a/pkgs/development/python-modules/pyepsg/default.nix
+++ b/pkgs/development/python-modules/pyepsg/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyepsg";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr";
+ sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7";
};
propagatedBuildInputs = [ requests ];
From f39464e0fda1a160b1c2c2dc55e9bd623e40ab86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:25 +0100
Subject: [PATCH 253/494] python: pyFFTW: 0.10.4 -> 0.11.1
---
pkgs/development/python-modules/pyfftw/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix
index fdc76493da8..bed1dffa5c7 100644
--- a/pkgs/development/python-modules/pyfftw/default.nix
+++ b/pkgs/development/python-modules/pyfftw/default.nix
@@ -1,18 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi
-, fftw, fftwFloat, fftwLongDouble, numpy, scipy }:
+, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }:
buildPythonPackage rec {
- version = "0.10.4";
+ version = "0.11.1";
pname = "pyFFTW";
src = fetchPypi {
inherit pname version;
- sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a";
+ sha256 = "05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926";
};
buildInputs = [ fftw fftwFloat fftwLongDouble];
- propagatedBuildInputs = [ numpy scipy ];
+ propagatedBuildInputs = [ numpy scipy cython dask ];
# Tests cannot import pyfftw. pyfftw works fine though.
doCheck = false;
From b3ea273010094fea2cead26c8a1f77f6833ade47 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 254/494] python: pyfiglet: 0.8.post0 -> 0.8.post1
---
pkgs/development/python-modules/pyfiglet/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix
index 622c366cd8d..d8256e9632a 100644
--- a/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/pkgs/development/python-modules/pyfiglet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- version = "0.8.post0";
+ version = "0.8.post1";
pname = "pyfiglet";
src = fetchPypi {
inherit pname version;
- sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519";
+ sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639";
};
doCheck = false;
From b7990c749d132fda921bb88ed39c3a9ff7876047 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 255/494] python: pyflakes: 2.0.0 -> 2.1.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 3f799c1962a..66892d1f861 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 = "2.0.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49";
+ sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d";
};
buildInputs = [ unittest2 ];
From 479eae7084fbf133d68a7ea4398fefd5872ef659 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 256/494] python: pyhomematic: 0.1.54 -> 0.1.55
---
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 a12e5eb462c..ed4074d1442 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.54";
+ version = "0.1.55";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3c27f303e6a424229d2d5133af593c21f7d660bdf19d3d00641fbac08a6992c5";
+ sha256 = "fea3238d87ad6f9a7b26c8c779e27ae7332a42e08f6cf38e9e28af97edbfc409";
};
# PyPI tarball does not include tests/ directory
From 5bfad7383e5ad145c84ab645a258407d94e6d67e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 257/494] python: pyjet: 1.3.0 -> 1.4.0
---
pkgs/development/python-modules/pyjet/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix
index ca9492cb948..efbced9f3b3 100644
--- a/pkgs/development/python-modules/pyjet/default.nix
+++ b/pkgs/development/python-modules/pyjet/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyjet";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg";
+ sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31";
};
# fix for python37
From f195d8aa8fe60a64a74ecbc27145638229fe90c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 258/494] python: PyJWT: 1.6.4 -> 1.7.1
---
pkgs/development/python-modules/pyjwt/default.nix | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index 065cae45929..c02c0361cf2 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -4,27 +4,17 @@
buildPythonPackage rec {
pname = "PyJWT";
- version = "1.6.4";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176";
+ sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
propagatedBuildInputs = [ cryptography ecdsa ];
checkInputs = [ pytestrunner pytestcov pytest ];
- # pytest 3.9.0 changed behavior of deprecated_call, see release notes
- postPatch = ''
- for x in tests/test_api_*py; do
- substituteInPlace "$x" --replace AssertionError pytest.fail.Exception
- done
- '';
-
- # https://github.com/jpadilla/pyjwt/issues/382
- doCheck = false;
-
meta = with lib; {
description = "JSON Web Token implementation in Python";
homepage = https://github.com/jpadilla/pyjwt;
From fd09856c864d27025856144b30e5c117011f1539 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 259/494] python: pylast: 2.4.0 -> 3.0.0
---
pkgs/development/python-modules/pylast/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index 64479a7b5af..0510948e6ba 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pylast";
- version = "2.4.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb";
+ sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56";
};
propagatedBuildInputs = [ certifi six ];
From fb79468d0778d4766b7cdc60119d2ebdb2e16eb8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 260/494] python: pylibgen: 1.3.1 -> 2.0.1
---
pkgs/development/python-modules/pylibgen/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix
index 8db864cc869..edceb3f4035 100644
--- a/pkgs/development/python-modules/pylibgen/default.nix
+++ b/pkgs/development/python-modules/pylibgen/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pylibgen";
- version = "1.3.1";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh";
+ sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e";
};
disabled = !isPy3k;
From b08748586530193574bff5fb758dea2a17e11702 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 261/494] python: pymatgen: 2018.10.18 -> 2019.2.4
---
pkgs/development/python-modules/pymatgen/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 8e64d5cb11d..c3f360768d0 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymatgen";
- version = "2018.10.18";
+ version = "2019.2.4";
src = fetchPypi {
inherit pname version;
- sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9";
+ sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091";
};
nativeBuildInputs = [ glibcLocales ];
From 353c4b67e01945aa8cd3ca12f353ef276f175b6e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 262/494] python: pymc3: 3.5 -> 3.6
---
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 ebf852c09a4..a683c07d3af 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.5";
+ version = "3.6";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee";
+ sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9";
};
# No need for coverage stats in Nix builds
From 619991bb7ac4c7e70b402533cf0f14ea201a1236 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 263/494] python: pymediainfo: 2.3.0 -> 3.0
---
pkgs/development/python-modules/pymediainfo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index 2169f23295a..a7908171d69 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pymediainfo";
- version = "2.3.0";
+ version = "3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x";
+ sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245";
};
postPatch = ''
From 5e9a864882ab847985b1beb42bfeeb3f0470c555 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 264/494] python: pynmea2: 1.12.0 -> 1.15.0
---
pkgs/development/python-modules/pynmea2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix
index c217e8406e1..f950c7798b8 100644
--- a/pkgs/development/python-modules/pynmea2/default.nix
+++ b/pkgs/development/python-modules/pynmea2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynmea2";
- version = "1.12.0";
+ version = "1.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i";
+ sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b";
};
checkInputs = [ pytest ];
From 027ea14294016f893ea90018bead681cb7308e71 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 265/494] python: pyopencl: 2018.2.2 -> 2018.2.3
---
pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 274c72974fe..2aaabe0760f 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyopencl";
- version = "2018.2.2";
+ version = "2018.2.3";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc";
+ sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6";
};
# py.test is not needed during runtime, so remove it from `install_requires`
From f91bfaa049abcc3fee97929f60fe486d7797e23a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 266/494] python: pyOpenSSL: 18.0.0 -> 19.0.0
---
pkgs/development/python-modules/pyopenssl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index a6e8e94e094..7bc54cb0ffb 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -48,11 +48,11 @@ in
buildPythonPackage rec {
pname = "pyOpenSSL";
- version = "18.0.0";
+ version = "19.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580";
+ sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200";
};
outputs = [ "out" "dev" ];
From 32f82c4c997a823660f5894c0360ab4cb74f64cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 267/494] python: pyowm: 2.9.0 -> 2.10.0
---
pkgs/development/python-modules/pyowm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index c853965469a..1392956ef03 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyowm";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849";
+ sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7";
};
propagatedBuildInputs = [ requests geojson ];
From f8811500a434fd382dff694049f8f0b46a5201f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:26 +0100
Subject: [PATCH 268/494] python: pyramid: 1.10.1 -> 1.10.2
---
pkgs/development/python-modules/pyramid/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index 3f8af5b82eb..51c6f28564f 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "pyramid";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0";
+ sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e";
};
checkInputs = [ docutils virtualenv webtest zope_component ];
From 26db5fd35e35e9020a6c6ad6867bd9c91ef8fb6e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 269/494] python: pyramid_jinja2: 2.7 -> 2.8
---
pkgs/development/python-modules/pyramid_jinja2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix
index 626142ee2f2..216fb57c221 100644
--- a/pkgs/development/python-modules/pyramid_jinja2/default.nix
+++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pyramid_jinja2";
- version = "2.7";
+ version = "2.8";
src = fetchPypi {
inherit pname version;
- sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb";
+ sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502";
};
buildInputs = [ webtest ];
From 51300e45555e8137d12b7dba74981abcaaaf9467 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 270/494] python: pyro-ppl: 0.3.0 -> 0.3.1
---
pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index f3bc353fe0e..ffbe6c0f0dd 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -1,12 +1,12 @@
{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
, graphviz, networkx, six, opt-einsum, tqdm }:
buildPythonPackage rec {
- version = "0.3.0";
+ version = "0.3.1";
pname = "pyro-ppl";
src = fetchPypi {
inherit version pname;
- sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l";
+ sha256 = "2f684bdd7661d78db89297289334d801c76f2fbf1a551edb14e4d33b29985f3e";
};
propagatedBuildInputs = [
From 00c75a5caa91c82118e586672ae6541b2c73749a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 271/494] python: Pyro4: 4.74 -> 4.75
---
pkgs/development/python-modules/pyro4/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index df8df2cb93c..e9df7039e89 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -16,11 +16,11 @@ buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Pyro4";
- version = "4.74";
+ version = "4.75";
src = fetchPypi {
inherit pname version;
- sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f";
+ sha256 = "3897c0254046d4cb412a4d1a8f2f9c2c1c1ae643a24db07d0abdb51acdb8d7b5";
};
propagatedBuildInputs = [
From cfff16ee15272c912acf035a5d8dd8ff339b398e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 272/494] python: pyrr: 0.7.2 -> 0.10.1
---
pkgs/development/python-modules/pyrr/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix
index ab9c93b9b01..9dd262e0035 100644
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ b/pkgs/development/python-modules/pyrr/default.nix
@@ -2,12 +2,12 @@
, setuptools, multipledispatch, numpy }:
buildPythonPackage rec {
- version = "0.7.2";
+ version = "0.10.1";
pname = "pyrr";
src = fetchPypi {
inherit pname version;
- sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa";
+ sha256 = "06305b2f555f8b8091a6c29a05d5d33f131c9dd268e22d94985e43ab5df70c1d";
};
buildInputs = [ setuptools ];
From 68ebf4aa67c951c108e78d66def3920afdf06565 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 273/494] python: pyrsistent: 0.14.9 -> 0.14.10
---
pkgs/development/python-modules/pyrsistent/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index e916c907e4f..e70d8223e9a 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyrsistent";
- version = "0.14.9";
+ version = "0.14.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s";
+ sha256 = "07f7ae71291af8b0dbad8c2ab630d8223e4a8c4e10fc37badda158c02e753acf";
};
propagatedBuildInputs = [ six ];
From 9b45ce45b508209a212c277dba7d93cebc559cf6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 274/494] python: pyspread: 1.1.2 -> 1.1.3
---
pkgs/development/python-modules/pyspread/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
index a5a0104490a..d80cbf41629 100644
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ b/pkgs/development/python-modules/pyspread/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pyspread";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83";
+ sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc";
};
propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
From 3547637a55ce5d34cb8c32b20ff32f23bc518dfb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 275/494] python: pytest-asyncio: 0.9.0 -> 0.10.0
---
pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 24602c52260..346530d4a81 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
buildPythonPackage rec {
pname = "pytest-asyncio";
- version = "0.9.0";
+ version = "0.10.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf";
+ sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf";
};
buildInputs = [ pytest ]
From 3ebdd0b34176c10534797bcdffcfea0fccfc1a77 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 276/494] python: pytest-django: 3.4.6 -> 3.4.7
---
pkgs/development/python-modules/pytest-django/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index ed38b5b5265..ec28c8af442 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
}:
buildPythonPackage rec {
pname = "pytest-django";
- version = "3.4.6";
+ version = "3.4.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y";
+ sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec";
};
nativeBuildInputs = [ pytest setuptools_scm ];
From 321a04ba5cfcbbe82beba4ad4c7da13a32303bff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 277/494] python: pytest-fixture-config: 1.3.0 -> 1.4.0
---
.../python-modules/pytest-fixture-config/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index 67ceebef305..af599c86a44 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pytest-fixture-config";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08";
+ sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3";
};
nativeBuildInputs = [ setuptools-git ];
From 5106ecb5e8014ddfc760f147ac7826b26716808d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 278/494] python: pytest-flake8: 1.0.3 -> 1.0.4
---
pkgs/development/python-modules/pytest-flake8/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index eb8a2e3e117..d3b2df60399 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pytest-flake8";
- version = "1.0.3";
+ version = "1.0.4";
# although pytest is a runtime dependency, do not add it as
# propagatedBuildInputs in order to allow packages depend on another version
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4";
+ sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0";
};
checkPhase = ''
From a6011229c9f5066093b8a0167f94b92155e7038e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 279/494] python: pytest-forked: 0.2 -> 1.0.1
---
pkgs/development/python-modules/pytest-forked/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 14eb3a74d57..a0c0328b26b 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pytest-forked";
- version = "0.2";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
+ sha256 = "260d03fbd38d5ce41a657759e8d19bc7c8cfa6d0dcfa36c0bc9742d33bc30742";
};
buildInputs = [ pytest setuptools_scm ];
From bc4c27a69cb9da1e63b011266d0932faaf455fda Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 280/494] python: pytest-localserver: 0.4.2 -> 0.5.0
---
.../development/python-modules/pytest-localserver/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index 7daffbfa69c..3c7ee449ced 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pytest-localserver";
- version = "0.4.2";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07";
+ sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2";
};
propagatedBuildInputs = [ werkzeug ];
From 547457f02c8bf07e217663df745774692da25cc5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 281/494] python: pytest-mock: 1.10.0 -> 1.10.1
---
.../development/python-modules/pytest-mock/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 163063ae57f..6a70b6e8ce9 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,15 +2,15 @@
buildPythonPackage rec {
pname = "pytest-mock";
- version = "1.10.0";
-
+ version = "1.10.1";
+
src = fetchPypi {
inherit pname version;
- sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0";
+ sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4";
};
- propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
- nativeBuildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = lib.optional (!isPy3k) mock;
+ nativeBuildInputs = [ setuptools_scm pytest ];
checkPhase = ''
py.test
From d29b599e0d43cf014be57892cd50f74fa779b73e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:27 +0100
Subject: [PATCH 282/494] python: pytest-server-fixtures: 1.3.1 -> 1.6.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 caede4c1809..ac6c15c0ab5 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.1";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df";
+ sha256 = "cf4a6aff42f620fe556c175e8f493f086c9690a492059cf23521a10d3ac5db1a";
};
buildInputs = [ pytest ];
From 53d8462684c54ffacce848407af6176ecd02642c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 283/494] python: pytest-shutil: 1.3.0 -> 1.6.0
---
pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 4fa11dbd7d1..c8a23e6f449 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pytest-shutil";
- version = "1.3.0";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1";
+ sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca";
};
buildInputs = [ cmdline pytest ];
From 51364c7ea32230a3c46cbc56963b180bb874139c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 284/494] python: pytest-virtualenv: 1.3.0 -> 1.6.0
---
pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix
index 413d090bbcc..a3ecd4d62ae 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pytest-virtualenv";
- version = "1.3.0";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f";
+ sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19";
};
buildInputs = [ pytest pytestcov mock cmdline ];
From a5bf2d0f68b4921ec282f91c5973ba5306a2794c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 285/494] python: pytest-xdist: 1.24.1 -> 1.26.1
---
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 a8fc1c6742b..614a5348bce 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.24.1";
+ version = "1.26.1";
src = fetchPypi {
inherit pname version;
- sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de";
+ sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4";
};
nativeBuildInputs = [ setuptools_scm pytest ];
From 07c590e26de498f0421d420e1da373b1ea4309ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 286/494] python: python-binance: 0.7.0 -> 0.7.1
---
pkgs/development/python-modules/python-binance/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index 74d04cfd927..9ed165f93b1 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -3,12 +3,12 @@
, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }:
buildPythonPackage rec {
- version = "0.7.0";
+ version = "0.7.1";
pname = "python-binance";
src = fetchPypi {
inherit pname version;
- sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps";
+ sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7";
};
doCheck = false; # Tries to test multiple interpreters with tox
From d08857a1e0293453ac830042bf7df1ea44960515 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 287/494] python: python-daemon: 2.2.0 -> 2.2.3
---
pkgs/development/python-modules/python-daemon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 76544adaf0b..f4704c30b5d 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-daemon";
- version = "2.2.0";
+ version = "2.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c";
+ sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25";
};
# A test fail within chroot builds.
From 278776f9a9761b0b7c2d9e4839849551b2b56042 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 288/494] python: python-editor: 1.0.3 -> 1.0.4
---
pkgs/development/python-modules/python-editor/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index 94cdd8029ba..4691785dae1 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- version = "1.0.3";
+ version = "1.0.4";
pname = "python-editor";
src = fetchPypi {
inherit pname version;
- sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
+ sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b";
};
# No proper tests
From 2ee9bd50e5f46184821c77884044392d464d9fa9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 289/494] python: python-rapidjson: 0.6.3 -> 0.7.0
---
pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index d245d472a00..2b55d975ed3 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
- version = "0.6.3";
+ version = "0.7.0";
pname = "python-rapidjson";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085";
+ sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06";
};
LC_ALL="en_US.utf-8";
From 454527eece2b7ec3dc2ad78fbc6fc1ec19da9a1d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 290/494] python: python-slugify: 1.2.6 -> 2.0.1
---
pkgs/development/python-modules/python-slugify/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index b3e3de0285a..39950b97f6c 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-slugify";
- version = "1.2.6";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245";
+ sha256 = "d3e034397236020498e677a35e5c05dcc6ba1624b608b9ef7e5fe3090ccbd5a8";
};
doCheck = !isPy3k;
# (only) on python3 unittest loader (loadTestsFromModule) fails
From d0161c9ce6ba331d206a559995dc1c38c6973039 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 291/494] python: python-socketio: 2.1.2 -> 3.1.2
---
pkgs/development/python-modules/python-socketio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index f58b42aa04c..368b26f2fb5 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "python-socketio";
- version = "2.1.2";
+ version = "3.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5";
+ sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3";
};
propagatedBuildInputs = [
From a321cdcbd64f58349b8d46dadeea7d1973e81743 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 292/494] python: pytools: 2018.5.2 -> 2019.1
---
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 41eac5d2044..37bfee1d246 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.5.2";
+ version = "2019.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b";
+ sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b";
};
checkInputs = [ pytest ];
From 86d3ef0569871de763defc5d3e1537e8f9e41c32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 293/494] python: pytz: 2018.7 -> 2018.9
---
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 408c64190bb..cc30c802fd9 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.7";
+ version = "2018.9";
src = fetchPypi {
inherit pname version;
- sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca";
+ sha256 = "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c";
};
checkPhase = ''
From e4d2dfded685101f8137b263754a34ccae5f61f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 294/494] python: pytzdata: 2018.7 -> 2018.9
---
pkgs/development/python-modules/pytzdata/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix
index d1328fca004..9fb057800db 100644
--- a/pkgs/development/python-modules/pytzdata/default.nix
+++ b/pkgs/development/python-modules/pytzdata/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytzdata";
- version = "2018.7";
+ version = "2018.9";
src = fetchPypi {
inherit pname version;
- sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2";
+ sha256 = "dddaaf4f1717820a6fdcac94057e03c1a15b3829a44d9eaf19988917977db408";
};
# No tests
From c979604d45c13ce19d59245b993b623bbf081707 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 295/494] python: pyunifi: 2.15 -> 2.16
---
pkgs/development/python-modules/pyunifi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix
index 4169c2a22f9..49b01550772 100644
--- a/pkgs/development/python-modules/pyunifi/default.nix
+++ b/pkgs/development/python-modules/pyunifi/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyunifi";
- version = "2.15";
+ version = "2.16";
src = fetchPypi {
inherit pname version;
- sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf";
+ sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83";
};
propagatedBuildInputs = [ requests ];
From 6a68bdac9a9dfbce85f9ebebf0c7a7f9b5187962 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:28 +0100
Subject: [PATCH 296/494] python: pyupdate: 0.2.16 -> 0.2.23
---
pkgs/development/python-modules/pyupdate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix
index 37fe5a05369..1421c968fdf 100644
--- a/pkgs/development/python-modules/pyupdate/default.nix
+++ b/pkgs/development/python-modules/pyupdate/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyupdate";
- version = "0.2.16";
+ version = "0.2.23";
src = fetchPypi {
inherit pname version;
- sha256 = "1p4zpjvwy6h9kr0dp80z5k04s14r9f75jg9481gpx8ygxj0l29bi";
+ sha256 = "448ee8f3e18c044877c3644c7423198d8ecfc3b0d992f0efa53f9f61392d658d";
};
propagatedBuildInputs = [ requests ];
From 761bc897b8ac7f4ac249e27bf4c16466a4b1e835 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 297/494] python: qiskit: 0.6.1 -> 0.7.2
---
pkgs/development/python-modules/qiskit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1938cb37c75..128696bd79c 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -21,13 +21,13 @@
buildPythonPackage rec {
pname = "qiskit";
- version = "0.6.1";
+ version = "0.7.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38";
+ sha256 = "08c7f7ccd32a5cb0c0a0c4f63d6ff068d659c9c0b51e2df6f2054e586e8bfa19";
};
buildInputs = [ cmake ]
From 6a19c3b261038f0ae195df90a07acf79ead9d5b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 298/494] python: QtPy: 1.5.2 -> 1.6.0
---
pkgs/development/python-modules/qtpy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index a2e261284d8..ecc531d82ce 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtPy";
- version = "1.5.2";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac";
+ sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f";
};
# no concrete propagatedBuildInputs as multiple backends are supposed
From fdf004ccc6c7d93a45ba2064c74abaccead786bd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 299/494] python: redis: 3.0.1 -> 3.1.0
---
pkgs/development/python-modules/redis/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 879ca3d7b4d..1851fe7a0de 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -1,11 +1,11 @@
{ fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
pname = "redis";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1kw3a1618pl908abiaxd41jg5z0rwyl2w2i0d8xi9zxy5437a011";
+ sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7";
};
# tests require a running redis
From 9f2617caa2f9b679a4d84c1e8740d8985014275b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 300/494] python: regex: 2018.11.22 -> 2019.02.07
---
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 f089d1cdba2..01655030d63 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.11.22";
+ version = "2019.02.07";
src = fetchPypi {
inherit pname version;
- sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f";
+ sha256 = "4a1a1d963f462c13722b34ef1f82c4707091b0a3fb9b5fd79b6670c38b734095";
};
postCheck = ''
From bdbe48b7af324ac8de74dea6d15a34dc42d98a2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 301/494] python: requests-oauthlib: 1.0.0 -> 1.2.0
---
pkgs/development/python-modules/requests-oauthlib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index d2fcef3e169..be37a48f00c 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -2,12 +2,12 @@
, oauthlib, requests }:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "1.2.0";
pname = "requests-oauthlib";
src = fetchPypi {
inherit pname version;
- sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f";
+ sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57";
};
doCheck = false; # Internet tests fail when building in chroot
From b86de1abec8e44772ba9630d87ceb8f9706cc73d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 302/494] python: requests-toolbelt: 0.8.0 -> 0.9.1
---
pkgs/development/python-modules/requests-toolbelt/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index f865f6b8aed..cebdcc2a033 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "requests-toolbelt";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5";
+ sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
};
checkInputs = [ betamax mock pytest ];
From 62021bb3cdca085127044351521971295c45fc96 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 303/494] python: requests: 2.20.1 -> 2.21.0
---
pkgs/development/python-modules/requests/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index cf9660b0906..063c6d95071 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "requests";
- version = "2.20.1";
+ version = "2.21.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263";
+ sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e";
};
nativeBuildInputs = [ pytest ];
From 69807b07cc4557e981a943f78b7a41ac05534736 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 304/494] python: restructuredtext_lint: 1.1.3 -> 1.2.2
---
.../python-modules/restructuredtext_lint/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
index b8626524b54..9f73ba28362 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "restructuredtext_lint";
- version = "1.1.3";
+ version = "1.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037";
+ sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350";
};
checkInputs = [ nose flake8 pyyaml testtools ];
From 6648aa84d3b066f6c8cd4fd462e47c7c5019770c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 305/494] python: root_numpy: 4.7.3 -> 4.8.0
---
pkgs/development/python-modules/root_numpy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix
index 3f36eb730ce..dc2c5f790b5 100644
--- a/pkgs/development/python-modules/root_numpy/default.nix
+++ b/pkgs/development/python-modules/root_numpy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "root_numpy";
- version = "4.7.3";
+ version = "4.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg";
+ sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878";
};
disabled = isPy3k; # blocked by #27649
From d9366f21ca523f8ed4cd51c3a76d39f4d0509cf0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 306/494] python: rope: 0.11.0 -> 0.12.0
---
pkgs/development/python-modules/rope/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 21281d341cc..b91709446b3 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rope";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2";
+ sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7";
};
checkInputs = [ nose ];
From 67f130dfe9a42519ca40fa565de1a77bd0ebe603 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 307/494] python: ruamel.yaml: 0.15.86 -> 0.15.88
---
pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index 3e7cd4479eb..7b14d337f34 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "ruamel.yaml";
- version = "0.15.86";
+ version = "0.15.88";
src = fetchPypi {
inherit pname version;
- sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0";
+ sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7";
};
# Tests cannot load the module to test
From c280e83e79ca1817824fed0dadf19ca903fb850d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 308/494] python: s3transfer: 0.1.13 -> 0.2.0
---
pkgs/development/python-modules/s3transfer/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 9b74b9c8ba3..7589d0fce73 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "s3transfer";
- version = "0.1.13";
+ version = "0.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1";
+ sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021";
};
foo = 1;
From bab6dfdc7b3c652c0ef944065dcb9b6ee8f6c1ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 309/494] python: salmon-mail: 3.0.2 -> 3.1.0
---
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 9486899c606..d4eed74611e 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.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc";
+ sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d";
};
checkInputs = [ nose jinja2 mock ];
From 492d56aa0a2108ae2c60a6e905d33dd1e048d709 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 310/494] python: schedule: 0.5.0 -> 0.6.0
---
pkgs/development/python-modules/schedule/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix
index ee86d8869fe..4d4ec409e02 100644
--- a/pkgs/development/python-modules/schedule/default.nix
+++ b/pkgs/development/python-modules/schedule/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "schedule";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh";
+ sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9";
};
buildInputs = [ mock ];
From 25d0337b864538e0e38caeed22af15ff13b907e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:29 +0100
Subject: [PATCH 311/494] python: scikit-image: 0.14.1 -> 0.14.2
---
pkgs/development/python-modules/scikit-image/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 5d8399d6267..e2ba35e0438 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "scikit-image";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchPypi {
inherit pname version;
- sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50";
+ sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f";
};
buildInputs = [ cython ];
From 3ef550b15c705f0a511102d0fc722d175a248029 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 312/494] python: scipy: 1.2.0 -> 1.2.1
---
pkgs/development/python-modules/scipy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 5fe21024e00..01c54ef5f16 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "scipy";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "51a2424c8ed80e60bdb9a896806e7adaf24a58253b326fbad10f80a6d06f2214";
+ sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c";
};
checkInputs = [ nose pytest ];
From 87ce3fa0215f433cc21085894d222453ab9bcaae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 313/494] python: setuptools: 40.6.3 -> 40.8.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 0a34c2b5429..7548f96a88e 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 = "40.6.3";
+ version = "40.8.0";
name = "${python.libPrefix}-${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8";
+ sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d";
};
nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
From e358e47683dff56d93c0aa8698fd522bff5a5329 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 314/494] python: setuptools_scm: 3.1.0 -> 3.2.0
---
pkgs/development/python-modules/setuptools_scm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
index f6e0daea5ad..4a6b5ecc0cd 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, pip }:
buildPythonPackage rec {
pname = "setuptools_scm";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40";
+ sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358";
};
buildInputs = [ pip ];
From 4c8996cc2a4a2b74017449c12ea92be08071b508 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 315/494] python: six: 1.11.0 -> 1.12.0
---
pkgs/development/python-modules/six/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix
index 6921b3590e4..78e7a5f0538 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/pkgs/development/python-modules/six/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "six";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9";
+ sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73";
};
checkInputs = [ pytest ];
From 70c552fbefda29a0e02a495564cf33ae3a01c52d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 316/494] python: smart_open: 1.7.1 -> 1.8.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 5896437e61d..9d4df113599 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.7.1";
+ version = "1.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap";
+ sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build
From d8f56526af7482535b14cf3ecf1360d90ce878b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 317/494] python: sopel: 6.5.3 -> 6.6.2
---
pkgs/development/python-modules/sopel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 92ace6f2bb3..7927b92015f 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sopel";
- version = "6.5.3";
+ version = "6.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99";
+ sha256 = "40d76188ed51a2c612d2d75bd0a5a36f3cf31e3d7ac072d2798a247c2e7a0927";
};
buildInputs = [ pytest ];
From 28868f6b6907234b89248eeb8828dc9ff754d649 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 318/494] python: sortedcontainers: 2.0.5 -> 2.1.0
---
pkgs/development/python-modules/sortedcontainers/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix
index 5362e0b0037..b2b7f203503 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "sortedcontainers";
- version = "2.0.5";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950";
+ sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a";
};
# pypi tarball does not come with tests
From 9d012bae19f8277884fde89e8727d662d03681d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 319/494] python: spglib: 1.10.4.11 -> 1.12.2.post0
---
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 7385387eb86..9d87ec42cc1 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.4.11";
+ version = "1.12.2.post0";
src = fetchPypi {
inherit pname version;
- sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e";
+ sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443";
};
propagatedBuildInputs = [ numpy ];
From 2f99e683a0221635baf83c706c0594ea57cc05be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 320/494] python: sphinx-testing: 0.8.1 -> 1.0.0
---
pkgs/development/python-modules/sphinx-testing/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix
index 86d440a63b1..4b110f3ec18 100644
--- a/pkgs/development/python-modules/sphinx-testing/default.nix
+++ b/pkgs/development/python-modules/sphinx-testing/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "sphinx-testing";
- version = "0.8.1";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf";
+ sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c";
};
checkInputs = [ mock ];
From b6e50612f0581f60580ccae0ef3503ac1f024904 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 321/494] python: sphinx_rtd_theme: 0.4.2 -> 0.4.3
---
pkgs/development/python-modules/sphinx_rtd_theme/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index 6ce714c9a31..fcdb3abbe66 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "sphinx_rtd_theme";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09";
+ sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a";
};
propagatedBuildInputs = [ sphinx ];
From ce50e0f8d729bf2fe3422248a3f3cf9c49b18cfa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 322/494] python: sphinxcontrib-openapi: 0.3.2 -> 0.4.0
---
.../python-modules/sphinxcontrib-openapi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index 4843a5bbe9d..b8a4f25f5df 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b";
+ sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3";
};
propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];
From 296da52900b4b59ff1242a919b38eb27851e50c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 323/494] python: sphinxcontrib-plantuml: 0.12 -> 0.14
---
.../python-modules/sphinxcontrib_plantuml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index 530bc53a280..f20a3435a00 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-plantuml";
- version = "0.12";
+ version = "0.14";
src = fetchPypi {
inherit pname version;
- sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5";
+ sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82";
};
# No tests included.
From 06580d1ce652cd6fdbbbc5752de2fee98793b59a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 324/494] python: sqlmap: 1.2.12 -> 1.3.2
---
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 aa3bcc6ae7a..53c6ae8cdba 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.12";
+ version = "1.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413";
+ sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da";
};
# No tests in archive
From 1d698989e5cfcca49914314feb976f6a4c58f15c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:30 +0100
Subject: [PATCH 325/494] python: SQLObject: 3.7.0 -> 3.7.1
---
pkgs/development/python-modules/sqlobject/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 2eccc5e013f..86fcb6eaaab 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "SQLObject";
- version = "3.7.0";
+ version = "3.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93";
+ sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2";
};
checkInputs = [ pytest ];
From d9abbebc5edb5fa5dd62db6c6c743bbdea2fcd97 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 326/494] python: srptools: 0.2.0 -> 1.0.0
---
pkgs/development/python-modules/srptools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix
index 2df3397f625..e7e9a1e5391 100644
--- a/pkgs/development/python-modules/srptools/default.nix
+++ b/pkgs/development/python-modules/srptools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "srptools";
- version = "0.2.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37";
+ sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d";
};
propagatedBuildInputs = [ six ];
From 8951423f30a903c7d82193419b90fe38be96d8a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 327/494] python: stripe: 2.10.1 -> 2.21.0
---
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 4652bd0cf45..978592366cb 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 = "2.10.1";
+ version = "2.21.0";
# 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 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7";
+ sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110";
};
checkInputs = [ unittest2 mock ];
From 5221e22d9adc5f41bff8c20f9b0522dad1e10822 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 328/494] python: structlog: 18.2.0 -> 19.1.0
---
pkgs/development/python-modules/structlog/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index a4130502e4b..aa582aacaa9 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "structlog";
- version = "18.2.0";
+ version = "19.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4";
+ sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5";
};
checkInputs = [ pytest pretend freezegun simplejson twisted ]
From af5f56c48a941747de319e07592a56ef7b119045 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 329/494] python: tabulate: 0.8.2 -> 0.8.3
---
pkgs/development/python-modules/tabulate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
index b238d58f68d..7321848afd0 100644
--- a/pkgs/development/python-modules/tabulate/default.nix
+++ b/pkgs/development/python-modules/tabulate/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "0.8.2";
+ version = "0.8.3";
pname = "tabulate";
src = fetchPypi {
inherit pname version;
- sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2";
+ sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943";
};
checkInputs = [ nose ];
From 1f49efb20f80de1749c034f6bd890d4b6cc3f172 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 330/494] python: telethon-session-sqlalchemy: 0.2.5 -> 0.2.7
---
.../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index da2fd2cd22d..be716c24270 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "telethon-session-sqlalchemy";
- version = "0.2.5";
+ version = "0.2.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85";
+ sha256 = "fb83803c3ae17edc04030b375d1fc9ff1713796054f4ec8b7c0f1d0b6b21a8ed";
};
propagatedBuildInputs = [
From 71007a1870774144ed6c77c545abf42f7eac3665 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 331/494] python: thespian: 3.9.5 -> 3.9.7
---
pkgs/development/python-modules/thespian/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index d0d032b6217..af3d24899c7 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
- version = "3.9.5";
+ version = "3.9.7";
pname = "thespian";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2";
+ sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577";
};
# Do not run the test suite: it takes a long time and uses
From f96cc4348593867baf86e7118bb1cb0b67da43bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 332/494] python: tifffile: 0.15.1 -> 2019.2.10
---
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 0e888d4ac27..f6af09c156c 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -6,11 +6,11 @@ buildPythonPackage rec {
# 2018.10.18 and 2018.11.6 are not releases...?
# https://github.com/blink1073/tifffile/issues/54
# anaconda uses 0.15.1
- version = "0.15.1";
+ version = "2019.2.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
+ sha256 = "ead5f84c0b100f8100377b8ef2bcffaf21c249784ddc240346b715408b45f42c";
};
checkInputs = [ nose ];
From 122bc4f1b4ee3ab2970ae53cb2846ba552116b0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 333/494] python: tox: 3.5.3 -> 3.7.0
---
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 3e67e73ac56..772128c6860 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tox";
- version = "3.5.3";
+ version = "3.7.0";
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862";
+ sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc";
};
meta = with lib; {
From 8f0e605c97a88ce8034bba287338e5576d02d021 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 334/494] python: tqdm: 4.28.1 -> 4.31.1
---
pkgs/development/python-modules/tqdm/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index a38dd3ed88e..f224ec21b0e 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "tqdm";
- version = "4.28.1";
+ version = "4.31.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb";
+ sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05";
};
buildInputs = [ nose coverage glibcLocales flake8 ];
@@ -27,7 +27,9 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
- doCheck = !stdenv.isDarwin;
+# doCheck = !stdenv.isDarwin;
+ # Test suite is too big and slow.
+ doCheck = false;
meta = {
description = "A Fast, Extensible Progress Meter";
From 4e894ebf0516421fc11fda3ee1c47e642ee75b2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 335/494] python: traits: 4.6.0 -> 5.0.0
---
pkgs/development/python-modules/traits/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index 380827e6488..c6f3a127ed5 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "traits";
- version = "4.6.0";
+ version = "5.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx";
+ sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0";
};
# Use pytest because its easier to discover tests
From 04af0f50046c0defa33d04ebadf44017ca474143 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 336/494] python: trezor_agent: 0.9.3 -> 0.10.0
---
pkgs/development/python-modules/trezor_agent/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix
index 6d0835b431c..e0c5329d23f 100644
--- a/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/pkgs/development/python-modules/trezor_agent/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec{
pname = "trezor_agent";
- version = "0.9.3";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580";
+ sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690";
};
propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ];
From 693f27f1fb66f5f16a1e1f4063178ccd1ab68ea1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 337/494] python: trio: 0.10.0 -> 0.11.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 3e6109133ba..f76939603d3 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "trio";
- version = "0.10.0";
+ version = "0.11.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk";
+ sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3";
};
checkInputs = [ pytest pyopenssl trustme jedi pylint ];
From 5aa33eb8173f550fca5f24fe30d8ba7d4f91d1fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 338/494] python: trustme: 0.4.0 -> 0.5.0
---
pkgs/development/python-modules/trustme/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
index db966ed4421..d870b622b8a 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "trustme";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk";
+ sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564";
};
checkInputs = [ pytest pyopenssl service-identity ];
From 61df2c19be5f39dcb90c7df0a11f5effd09b42f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:31 +0100
Subject: [PATCH 339/494] python: twine: 1.12.1 -> 1.13.0
---
pkgs/development/python-modules/twine/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 4c031c20aa1..a49e994019e 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "twine";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c";
+ sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc";
};
propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];
From be9cf3efc4115893472442b45ac27800f3dfae4c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 340/494] python: twitter.common.collections: 0.3.9 -> 0.3.10
---
.../python-modules/twitter-common-collections/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix
index b2d6054aa25..ed177fc63f8 100644
--- a/pkgs/development/python-modules/twitter-common-collections/default.nix
+++ b/pkgs/development/python-modules/twitter-common-collections/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "twitter.common.collections";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5";
+ sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21";
};
propagatedBuildInputs = [ twitter-common-lang ];
From a5e09079d582f3ec60810cd0f32f93d9ac483f99 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 341/494] python: twitter.common.confluence: 0.3.9 -> 0.3.10
---
.../python-modules/twitter-common-confluence/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix
index 53605baa3d5..393bc0ac4e8 100644
--- a/pkgs/development/python-modules/twitter-common-confluence/default.nix
+++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "twitter.common.confluence";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26";
+ sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1";
};
propagatedBuildInputs = [ twitter-common-log ];
From ef7a453503f0a5acad78b97566a1ce694d0e19c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 342/494] python: twitter.common.dirutil: 0.3.9 -> 0.3.10
---
.../python-modules/twitter-common-dirutil/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix
index 0172232a750..5d8a3e76fca 100644
--- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix
+++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "twitter.common.dirutil";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha";
+ sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf";
};
propagatedBuildInputs = [ twitter-common-lang ];
From bef8cb80e4fe19f1b036b501f616891d75254406 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 343/494] python: twitter.common.lang: 0.3.9 -> 0.3.10
---
.../python-modules/twitter-common-lang/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix
index 3541dacce4e..53135a94d62 100644
--- a/pkgs/development/python-modules/twitter-common-lang/default.nix
+++ b/pkgs/development/python-modules/twitter-common-lang/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "twitter.common.lang";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan";
+ sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8";
};
meta = with stdenv.lib; {
From 7d0aacb36ef23576951b3918b8f307a312285413 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 344/494] python: twitter.common.log: 0.3.9 -> 0.3.10
---
.../development/python-modules/twitter-common-log/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix
index e3e1f2859da..0fa7b63f525 100644
--- a/pkgs/development/python-modules/twitter-common-log/default.nix
+++ b/pkgs/development/python-modules/twitter-common-log/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "twitter.common.log";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v";
+ sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555";
};
propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ];
From 1b541e67990fab6c51607566f16cbeac90f6a978 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 345/494] python: twitter.common.options: 0.3.9 -> 0.3.10
---
.../python-modules/twitter-common-options/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix
index 36b18403fab..62705f3b6b1 100644
--- a/pkgs/development/python-modules/twitter-common-options/default.nix
+++ b/pkgs/development/python-modules/twitter-common-options/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "twitter.common.options";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd";
+ sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8";
};
meta = with stdenv.lib; {
From 2b4ecac864365f7fc03ed14b68186717a6ed272e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 346/494] python: txtorcon: 18.3.0 -> 19.0.0
---
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 a17ecc0e592..4b2407a66a5 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.3.0";
+ version = "19.0.0";
checkInputs = [ pytest mock lsof GeoIP ];
propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an";
+ sha256 = "3731b740653e3f551412744f1fcd7fa6f04aa9fa37c90dc6c9152e619886bf3b";
};
# Skip a failing test until fixed upstream:
From 563a1c536323c4abdc0e949c85940c8fb4a0f3ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 347/494] python: typed-ast: 1.1.2 -> 1.3.1
---
pkgs/development/python-modules/typed-ast/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index f3f260cc1e8..ea4c9a63a19 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,10 +1,10 @@
{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
buildPythonPackage rec {
pname = "typed-ast";
- version = "1.1.2";
+ version = "1.3.1";
src = fetchPypi{
inherit pname version;
- sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e";
+ sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424";
};
# Only works with Python 3.3 and newer;
disabled = pythonOlder "3.3";
From 97169aabb543d1d09f67cc1efe4a362cc51a643b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 348/494] python: uproot-methods: 0.2.11 -> 0.4.2
---
pkgs/development/python-modules/uproot-methods/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix
index 69442bafd09..cec7ca16335 100644
--- a/pkgs/development/python-modules/uproot-methods/default.nix
+++ b/pkgs/development/python-modules/uproot-methods/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
- version = "0.2.11";
+ version = "0.4.2";
pname = "uproot-methods";
src = fetchPypi {
inherit pname version;
- sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66";
+ sha256 = "dcb72692067cfc4c5ccfa859fe737b2cd47661692a0cc0b42c75d13dbb1eb040";
};
propagatedBuildInputs = [ numpy awkward ];
From 5a2da811e52b25a61c40ccb2807f8b2e53f36ce5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 349/494] python: uproot: 3.2.15 -> 3.4.5
---
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 097313b42f7..d93938bd4dc 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "uproot";
- version = "3.2.15";
+ version = "3.4.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030";
+ sha256 = "46a99b590c062ad01f2721af04e6262986f0b53e51dfedf68bf4049bb015c12f";
};
buildInputs = [ pytestrunner ];
From aca72e79539ab54a3b23cf8ac959a2cceeaa41ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 350/494] python: vega_datasets: 0.5.0 -> 0.7.0
---
pkgs/development/python-modules/vega_datasets/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix
index a7b6c6865cc..af1489df035 100644
--- a/pkgs/development/python-modules/vega_datasets/default.nix
+++ b/pkgs/development/python-modules/vega_datasets/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "vega_datasets";
- version = "0.5.0";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181";
+ sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459";
};
propagatedBuildInputs = [ pandas ];
From ff48fd0bf61846ffaf2fb107b51e713623c3aa90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 351/494] python: venusian: 1.1.0 -> 1.2.0
---
pkgs/development/python-modules/venusian/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index 14d678be892..cb2b2af713d 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "venusian";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d";
+ sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e";
};
checkInputs = [ pytest ];
From a7413f0b7ca7258cba9b9a749ef7e5fab67c5326 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:32 +0100
Subject: [PATCH 352/494] python: vidstab: 1.0.1 -> 1.5.6
---
pkgs/development/python-modules/vidstab/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix
index e01353b6238..7003b9e1b04 100644
--- a/pkgs/development/python-modules/vidstab/default.nix
+++ b/pkgs/development/python-modules/vidstab/default.nix
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
- version = "1.0.1";
+ version = "1.5.6";
pname = "vidstab";
src = fetchPypi {
inherit pname version;
- sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e";
+ sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593";
};
checkInputs = [ pytest ];
From 663ac63a510d5c18bd3d9e72b000b54f1776f4b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 353/494] python: virtualenv-clone: 0.2.6 -> 0.5.1
---
pkgs/development/python-modules/virtualenv-clone/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index a1b4cb82379..9e917e35ab0 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "virtualenv-clone";
- version = "0.2.6";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405";
+ sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf";
};
buildInputs = [ pytest ];
From 1def91f076b6d8617fb5cc754b1cebfe41cd3183 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 354/494] python: virtualenv: 16.1.0 -> 16.4.0
---
pkgs/development/python-modules/virtualenv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 5a39407ed2f..d2da287d4d1 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "virtualenv";
- version = "16.1.0";
+ version = "16.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208";
+ sha256 = "cceab52aa7d4df1e1871a70236eb2b89fcfe29b6b43510d9738689787c513261";
};
# Doubt this is needed - FRidh 2017-07-07
From a7431809cf3bb64ca1da2945b8c3221601a6d86b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 355/494] python: virtualenvwrapper: 4.8.2 -> 4.8.4
---
pkgs/development/python-modules/virtualenvwrapper/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 64c1912af7a..19ec56a1ece 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "virtualenvwrapper";
- version = "4.8.2";
+ version = "4.8.4";
src = fetchPypi {
inherit pname version;
- sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374";
+ sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa";
};
# pip depend on $HOME setting
From a69a3e8961d7a9b807336980f50b016f3def7bb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 356/494] python: voluptuous-serialize: 2.0.0 -> 2.1.0
---
.../python-modules/voluptuous-serialize/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix
index 05d372ec47d..29515f75c9e 100644
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "voluptuous-serialize";
- version = "2.0.0";
+ version = "2.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41";
+ sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f";
};
propagatedBuildInputs = [
From 00a9e6caa01e5742b4a8ba6e878a59067b8e53f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 357/494] python: waitress: 1.1.0 -> 1.2.1
---
pkgs/development/python-modules/waitress/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix
index a377abc160e..a988fa259a5 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/pkgs/development/python-modules/waitress/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "waitress";
- version = "1.1.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9";
+ sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe";
};
doCheck = false;
From 10baae23ce64d38bbff664e6a3c68a5e674a041c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 358/494] python: wheel: 0.32.3 -> 0.33.0
---
pkgs/development/python-modules/wheel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 6135409328b..30856fc82a0 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "wheel";
- version = "0.32.3";
+ version = "0.33.0";
src = fetchPypi {
inherit pname version;
- sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6";
+ sha256 = "12363e6df5678ecf9daf8429f06f97e7106e701405898f24318ce7f0b79c611a";
};
checkInputs = [ pytest pytestcov coverage ];
From 79dc679873628b5b63c90cc1eee15e4fa44e9004 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 359/494] python: wrapt: 1.10.11 -> 1.11.1
---
pkgs/development/python-modules/wrapt/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index badecc776d7..9247a7c7757 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "wrapt";
- version = "1.10.11";
+ version = "1.11.1";
# No tests in archive
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6";
+ sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533";
};
meta = {
From 7382057ec4fbd3e3abe3f422104000b376e7cfae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 360/494] python: wsproto: 0.12.0 -> 0.13.0
---
pkgs/development/python-modules/wsproto/default.nix | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index 8773ef30b3d..f9062c18584 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -1,14 +1,20 @@
-{ buildPythonPackage, fetchPypi, h11, enum34 }:
+{ buildPythonPackage, fetchPypi, h11, enum34, pytest }:
buildPythonPackage rec {
pname = "wsproto";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009";
+ sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705";
};
propagatedBuildInputs = [ h11 enum34 ];
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
}
From 2b5cda69eb74d5fb72929a414a41d5c64861c3a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 361/494] python: xkcdpass: 1.16.5 -> 1.17.2
---
pkgs/development/python-modules/xkcdpass/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix
index 21390d9c3f8..674a56d3cb4 100644
--- a/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/pkgs/development/python-modules/xkcdpass/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "xkcdpass";
- version = "1.16.5";
+ version = "1.17.2";
src = fetchPypi {
inherit pname version;
- sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4";
+ sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b";
};
# No tests included
From 4c051ae7f54a4dfb56b867e0ad582b771958f426 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 362/494] python: xlrd: 1.1.0 -> 1.2.0
---
pkgs/development/python-modules/xlrd/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix
index 6307f630fcd..e37b2694576 100644
--- a/pkgs/development/python-modules/xlrd/default.nix
+++ b/pkgs/development/python-modules/xlrd/default.nix
@@ -1,22 +1,22 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, nose
+, pytest
}:
buildPythonPackage rec {
pname = "xlrd";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2";
+ sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2";
};
- checkInputs = [ nose ];
+ checkInputs = [ pytest ];
checkPhase = ''
- nosetests -v
+ py.test -k "not test_tilde_path_expansion"
'';
meta = with stdenv.lib; {
From b1602dc61895ad119e8e1cb727dc4c4ddbd51f2c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 363/494] python: xml2rfc: 2.12.3 -> 2.18.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 91933c5f95e..e86b1b20609 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "xml2rfc";
- version = "2.12.3";
+ version = "2.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c";
+ sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451";
};
propagatedBuildInputs = [
From 922f5ff77afe0e17eda8f84f9efd0c4f54ea61f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 364/494] python: xmltodict: 0.11.0 -> 0.12.0
---
pkgs/development/python-modules/xmltodict/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix
index be1651caf8a..07250337f83 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/pkgs/development/python-modules/xmltodict/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "xmltodict";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df";
+ sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21";
};
checkInputs = [ coverage nose ];
From e5044140b94e2afb765f520ad28d0d7a2ee5109c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 365/494] python: yamllint: 1.14.0 -> 1.15.0
---
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 bfd302d27df..53ad728cc29 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.14.0";
+ version = "1.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0";
+ sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7";
};
checkInputs = [ nose ];
From 57ff9a88817c3382b4fb11774992a51df26a3ba5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:33 +0100
Subject: [PATCH 366/494] python: yapf: 0.25.0 -> 0.26.0
---
pkgs/development/python-modules/yapf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 292709a455b..69ce7a360b0 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "yapf";
- version = "0.25.0";
+ version = "0.26.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa";
+ sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b";
};
meta = with stdenv.lib; {
From 40144556179af232d0b56ab7be208f8d105a8e42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:34 +0100
Subject: [PATCH 367/494] python: yattag: 1.10.1 -> 1.11.1
---
pkgs/development/python-modules/yattag/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix
index cd31f7c2d55..5c02ea83ec9 100644
--- a/pkgs/development/python-modules/yattag/default.nix
+++ b/pkgs/development/python-modules/yattag/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "yattag";
- version = "1.10.1";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0r3pwfygvpkgc0hzxc6z8dl56g6brlh52r0x8kcjhywr1biahqb2";
+ sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7";
};
meta = with lib; {
From 0c63fd12d046643b977b914ca4dbc0cd2bd001cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:34 +0100
Subject: [PATCH 368/494] python: ZConfig: 3.3.0 -> 3.4.0
---
pkgs/development/python-modules/zconfig/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 3b6237638dc..24cb00c2b18 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "ZConfig";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585";
+ sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998";
};
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
From 3c6abcd1d64bf42d51261ddbae17aa55d03c4ece Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:34 +0100
Subject: [PATCH 369/494] python: zm-py: 0.3.0 -> 0.3.3
---
pkgs/development/python-modules/zm-py/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix
index d7f212f2284..72c32ef8277 100644
--- a/pkgs/development/python-modules/zm-py/default.nix
+++ b/pkgs/development/python-modules/zm-py/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zm-py";
- version = "0.3.0";
+ version = "0.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q";
+ sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a";
};
disabled = !isPy3k;
From d75cd1fcfcb149ef3c6d519172efe0c5ddc07db1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:34 +0100
Subject: [PATCH 370/494] python: zope.configuration: 4.3.0 -> 4.3.1
---
.../development/python-modules/zope_configuration/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix
index 42d3842c451..28f46168997 100644
--- a/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/pkgs/development/python-modules/zope_configuration/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "zope.configuration";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3";
+ sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1";
};
checkInputs = [ zope_testrunner manuel ];
From 1304c0cd63add353d832a3934c522967738caaec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:37:34 +0100
Subject: [PATCH 371/494] python: zope.deprecation: 4.3.0 -> 4.4.0
---
pkgs/development/python-modules/zope_deprecation/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix
index da0d442b9c6..f6c5f51b626 100644
--- a/pkgs/development/python-modules/zope_deprecation/default.nix
+++ b/pkgs/development/python-modules/zope_deprecation/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "zope.deprecation";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224";
+ sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df";
};
buildInputs = [ zope_testing ];
From e4524dc51c0ddd4e962b92d621749a1e3e9eefeb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:43:07 +0100
Subject: [PATCH 372/494] python.pkgs.bootstrapped-pip: wheel 0.32.2 -> 0.33.0,
setuptools 40.6.3 -> 40.8.0, pip 18.1 -> 19.0.2
---
.../python-modules/bootstrapped-pip/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 85b752409ea..dadd28c7bbd 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -3,26 +3,26 @@
let
wheel_source = fetchPypi {
pname = "wheel";
- version = "0.32.2";
+ version = "0.33.0";
format = "wheel";
- sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9";
+ sha256 = "b79ffea026bc0dbd940868347ae9eee36789b6496b6623bd2dec7c7c540a8f99";
};
setuptools_source = fetchPypi {
pname = "setuptools";
- version = "40.6.3";
+ version = "40.8.0";
format = "wheel";
- sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b";
+ sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab";
};
in stdenv.mkDerivation rec {
pname = "pip";
- version = "18.1";
+ version = "19.0.2";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
src = fetchPypi {
inherit pname version;
format = "wheel";
- sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550";
+ sha256 = "6a59f1083a63851aeef60c7d68b119b46af11d9d803ddc1cf927b58edcd0b312";
};
unpackPhase = ''
From ee38a0d183c09f5278e5b80085719b5fe08c760f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 08:44:48 +0100
Subject: [PATCH 373/494] python: pytest: 3.9.3 -> 4.2.1
---
pkgs/development/python-modules/pytest/default.nix | 6 +++---
pkgs/top-level/python-packages.nix | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 9412a750a9a..45572938496 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -3,7 +3,7 @@
, atomicwrites, mock, writeText, pathlib2
}:
buildPythonPackage rec {
- version = "3.9.3";
+ version = "4.2.1";
pname = "pytest";
preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db";
+ sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c";
};
checkInputs = [ hypothesis mock ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
- $out/bin/py.test -x testing/
+ $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
runHook postCheck
'';
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93355ba46e4..e00567e8020 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -299,7 +299,7 @@ in {
cdecimal = callPackage ../development/python-modules/cdecimal { };
cfn-flip = callPackage ../development/python-modules/cfn-flip { };
-
+
chalice = callPackage ../development/python-modules/chalice { };
cleo = callPackage ../development/python-modules/cleo { };
@@ -1493,9 +1493,9 @@ in {
pyhepmc = callPackage ../development/python-modules/pyhepmc { };
- pytest = self.pytest_39;
+ pytest = self.pytest_42;
- pytest_39 = callPackage ../development/python-modules/pytest {
+ pytest_42 = callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};
From 26626ac9f0287399e4858514de54ece7f1a02cd5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 09:19:57 +0100
Subject: [PATCH 374/494] python.pkgs.freezegun: use correct inputs
---
pkgs/development/python-modules/freezegun/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index 926ad05156a..80a6f439de8 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ dateutil six ];
- buildInputs = [ mock nose ];
+ checkInputs = [ mock nose ];
meta = with stdenv.lib; {
description = "FreezeGun: Let your Python tests travel through time";
From 172b1045edb0ad312ce8abc184f53cf6823d8737 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 09:32:50 +0100
Subject: [PATCH 375/494] python: pycodestyle: 2.4.0 -> 2.5.0
---
.../python-modules/pycodestyle/default.nix | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index 43a8e6f9f45..5eb2ec1055a 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -2,21 +2,13 @@
buildPythonPackage rec {
pname = "pycodestyle";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a";
+ sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c";
};
- patches = [
- # https://github.com/PyCQA/pycodestyle/pull/801
- (fetchpatch {
- url = https://github.com/PyCQA/pycodestyle/commit/397463014fda3cdefe8d6c9d117ae16d878dc494.patch;
- sha256 = "01zask2y2gim5il9lcmlhr2qaadv9v7kaw1y619l8xbjhpbq2zh8";
- })
- ];
-
meta = with lib; {
description = "Python style guide checker (formerly called pep8)";
homepage = https://pycodestyle.readthedocs.io;
From f896d3b3ff5b2a9af17f8e162256f0f5114d2190 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 09:42:05 +0100
Subject: [PATCH 376/494] python.pkgs.flake8: 3.5.0 -> 3.7.5
---
.../python-modules/flake8/default.nix | 48 +++++--------------
1 file changed, 11 insertions(+), 37 deletions(-)
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 9d9d211dbfa..4b72c2d8270 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -1,52 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch
, mock, pytest, pytestrunner
-, configparser, enum34, mccabe, pycodestyle, pyflakes
+, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing
}:
buildPythonPackage rec {
pname = "flake8";
- version = "3.5.0";
+ version = "3.7.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0";
+ sha256 = "fd9ddf503110bf3d8b1d270e8c673aab29ccb3dd6abf29bae1f54e5116ab4a91";
};
- # 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 ]
+ checkInputs = [ pytest mock pytestrunner ];
+ propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ]
+ ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
- ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ];
+ ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+
+ checkPhase = ''
+ py.test tests
+ '';
meta = with stdenv.lib; {
description = "Code checking using pep8 and pyflakes";
From 72a680e12236e4660a3eed755bbbc968ae91ab3d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 09:59:59 +0100
Subject: [PATCH 377/494] python.pkgs.html5lib: disable certain tests
due to pytest change
---
pkgs/development/python-modules/html5lib/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix
index 97d2854ca22..5a59b63cea4 100644
--- a/pkgs/development/python-modules/html5lib/default.nix
+++ b/pkgs/development/python-modules/html5lib/default.nix
@@ -24,6 +24,9 @@ buildPythonPackage rec {
];
checkPhase = ''
+ # remove test causing error
+ # https://github.com/html5lib/html5lib-python/issues/411
+ rm html5lib/tests/test_stream.py
py.test
'';
From b4acd9772975d549f491d48debb679cf4ec78133 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 5 Jan 2019 10:26:57 +0100
Subject: [PATCH 378/494] buildPython*: enable strictDeps
---
doc/languages-frameworks/python.section.md | 19 +++++++++++++++++--
nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++
.../python/mk-python-derivation.nix | 3 +++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index acd2bf769b0..4cb275f5f3e 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -602,10 +602,9 @@ as the interpreter unless overridden otherwise.
All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
-* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
-* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
+* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
@@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
+The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
+interest for Python packages, either because these are primarily used, or because their behaviour is different:
+
+* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
+* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
+* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
+* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
+
##### Overriding Python packages
The `buildPythonPackage` function has a `overridePythonAttrs` method that
@@ -1123,6 +1130,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with
Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
moreover, Hydra is not building and distributing pre-compiled binaries using it.
+### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
+
+In a `setup.py` or `setup.cfg` it is common to declare dependencies:
+
+* `setup_requires` corresponds to `nativeBuildInputs`
+* `install_requires` corresponds to `propagatedBuildInputs`
+* `tests_require` corresponds to `checkInputs`
+
## Contributing
### Contributing guidelines
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 270acda9b04..2277edede8e 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -144,6 +144,14 @@
</listitem>
</itemizedlist>
</listitem>
+ <listitem>
+ <para>
+ The <varname>buildPythonPackage</varname> now sets <varname>strictDeps = true</varname>
+ to help distinguish between native and non-native dependencies in order to
+ improve cross-compilation compatibility. Note however that this may break
+ user expressions.
+ </para>
+ </listitem>
<listitem>
<para>
The Syncthing state and configuration data has been moved from
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 4951ae4499f..4142cb922f7 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -87,6 +87,9 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
# Propagate python and setuptools. We should stop propagating setuptools.
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
+ # Enabled to detect some (native)BuildInputs mistakes
+ strictDeps = true;
+
# Python packages don't have a checkPhase, only an installCheckPhase
doCheck = false;
doInstallCheck = doCheck;
From b3febfb8505e4d1c990c85b41b288b4cc0feba55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 11:07:19 +0100
Subject: [PATCH 379/494] python.pkgs.pytest_3: keep older version
because not all test suites are compatible with 4 yet.
---
.../python-modules/apipkg/default.nix | 6 +--
.../python-modules/chardet/default.nix | 4 +-
.../python-modules/execnet/default.nix | 7 ++-
.../python-modules/pytest/3.10.nix | 47 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 6 +++
5 files changed, 63 insertions(+), 7 deletions(-)
create mode 100644 pkgs/development/python-modules/pytest/3.10.nix
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 8e6fc668204..bd535a972d1 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, setuptools_scm }:
+, pytest_3, setuptools_scm }:
buildPythonPackage rec {
pname = "apipkg";
@@ -10,8 +10,8 @@ buildPythonPackage rec {
sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
};
- buildInputs = [ setuptools_scm ];
- checkInputs = [ pytest ];
+ nativeBuildInputs = [ setuptools_scm ];
+ checkInputs = [ pytest_3 ];
checkPhase = ''
py.test
diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
index 1f452fb461a..3509a646993 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/pkgs/development/python-modules/chardet/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestrunner, hypothesis }:
+, pytest_3, pytestrunner, hypothesis }:
buildPythonPackage rec {
pname = "chardet";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
};
- checkInputs = [ pytest pytestrunner hypothesis ];
+ checkInputs = [ pytest_3 pytestrunner hypothesis ];
meta = with stdenv.lib; {
homepage = https://github.com/chardet/chardet;
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 6f97a2cb6bf..df78bff6f1d 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, pytest
+, pytest_3
, setuptools_scm
, apipkg
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
};
- checkInputs = [ pytest ];
+ checkInputs = [ pytest_3 ];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ apipkg ];
@@ -31,6 +31,9 @@ buildPythonPackage rec {
py.test testing
'';
+ # not yet compatible with pytest 4
+ doCheck = false;
+
__darwinAllowLocalNetworking = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix
new file mode 100644
index 00000000000..f24cab8af1c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/3.10.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
+, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
+, atomicwrites, mock, writeText, pathlib2
+}:
+buildPythonPackage rec {
+ version = "3.10.1";
+ pname = "pytest";
+
+ preCheck = ''
+ # don't test bash builtins
+ rm testing/test_argcomplete.py
+ '';
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660";
+ };
+
+ checkInputs = [ hypothesis mock ];
+ buildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
+ ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
+ ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+
+ checkPhase = ''
+ runHook preCheck
+ $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable"
+ runHook postCheck
+ '';
+
+ # Remove .pytest_cache when using py.test in a Nix build
+ setupHook = writeText "pytest-hook" ''
+ pytestcachePhase() {
+ find $out -name .pytest_cache -type d -exec rm -rf {} +
+ }
+
+ preDistPhases+=" pytestcachePhase"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://docs.pytest.org;
+ description = "Framework for writing tests";
+ maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e00567e8020..30eba87155e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1500,6 +1500,12 @@ in {
hypothesis = self.hypothesis.override { doCheck = false; };
};
+ # Keep 3 because many test suites are not yet compatible with Pytest 4.
+ pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override { doCheck = false; };
+ };
+
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { };
From 54941b106e0cf97d6be7c38a2964e60eb60df771 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 11:07:35 +0100
Subject: [PATCH 380/494] python.pkgs.soupsieve: init at 1.7.3
---
.../python-modules/soupsieve/default.nix | 36 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 38 insertions(+)
create mode 100644 pkgs/development/python-modules/soupsieve/default.nix
diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix
new file mode 100644
index 00000000000..9f877ffb355
--- /dev/null
+++ b/pkgs/development/python-modules/soupsieve/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, beautifulsoup4
+, isPy3k
+, backports_functools_lru_cache
+}:
+
+buildPythonPackage rec {
+ pname = "soupsieve";
+ version = "1.7.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445";
+ };
+
+ checkPhase = ''
+ py.test
+ '';
+
+ checkInputs = [ pytest beautifulsoup4 ];
+
+ propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache;
+
+ # Circular test dependency on beautifulsoup4
+ doCheck = false;
+
+ meta = {
+ description = "A CSS4 selector implementation for Beautiful Soup";
+ license = lib.licenses.mit;
+ homepage = https://github.com/facelessuser/soupsieve;
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30eba87155e..1b5fccaece8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4453,6 +4453,8 @@ in {
sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };
+ soupsieve = callPackage ../development/python-modules/soupsieve { };
+
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
From 64bc5fcf28bed1ebea801062495281582d0acb9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 11:10:24 +0100
Subject: [PATCH 381/494] python.pkgs.pytest-cov: remove unused deps
---
pkgs/development/python-modules/pytest-cov/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index 1bb5d001ddb..9ddec4199d7 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytest_xdist, virtualenv, process-tests, coverage }:
+, pytest, coverage }:
buildPythonPackage rec {
pname = "pytest-cov";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33";
};
- buildInputs = [ pytest pytest_xdist virtualenv process-tests ];
+ buildInputs = [ pytest ];
propagatedBuildInputs = [ coverage ];
# xdist related tests fail with the following error
From 8875a3e706c98c49c60e5c6b06c81be19ba4db36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 11:28:12 +0100
Subject: [PATCH 382/494] python.pkgs.ipykernel: disable failing tests
---
pkgs/development/python-modules/ipykernel/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index b4daf5a6ecb..043f58cfa5d 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -32,8 +32,9 @@ buildPythonPackage rec {
})
];
+ # For failing tests, see https://github.com/ipython/ipykernel/issues/387
checkPhase = ''
- HOME=$(mktemp -d) pytest ipykernel
+ HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)"
'';
meta = {
From a9c41f8f5dfcb04fb78816e9214ce3e3b082ae14 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 11:51:52 +0100
Subject: [PATCH 383/494] python.pkgs.characteristic: fix pytest 4
incompatibility
---
pkgs/development/python-modules/characteristic/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix
index 1c42b1283ee..f082510713a 100644
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -13,6 +13,10 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
+ postPatch = ''
+ substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
+ '';
+
meta = {
description = "Python attributes without boilerplate";
homepage = https://characteristic.readthedocs.org;
From 097781309597878ade5eac37021bebc0a53e6fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 11:05:51 +0100
Subject: [PATCH 384/494] python.pkgs.pyflakes: run tests
---
pkgs/development/python-modules/pyflakes/default.nix | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index 66892d1f861..354535d47ac 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -9,10 +9,7 @@ buildPythonPackage rec {
sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d";
};
- buildInputs = [ unittest2 ];
-
- # https://github.com/PyCQA/pyflakes/issues/386
- doCheck = false;
+ checkInputs = [ unittest2 ];
meta = with stdenv.lib; {
homepage = https://launchpad.net/pyflakes;
From e751df152bfe39ef8389bc5cd7d30d72e8a24d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 11:09:45 +0100
Subject: [PATCH 385/494] python.pkgs.pycodestyle: remove unused argument
---
pkgs/development/python-modules/pycodestyle/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index 5eb2ec1055a..4671a8e7846 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch }:
+{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pycodestyle";
From b8a299c9102d28f7bb6890a80e383993ff7db3c5 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 7 Jan 2019 20:09:20 +0100
Subject: [PATCH 386/494] python.pkgs.entrypoints: simplify tests
The upstream issue requiring one test to be disabled was fixed:
https://github.com/takluyver/entrypoints/issues/23
---
.../python-modules/entrypoints/default.nix | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index 466014715ba..77d20876fe1 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -4,7 +4,6 @@
, configparser
, pytest
, isPy3k
-, isPy27
}:
buildPythonPackage rec {
@@ -20,15 +19,8 @@ buildPythonPackage rec {
propagatedBuildInputs = lib.optional (!isPy3k) configparser;
- checkPhase = let
- # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad
- # test fails. It tests that a warning (exectly one) is thrown on a "bad"
- # path. The pytest upgrade added some warning, resulting in two warnings
- # being thrown.
- # upstream: https://github.com/takluyver/entrypoints/issues/23
- pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
- in ''
- py.test ${pyTestArgs} tests
+ checkPhase = ''
+ py.test tests
'';
meta = {
From 1c0844f3f231cb18c358d97695f195a1beb151f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 12:53:34 +0100
Subject: [PATCH 387/494] python.pkgs.whoosh: use pytest_3
With pytest_42, we get
`[pytest] section in setup.cfg files is no longer supported`.
---
pkgs/development/python-modules/whoosh/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix
index 41d8530293d..246b3c65fc5 100644
--- a/pkgs/development/python-modules/whoosh/default.nix
+++ b/pkgs/development/python-modules/whoosh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }:
buildPythonPackage rec {
pname = "Whoosh";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
};
- checkInputs = [ pytest ];
+ checkInputs = [ pytest_3 ];
# Wrong encoding
postPatch = ''
From 9f275067b39c8f0db36a4a508c2a0659331793bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 13:22:37 +0100
Subject: [PATCH 388/494] borgbackup: use msgpack-python-0.5.6
---
pkgs/tools/backup/borg/default.nix | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index d30eaf12f91..42e88f8d07a 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
+{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }:
-python3Packages.buildPythonApplication rec {
+let
+ python = python3.override {
+ packageOverrides = self: super: {
+ # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810
+ msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec {
+ version = "0.5.6";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
+ };
+ });
+ };
+ };
+
+in python.pkgs.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.9";
- src = python3Packages.fetchPypi {
+ src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575";
};
- nativeBuildInputs = with python3Packages; [
+ nativeBuildInputs = with python.pkgs; [
# For building documentation:
sphinx guzzle_sphinx_theme
];
buildInputs = [
- libb2 lz4 zstd openssl python3Packages.setuptools_scm
+ libb2 lz4 zstd openssl python.pkgs.setuptools_scm
] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = with python.pkgs; [
cython msgpack-python
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
@@ -50,7 +64,7 @@ python3Packages.buildPythonApplication rec {
cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
'';
- checkInputs = with python3Packages; [
+ checkInputs = with python.pkgs; [
pytest
];
From d00bfba2d570ea9afb787dc44ffbcd33ee5925d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 13:34:42 +0100
Subject: [PATCH 389/494] python.pkgs.parameterized: update dependencies
---
pkgs/development/python-modules/parameterized/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 62b1bcbc42e..8d13fcfb4d5 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }:
buildPythonPackage rec {
pname = "parameterized";
@@ -12,8 +12,7 @@ buildPythonPackage rec {
# Tests require some python3-isms but code works without.
doCheck = isPy3k;
- checkInputs = [ nose glibcLocales ];
- propagatedBuildInputs = [ six ];
+ checkInputs = [ nose mock glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -v
From 904227c6463a984dd88637e745065259ef1fb41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 13:42:56 +0100
Subject: [PATCH 390/494] python.pkgs.pytest-timeout: fix tests
---
pkgs/development/python-modules/pytest-timeout/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index f000a1f937a..3997e716817 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -15,6 +15,11 @@ buildPythonPackage rec {
sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
};
+ patches = fetchpatch {
+ url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw;
+ sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
+ };
+
checkInputs = [ pytest pexpect ];
checkPhase = ''pytest -ra'';
From 4dcbcbb46efd4cecde1e90e266cf62bad105ce8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 14:00:20 +0100
Subject: [PATCH 391/494] python.pkgs.Mako: use pytest_3
With pytest_42, we get
`[pytest] section in setup.cfg files is no longer supported`.
---
pkgs/development/python-modules/Mako/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix
index f3f1eed265d..83075f33c42 100644
--- a/pkgs/development/python-modules/Mako/default.nix
+++ b/pkgs/development/python-modules/Mako/default.nix
@@ -4,7 +4,7 @@
, markupsafe
, nose
, mock
-, pytest
+, pytest_3
, isPyPy
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae";
};
- checkInputs = [ markupsafe nose mock pytest ];
+ checkInputs = [ markupsafe nose mock pytest_3 ];
propagatedBuildInputs = [ markupsafe ];
doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
@@ -29,4 +29,4 @@ buildPythonPackage rec {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ domenkozar ];
};
-}
\ No newline at end of file
+}
From 3c20d3c806e827b512742cead1734df724bae59f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 14:03:21 +0100
Subject: [PATCH 392/494] python.pkgs.txaio: use pytest_3
Otherwise, tests fail with
`Fixtures are not meant to be called directly, but are created
automatically when test functions request them as parameters.`
---
pkgs/development/python-modules/txaio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 5536c68e2be..dd3b899efa9 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }:
buildPythonPackage rec {
pname = "txaio";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe";
};
- checkInputs = [ pytest mock ];
+ checkInputs = [ pytest_3 mock ];
propagatedBuildInputs = [ six twisted ];
From a9c8616ce9f221197097945d3c9b2cea148878af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 14:08:13 +0100
Subject: [PATCH 393/494] python.pkgs.requests_toolbelt: disable tests that
access network
---
.../development/python-modules/requests-toolbelt/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index cebdcc2a033..b3068505a51 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -20,7 +20,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ requests ];
checkPhase = ''
- py.test tests
+ # disabled tests access the network
+ py.test tests -k "not test_no_content_length_header \
+ and not test_read_file \
+ and not test_reads_file_from_url_wrapper"
'';
meta = {
From 114ffa3dd244a7badc5a55f546f045c48f3b5192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 14:09:55 +0100
Subject: [PATCH 394/494] python.pkgs.requests_toolbelt: add meta.license
---
pkgs/development/python-modules/requests-toolbelt/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index b3068505a51..f45f5aaa7cc 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -30,5 +30,6 @@ buildPythonPackage rec {
description = "A toolbelt of useful classes and functions to be used with python-requests";
homepage = http://toolbelt.rtfd.org;
maintainers = with lib.maintainers; [ jgeerds ];
+ license = lib.licenses.asl20;
};
}
From e68aa6b28fc157cbe2e2a66157ef2f015ef05b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 14:29:48 +0100
Subject: [PATCH 395/494] home-assistant: fix pinned dependencies' builds
---
pkgs/servers/home-assistant/default.nix | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 27eff24d704..4dc9f9f8f01 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -28,10 +28,27 @@ let
"10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
(mkOverride "bcrypt" "3.1.5"
"136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f")
- (mkOverride "pyjwt" "1.6.4"
- "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176")
- (mkOverride "cryptography" "2.3.1"
- "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
+ (self: super: {
+ pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
+ version = "1.6.4";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176";
+ };
+ doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382
+ });
+ })
+ (self: super: {
+ cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec {
+ version = "2.3.1";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6";
+ };
+ propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ];
+ checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ];
+ });
+ })
(mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
"bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
(mkOverride "python-slugify" "1.2.6"
From 14e5af2aa7e60042ab46378705eed9291a2bbb77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 15:06:07 +0100
Subject: [PATCH 396/494] python.pkgs.pytest-localserver: fix tests
---
.../development/python-modules/pytest-localserver/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index 3c7ee449ced..5f2516b646c 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -17,10 +17,10 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ werkzeug ];
- buildInputs = [ pytest six requests ];
+ checkInputs = [ pytest six requests ];
checkPhase = ''
- py.test
+ pytest
'';
meta = {
From 869d64e2d1b6e10c57925912c3451f6e128c9cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 15:09:31 +0100
Subject: [PATCH 397/494] python.pkgs.hkdf: no tests in tarball
---
pkgs/development/python-modules/hkdf/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix
index 3a159e6d349..347cd94c8f5 100644
--- a/pkgs/development/python-modules/hkdf/default.nix
+++ b/pkgs/development/python-modules/hkdf/default.nix
@@ -13,12 +13,15 @@ buildPythonPackage rec {
sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2";
};
- buildInputs = [ nose ];
+ checkInputs = [ nose ];
checkPhase = ''
nosetests
'';
+ # no tests in PyPI tarball
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
homepage = "https://github.com/casebeer/python-hkdf";
From 9a36041027a0c29ff0fbc0d80d185eddb0d6eb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 15:13:35 +0100
Subject: [PATCH 398/494] python.pkgs.PasteDeploy: no tests in tarball
---
.../python-modules/pastedeploy/default.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix
index 34fb090179b..3301521b085 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/pkgs/development/python-modules/pastedeploy/default.nix
@@ -1,7 +1,8 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, nose
+, pytestrunner
+, pytest
}:
buildPythonPackage rec {
@@ -13,7 +14,13 @@ buildPythonPackage rec {
sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a";
};
- buildInputs = [ nose ];
+ buildInputs = [ pytestrunner ];
+
+ checkInputs = [ pytest ];
+
+ # no tests in PyPI tarball
+ # should be included with versions > 2.0.1
+ doCheck = false;
meta = with stdenv.lib; {
description = "Load, configure, and compose WSGI applications and servers";
From 45716f553dc42c31e2f3e2360772a17bc53d0d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 15:17:09 +0100
Subject: [PATCH 399/494] python.pkgs.aiodns: add typing to
propagatedBuildInputs
---
pkgs/development/python-modules/aiodns/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 154d98de1c6..f7ac236a520 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }:
+, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }:
buildPythonPackage rec {
pname = "aiodns";
@@ -10,8 +10,7 @@ buildPythonPackage rec {
sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
};
- propagatedBuildInputs = with stdenv.lib; [ pycares ]
- ++ optional isPy33 asyncio
+ propagatedBuildInputs = with stdenv.lib; [ pycares typing ]
++ optional (isPy27 || isPyPy) trollius;
checkPhase = ''
From 254099bf7d330ed772068a71fc21655e2a530829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 15:53:32 +0100
Subject: [PATCH 400/494] python.pkgs.virtualenv: rebase
virtualenv-change-prefix.patch
---
.../virtualenv/virtualenv-change-prefix.patch | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
index 2c121c83d49..934426bf6ca 100644
--- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
+++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
@@ -13,17 +13,17 @@ it will only add the path to the python used when building
available.
-diff --git a/src/virtualenv.py b/src/virtualenv.py
-index 4b57cde..afda73f 100755
---- a/src/virtualenv.py
-+++ b/src/virtualenv.py
-@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False):
+diff --git a/virtualenv.py b/virtualenv.py
+index bcf3225..3530997 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False):
def change_prefix(filename, dst_prefix):
- prefixes = [sys.prefix]
-
-- if is_darwin:
+- if IS_DARWIN:
- prefixes.extend(
- (
- os.path.join("/Library/Python", sys.version[:3], "site-packages"),
@@ -39,16 +39,16 @@ index 4b57cde..afda73f 100755
if hasattr(sys, "real_prefix"):
prefixes.append(sys.real_prefix)
-@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix):
+@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix):
if src_prefix != os.sep: # sys.prefix == "/"
- assert relpath[0] == os.sep
- relpath = relpath[1:]
+ assert relative_path[0] == os.sep
+ relative_path = relative_path[1:]
+ if src_prefix == "/nix/store":
-+ relpath = "/".join(relpath.split("/")[1:])
- return join(dst_prefix, relpath)
++ relative_path = "/".join(relative_path.split("/")[1:])
+ return join(dst_prefix, relative_path)
assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes)
-@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
+@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
site_filename_dst = change_prefix(site_filename, home_dir)
site_dir = os.path.dirname(site_filename_dst)
writefile(site_filename_dst, SITE_PY)
From fc2a5acd037f70c1864b9548e3df48a29745980a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 16:55:36 +0100
Subject: [PATCH 401/494] python.pkgs.oauthlib: 2.0.0 -> 3.0.1
---
.../python-modules/oauthlib/default.nix | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 61259764bec..cdf88db632c 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -1,31 +1,33 @@
{ stdenv
, buildPythonPackage
-, fetchurl
+, fetchPypi
, mock
-, nose
-, unittest2
+, pytest
, cryptography
, blinker
, pyjwt
}:
buildPythonPackage rec {
- version = "2.0.0";
+ version = "3.0.1";
pname = "oauthlib";
- src = fetchurl {
- url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz";
- sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298";
};
- buildInputs = [ mock nose unittest2 ];
+ checkInputs = [ mock pytest ];
propagatedBuildInputs = [ cryptography blinker pyjwt ];
+ checkPhase = ''
+ py.test tests/
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/idan/oauthlib;
- downloadPage = https://github.com/idan/oauthlib/releases;
description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
maintainers = with maintainers; [ prikhi ];
+ license = licenses.bsd3;
};
-
}
From a876267deebb993ecf68dd9e2affafb51a96d93e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 17:08:09 +0100
Subject: [PATCH 402/494] python.pkgs.praw: use pytest_3
---
pkgs/development/python-modules/praw/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index f8f3d5458a0..ede3e07390c 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
-, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
+, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
}:
buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytest_3
betamax
betamax-serializers
betamax-matchers
From 6da810586d48276fe7590637fbb78842dbce235b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 20:18:51 +0100
Subject: [PATCH 403/494] awscli: 1.16.90 -> 1.16.104
---
pkgs/tools/admin/awscli/default.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 663dfa40e23..a2064c47577 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -14,16 +14,23 @@ let
sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
};
});
+ colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+ version = "0.3.9";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1";
+ };
+ });
};
};
in py.pkgs.buildPythonApplication rec {
pname = "awscli";
- version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.16.104"; # N.B: if you change this, change botocore to a matching version too
src = py.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d";
+ sha256 = "d540067e72281e5b7b532d1323967d7fd43dad4a388974ec47353208d39072c4";
};
# No tests included
From 50b1d64534b6d648a7a579b987577442fcea2c29 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 20:28:42 +0100
Subject: [PATCH 404/494] dosage: fix build
---
pkgs/applications/graphics/dosage/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index d45d6c3a62e..cf5ecfdd043 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
};
- buildInputs = with pythonPackages; [ pytest responses ];
+ checkInputs = with pythonPackages; [ pytest responses ];
propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
disabled = pythonPackages.pythonOlder "3.3";
From 46f2b49b443a78b4d686827192aaf79df87a6f1e Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 12 Feb 2019 19:17:05 +0000
Subject: [PATCH 405/494] pythonPackages.pkgconfig: use same setupHook as
pkgconfig
This setupHook is necessary for actually using pkgconfig. Without this
setupHook, you need to put both pythonPackages.pkgconfig and pkgconfig
into your buildInputs, just to get the setuphook of the latter.
Previously, pythonPackages.pkgconfig depended on pkgconfig as a
propagatedBuildInput, so this setupHook was propagated down to
dependents. That was changed to a regular nativeBuildInput, so now
this setupHook change is necessary for packages to only depend on
pythonPackages.pkgconfig.
A possible alternative is extracting out a common pkgconfigHook
package and having both pythonPackages.pkgconfig and pkgconfig depend
on that with propagatedBuildInputs. That might be necessary to avoid
the buildHook running twice?
---
pkgs/development/python-modules/pkgconfig/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix
index 38098b432e4..ab8c2f638b4 100644
--- a/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/pkgs/development/python-modules/pkgconfig/default.nix
@@ -4,6 +4,8 @@ buildPythonPackage rec {
pname = "pkgconfig";
version = "1.4.0";
+ setupHook = pkgconfig.setupHook;
+
src = fetchPypi {
inherit pname version;
sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52";
From 0c3197ec08ca4dd35f555edfd0174b397169cffe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 20:30:58 +0100
Subject: [PATCH 406/494] Revert "python.pkgs.matplotlib: use pkgs.pkgconfig"
This reverts commit c78f98db56b580bada5c56ef38793f4fa5c140b6.
---
pkgs/development/python-modules/matplotlib/default.nix | 4 +---
pkgs/top-level/python-packages.nix | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index d4c8e970c50..718eb2de425 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -35,15 +35,13 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp";
- nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
- libpng mock pytz ]
+ libpng pkgconfig mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b5fccaece8..c070b9c2297 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3058,7 +3058,6 @@ in {
in callPackage path {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
- inherit (pkgs) pkgconfig;
};
matrix-client = callPackage ../development/python-modules/matrix-client { };
From d40bd10e68f256d8ad283e223d2d23c1ea69dfad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 20:38:01 +0100
Subject: [PATCH 407/494] vulnix: ronn is a native build input
---
pkgs/tools/security/vulnix/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index ed55fa26451..1c5466db363 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m";
};
- buildInputs = [ ronn ];
+ nativeBuildInputs = [ ronn ];
checkInputs = with pythonPackages; [
freezegun
From 4256099a3311a0ac0e700317ec2577cf7106dadc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Feb 2019 20:38:26 +0100
Subject: [PATCH 408/494] matplotlib: fix pkgconfig situation
We need pkgs.pkgconfig, and not pythonPackages.pkgconfig.
---
pkgs/development/python-modules/matplotlib/2.nix | 4 +++-
pkgs/development/python-modules/matplotlib/default.nix | 4 +++-
pkgs/top-level/python-packages.nix | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix
index 6334d2e4f79..fb433be8d99 100644
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -34,13 +34,15 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp";
+ nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
- libpng pkgconfig mock pytz ]
+ libpng mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 718eb2de425..d4c8e970c50 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -35,13 +35,15 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp";
+ nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
- libpng pkgconfig mock pytz ]
+ libpng mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c070b9c2297..1b5fccaece8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3058,6 +3058,7 @@ in {
in callPackage path {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+ inherit (pkgs) pkgconfig;
};
matrix-client = callPackage ../development/python-modules/matrix-client { };
From e2b68922f34cf2fba1b9f185dc895c8e78e0a454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 23:19:44 +0100
Subject: [PATCH 409/494] python.pkgs.pylibgen: no tests in tarball
---
pkgs/development/python-modules/pylibgen/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix
index edceb3f4035..ce0df266332 100644
--- a/pkgs/development/python-modules/pylibgen/default.nix
+++ b/pkgs/development/python-modules/pylibgen/default.nix
@@ -1,6 +1,7 @@
-{ buildPythonPackage, python, lib, fetchPypi
+{ buildPythonPackage, lib, fetchPypi
, isPy3k
, requests
+, pytest
}:
buildPythonPackage rec {
@@ -16,8 +17,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ requests ];
- # It's not using unittest
- checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'";
+ checkInputs = [ pytest ];
+
+ # no tests in PyPI tarball
+ doCheck = false;
meta = {
description = "Python interface to Library Genesis";
From 47061712cfd7eb830676e4d17abc798b7f4f2c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 23:23:46 +0100
Subject: [PATCH 410/494] papis: fix build with recent python-slugify
---
pkgs/tools/misc/papis/default.nix | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix
index 282d64befb7..067ababefdb 100644
--- a/pkgs/tools/misc/papis/default.nix
+++ b/pkgs/tools/misc/papis/default.nix
@@ -14,11 +14,18 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "1b481sj92z9nw7gwbrpkgd4nlmqc1n73qilkc51k2r56cy1kjvss";
};
- # Update click version to 7.0.0
- patches = fetchpatch {
- url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch;
- sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1";
- };
+ patches = [
+ # Update click version to 7.0.0
+ (fetchpatch {
+ url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch;
+ sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1";
+ })
+ # Allow python-slugify >= 2.0.0
+ (fetchpatch {
+ url = https://github.com/papis/papis/commit/b023ca0e551a29c0c15f73fa071addd3e61fa36d.patch;
+ sha256 = "0ybfzr5v1zg9m201jq4hyc6imqd8l4mx9azgjjxkgxcwd3ib1ymq";
+ })
+ ];
propagatedBuildInputs = with python3.pkgs; [
click requests filetype pyparsing configparser
From 50a85be7877cd07a17e034b246b475ca85d6d9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 23:45:38 +0100
Subject: [PATCH 411/494] python.pkgs.mutagen: fix tests with updated
pycodestyle
---
pkgs/development/python-modules/mutagen/default.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix
index f91cc5e939e..0bd08a82b93 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, hypothesis
, pycodestyle
, pyflakes
@@ -17,6 +18,12 @@ buildPythonPackage rec {
sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c";
};
+ # fix tests with updated pycodestyle
+ patches = fetchpatch {
+ url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch;
+ sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288";
+ };
+
checkInputs = [
pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis
From e70cf2cd44eefec3aa873ebe3f910d722608462b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 23:53:13 +0100
Subject: [PATCH 412/494] python.pkgs.portend: disable flake8 tests
They fail with many occurences of `E117 over-indented`.
---
pkgs/development/python-modules/portend/default.nix | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index c7c888f6a00..a8dc0e9907a 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm, tempora, pytest-flake8 }:
+, pytest, setuptools_scm, tempora }:
buildPythonPackage rec {
pname = "portend";
@@ -10,11 +10,15 @@ buildPythonPackage rec {
sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719";
};
+ postPatch = ''
+ substituteInPlace pytest.ini --replace "--flake8" ""
+ '';
+
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora ];
- checkInputs = [ pytest pytest-flake8 ];
+ checkInputs = [ pytest ];
checkPhase = ''
py.test
From 8dcc98e80bd878fd9c485b1d7ba66350395444e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 14 Feb 2019 23:58:11 +0100
Subject: [PATCH 413/494] python.pkgs.billiard: add psutil to
propagatedBuildInputs
---
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 7193f3e9bcf..dd4b548563c 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }:
buildPythonPackage rec {
pname = "billiard";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84";
};
- buildInputs = [ pytest case ];
+ checkInputs = [ pytest case psutil ];
meta = with stdenv.lib; {
homepage = https://github.com/celery/billiard;
From d3675b5f77ee341053200e42f4243b1ccffbad3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 15 Feb 2019 00:01:55 +0100
Subject: [PATCH 414/494] python.pkgs.kombu: add Pyro4 to checkInputs
---
pkgs/development/python-modules/kombu/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 21c1035547a..b70228b6835 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }:
+{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }:
buildPythonPackage rec {
- pname = "kombu";
- version = "4.3.0";
+ pname = "kombu";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
substituteInPlace requirements/test.txt --replace "pytest-sugar" ""
'';
- checkInputs = [ pytest case pytz ];
+ checkInputs = [ pytest case pytz Pyro4 ];
propagatedBuildInputs = [ amqp ];
From 5c7531872fb55f42b03df9929f60cfb410cf7cc5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 09:02:59 +0100
Subject: [PATCH 415/494] python.pkgs.protobuf: fix build
---
pkgs/development/python-modules/protobuf/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 7a67ce29240..bfccdabd759 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -13,8 +13,9 @@ buildPythonPackage rec {
optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
- propagatedBuildInputs = [ protobuf google_apputils ];
- buildInputs = [ google_apputils pyext ];
+ propagatedBuildInputs = [ google_apputils ];
+ nativeBuildInputs = [ google_apputils pyext protobuf ];
+ buildInputs = [ protobuf ];
patches = optional isPy37
# Python 3.7 compatibility (remove when protobuf 3.7 is released)
From 6bffe977fe25d6a57db901defb4c3673883d9f5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 09:36:36 +0100
Subject: [PATCH 416/494] python.pkgs.pyqt5: fix build
---
pkgs/development/python-modules/pyqt/5.x.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 2d2c04d5fb2..47a789000b1 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -23,7 +23,7 @@ in buildPythonPackage rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig qmake lndir ];
+ nativeBuildInputs = [ pkgconfig qmake lndir sip ];
buildInputs = [ dbus sip ];
From 51e9723ba98b5c36b9c3397cebfc972c1a1328bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 09:37:00 +0100
Subject: [PATCH 417/494] python.pkgs.qtconsole: distinguish between build and
check inputs
---
pkgs/development/python-modules/qtconsole/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 07b5a316961..810cffa5cc6 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw";
};
- buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
+ checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
# : cannot connect to X server
From 424dd6c1c566fee4512d67fc2b4a54fa6d7f2b35 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 09:42:51 +0100
Subject: [PATCH 418/494] python.pkgs.cypari2: fix build
after setting `strictDeps = true;`
---
pkgs/development/python-modules/cypari2/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index bf46bf9a182..1e1248591f0 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -29,8 +29,11 @@ buildPythonPackage rec {
${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir .
'';
- buildInputs = [
+ nativeBuildInputs = [
pari
+ ];
+
+ buildInputs = [
gmp
];
From 96ff09a8541c60c90b1e844a7123727eb2722674 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 09:46:46 +0100
Subject: [PATCH 419/494] python.pkgs.murmurhash: fix build
---
pkgs/development/python-modules/murmurhash/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index b3cea69c098..cc1693a3719 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -13,6 +13,10 @@ buildPythonPackage rec {
sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q";
};
+ postPatch = ''
+ substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" ""
+ '';
+
buildInputs = [
cython
];
From 7397fa2a2775269aad995a620b23e500168e36d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 10:15:25 +0100
Subject: [PATCH 420/494] python.pkgs.partd: disable failing test
---
pkgs/development/python-modules/partd/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index 1db458a0d0f..ef706c65c6c 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
checkPhase = ''
rm partd/tests/test_zmq.py # requires network & fails
- py.test
+ py.test -k "not test_serialize"
'';
meta = {
From d2c3fd5af0022c612ce2cd4f274e09ab58ccc6fe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 10:08:27 +0100
Subject: [PATCH 421/494] Python: fix outfall after setting `strictDeps =
true;`
---
pkgs/applications/audio/gtklick/default.nix | 2 +-
pkgs/applications/audio/lollypop/default.nix | 1 +
pkgs/applications/audio/picard/default.nix | 2 +-
pkgs/applications/misc/electrum/ltc.nix | 4 +++-
.../applications/misc/hamster-time-tracker/default.nix | 4 ++--
pkgs/applications/misc/kitty/default.nix | 6 +++---
.../applications/networking/browsers/eolie/default.nix | 1 +
.../networking/mailreaders/mailnag/default.nix | 3 ++-
pkgs/applications/office/paperwork/default.nix | 4 ++--
.../git-and-tools/git-big-picture/default.nix | 2 ++
pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 2 +-
.../python-modules/editorconfig/default.nix | 2 +-
pkgs/development/python-modules/gssapi/default.nix | 10 ++++++----
pkgs/development/python-modules/gst-python/default.nix | 2 +-
pkgs/development/python-modules/iso3166/default.nix | 2 +-
pkgs/development/python-modules/libnacl/default.nix | 2 +-
pkgs/development/python-modules/libsexy/default.nix | 8 ++++----
pkgs/development/python-modules/mpi4py/default.nix | 2 +-
.../python-modules/mysql_python/default.nix | 5 +++--
pkgs/development/python-modules/pgspecial/default.nix | 2 +-
pkgs/development/python-modules/psycopg2/default.nix | 2 +-
pkgs/development/python-modules/pycurl/default.nix | 1 +
pkgs/development/python-modules/pyside/default.nix | 4 ++--
pkgs/development/python-modules/pyside/shiboken.nix | 2 +-
.../python-modules/pytest-fixture-config/default.nix | 4 ++--
.../python-modules/pytest-flakes/default.nix | 3 ++-
.../python-modules/pytest-shutil/default.nix | 5 +++--
.../python-modules/pytest-virtualenv/default.nix | 6 ++++--
pkgs/servers/matrix-synapse/default.nix | 2 +-
pkgs/tools/backup/ddar/default.nix | 1 +
pkgs/tools/networking/linkchecker/default.nix | 1 +
pkgs/tools/security/onioncircuits/default.nix | 1 +
32 files changed, 58 insertions(+), 40 deletions(-)
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index 0434b00c705..b653ae5ca58 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
pyGtkGlade
];
- buildInputs = [ gettext ];
+ nativeBuildInputs = [ gettext ];
propagatedBuildInputs = [ klick ];
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 03d27177656..a285663d8ce 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
];
buildInputs = with gst_all_1; [
+ gobject-introspection
gst-libav
gst-plugins-bad
gst-plugins-base
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 915b7d0cbb5..421c9eaac37 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5";
};
- buildInputs = [ gettext ];
+ nativeBuildInputs = [ gettext ];
propagatedBuildInputs = with pythonPackages; [
pyqt5
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 45c44880462..a5e4bd74a6e 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -4,7 +4,7 @@
}:
python3Packages.buildPythonApplication rec {
- name = "electrum-ltc-${version}";
+ pname = "electrum-ltc";
version = "3.1.3.1";
src = fetchurl {
@@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
};
+ nativeBuildInputs = with python3Packages; [ pyqt5 ];
+
propagatedBuildInputs = with python3Packages; [
pyaes
ecdsa
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 453d95694eb..9360e220ab6 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
};
- nativeBuildInputs = [ wafHook ];
+ nativeBuildInputs = [ wafHook intltool ];
buildInputs = [
- docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
+ docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 845de8b0388..58b6ae9aae8 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -7,8 +7,8 @@
with python3Packages;
buildPythonApplication rec {
+ pname = "kitty";
version = "0.13.3";
- name = "kitty-${version}";
format = "other";
src = fetchFromGitHub {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
wayland-protocols wayland dbus
];
- nativeBuildInputs = [ pkgconfig which sphinx ];
+ nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
outputs = [ "out" "terminfo" ];
@@ -36,7 +36,7 @@ buildPythonApplication rec {
];
buildPhase = ''
- python3 setup.py linux-package
+ ${python.interpreter} setup.py linux-package
'';
installPhase = ''
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 12a6c64c7ae..5b3e8d727d0 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = with gst_all_1; [
glib-networking
+ gobject-introspection
gst-libav
gst-plugins-base
gst-plugins-ugly
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 56a676178cc..6c39dc78e57 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
};
buildInputs = [
- gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
+ gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
nativeBuildInputs = [
+ gettext
wrapGAppsHook
];
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 8d76f160d7b..401d3be3128 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -6,7 +6,7 @@
python3Packages.buildPythonApplication rec {
inherit (python3Packages.paperwork-backend) version src;
- name = "paperwork-${version}";
+ pname = "paperwork";
sourceRoot = "source/paperwork-gtk";
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
paths = lib.collect lib.isDerivation aspellDicts;
}}/lib/aspell";
- checkInputs = [ xvfb_run dbus.daemon ];
+ checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
buildInputs = [
gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
];
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 7a47ed9a992..2d171df8bf2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
buildInputs = [ git graphviz ];
+ checkInputs = [ git ];
+
postFixup = ''
wrapProgram $out/bin/git-big-picture \
--prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs }
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index ea12dff14fc..98d3cfb5539 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = with gst_all_1; [
- gtk3 glib libmediaart gnome-online-accounts
+ gtk3 glib libmediaart gnome-online-accounts gobject-introspection
gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup
gnome3.gsettings-desktop-schemas tracker
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index 97e486a0532..3f276374d9e 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
};
- buildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
checkPhase = ''
cmake .
# utf_8_char fails with python3
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 698da6dc91a..14d27e7442e 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
-nose, shouldbe, gss, krb5Full, which, darwin }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
+nose, gss, krb5Full, darwin }:
buildPythonPackage rec {
pname = "gssapi";
@@ -16,13 +16,15 @@ buildPythonPackage rec {
--replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'"
'';
- LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib";
+ LD_LIBRARY_PATH = "${krb5Full}/lib";
- buildInputs = [ krb5Full which nose shouldbe ]
+ nativeBuildInputs = [ krb5Full ]
++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
propagatedBuildInputs = [ decorator enum34 six ];
+ checkInputs = [ nose ];
+
doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 2b9703452dc..a26b02ee030 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -46,7 +46,7 @@ in buildPythonPackage rec {
substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"}
'';
- nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ];
+ nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ];
mesonFlags = [
"-Dpython=python${if isPy3k then "3" else "2"}"
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index 21d098eb31b..c65c5f21e56 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx";
};
- buildInputs = [ pytest ];
+ checkInputs = [ pytest ];
checkPhase = ''
py.test
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index c575e5594be..54b98cf2136 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
};
- buildInputs = [ pytest ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ libsodium ];
postPatch =
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index e5a03f78355..03797575a83 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }:
buildPythonPackage rec {
pname = "libsexy";
@@ -10,14 +10,14 @@ buildPythonPackage rec {
sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig pygtk ];
propagatedBuildInputs = [
- pygtk libsexy gtk2 glib pango libxml2
+ pygtk libsexy glib pango libxml2
];
postInstall = ''
- ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
+ ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages}
'';
meta = {
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 6d3897475ad..09b05f4ab0f 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
- buildInputs = [ mpi openssh ];
+ nativeBuildInputs = [ mpi openssh ];
meta = {
description =
diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix
index a38f7e02e1c..0ab11521cc8 100644
--- a/pkgs/development/python-modules/mysql_python/default.nix
+++ b/pkgs/development/python-modules/mysql_python/default.nix
@@ -17,8 +17,9 @@ buildPythonPackage rec {
sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
};
- buildInputs = [ nose ];
- propagatedBuildInputs = [ pkgs.mysql.connector-c ];
+ checkInputs = [ nose ];
+ nativeBuildInputs = [ pkgs.mysql.connector-c ];
+ buildInputs = [ pkgs.mysql.connector-c ];
# plenty of failing tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index b2ce1fb8f98..8c653ce060a 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
};
- buildInputs = [ pytest psycopg2 ];
+ checkInputs = [ pytest psycopg2 ];
propagatedBuildInputs = [ click sqlparse ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 081ea4c699d..dae97d87ef2 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
buildInputs = lib.optional stdenv.isDarwin openssl;
- propagatedBuildInputs = [ postgresql ];
+ nativeBuildInputs = [ postgresql ];
doCheck = false;
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index c437df9cd99..9fb27c88c02 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -20,6 +20,7 @@ buildPythonPackage rec {
};
buildInputs = [ curl openssl.out ];
+ nativeBuildInputs = [ curl ];
checkInputs = [ bottle pytest nose flaky ];
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index ab46c726f6c..e6ac4281362 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
enableParallelBuilding = true;
- buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
+ nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";
@@ -22,6 +22,6 @@ buildPythonPackage rec {
license = lib.licenses.lgpl21;
homepage = http://www.pyside.org;
maintainers = [ lib.maintainers.chaoflow ];
- platforms = lib.platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 859e91c872e..2bf1c4468dd 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
enableParallelBuilding = true;
- buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
+ nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
preConfigure = ''
echo "preConfigure: Fixing shiboken_generator install target."
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index af599c86a44..e9ae311d496 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, setuptools-git, pytest }:
+, setuptools-git, pytest_3 }:
buildPythonPackage rec {
pname = "pytest-fixture-config";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-git ];
- buildInputs = [ pytest ];
+ buildInputs = [ pytest_3 ];
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 52cfed14150..df7981e6bfc 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -10,7 +10,8 @@ buildPythonPackage rec {
sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143";
};
- buildInputs = [ pytestpep8 pytest ];
+ checkInputs = [ pytestpep8 pytest ];
+ nativeBuildInputs = [ pytest ];
propagatedBuildInputs = [ pyflakes ];
# disable one test case that looks broken
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index c8a23e6f449..fedf5010b2b 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
+, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
, contextlib2, termcolor }:
buildPythonPackage rec {
@@ -11,8 +11,9 @@ buildPythonPackage rec {
sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca";
};
- buildInputs = [ cmdline pytest ];
+ checkInputs = [ cmdline pytest_3 ];
propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
+ nativeBuildInputs = [ pytest_3 ];
checkPhase = ''
py.test
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix
index a3ecd4d62ae..ec644187056 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
+, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
buildPythonPackage rec {
pname = "pytest-virtualenv";
@@ -10,10 +10,12 @@ buildPythonPackage rec {
sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19";
};
- buildInputs = [ pytest pytestcov mock cmdline ];
+ checkInputs = [ pytest_3 pytestcov mock cmdline ];
propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ];
checkPhase = '' py.test tests/unit '';
+ nativeBuildInputs = [ pytest_3 ];
+
meta = with stdenv.lib; {
description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed.";
homepage = https://github.com/manahl/pytest-plugins;
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index e2ee3e55afb..f88211cda09 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -70,7 +70,7 @@ in buildPythonApplication rec {
checkInputs = [ mock ];
checkPhase = ''
- PYTHONPATH=".:$PYTHONPATH" trial tests
+ PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix
index 3855152880e..de501659b08 100644
--- a/pkgs/tools/backup/ddar/default.nix
+++ b/pkgs/tools/backup/ddar/default.nix
@@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec {
make -f Makefile.prep synctus/ddar_pb2.py
'';
+ nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ];
propagatedBuildInputs = with python2.pkgs; [ protobuf ];
checkInputs = [ roundup ];
diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix
index 6e41de8999b..6e13d7fb94c 100644
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/pkgs/tools/networking/linkchecker/default.nix
@@ -18,6 +18,7 @@ python2Packages.buildPythonApplication rec {
pname = "LinkChecker";
version = "9.3.1";
+ nativeBuildInputs = [ gettext ];
propagatedBuildInputs = (with python2Packages; [
requests
]) ++ [ gettext ];
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 88076abc4f6..898bfb599a3 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -10,6 +10,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm";
};
+ nativeBuildInputs = [ intltool ];
buildInputs = [ intltool gtk3 gobject-introspection ];
propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ];
From a8b6bf32623c08fd217fe88050bebd3635061216 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:09:22 +0100
Subject: [PATCH 422/494] python.pkgs.datashape: mark as broken
---
pkgs/development/python-modules/datashape/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index 4fcb38e7b36..63191aa224e 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -42,5 +42,7 @@ in buildPythonPackage rec {
description = "A data description language";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ fridh ];
+ # Package is no longer maintained upstream, and more and more tests are failing.
+ broken = true;
};
}
\ No newline at end of file
From 1c9977c673b7f275e337f21b0482bc93d1b569d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:44:44 +0100
Subject: [PATCH 423/494] python.pkgs.wurlitzer: init at 1.0.2
---
.../python-modules/wurlitzer/default.nix | 28 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 30 insertions(+)
create mode 100644 pkgs/development/python-modules/wurlitzer/default.nix
diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix
new file mode 100644
index 00000000000..322c85b5810
--- /dev/null
+++ b/pkgs/development/python-modules/wurlitzer/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "wurlitzer";
+ version = "1.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add";
+ };
+
+ checkInputs = [ mock pytest ];
+
+ checkPhase = ''
+ py.test test.py
+ '';
+
+ meta = {
+ description = "Capture C-level output in context managers";
+ homepage = https://github.com/minrk/wurlitzer;
+ license = lib.licenses.mit;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b5fccaece8..ed6b26375eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4585,6 +4585,8 @@ in {
wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
+ wurlitzer = callPackage ../development/python-modules/wurlitzer { };
+
xcaplib = callPackage ../development/python-modules/xcaplib { };
xlib = callPackage ../development/python-modules/xlib { };
From 04f051d79fb4fcce842eff0c0eb90dc5ca8d8c70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:45:03 +0100
Subject: [PATCH 424/494] spyder: 3.2.8 -> 3.3.3
---
pkgs/applications/science/spyder/default.nix | 42 +++++++++++++++-----
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 71def712db6..417d5544d6c 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,22 +1,44 @@
{ stdenv, python3, makeDesktopItem }:
-python3.pkgs.buildPythonApplication rec {
+let
+
+ spyder-kernels = with python3.pkgs; buildPythonPackage rec {
+ pname = "spyder-kernels";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
+ };
+
+ propagatedBuildInputs = [
+ cloudpickle
+ ipykernel
+ wurlitzer
+ ];
+
+ # No tests
+ doCheck = false;
+
+ meta = {
+ description = "Jupyter kernels for Spyder's console";
+ homepage = https://github.com/spyder-ide/spyder-kernels;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+in python3.pkgs.buildPythonApplication rec {
pname = "spyder";
- version = "3.2.8";
+ version = "3.3.3";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
+ sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
};
- # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
- postPatch = ''
- sed -i -e '/pyqt5/d' setup.py
- '';
-
propagatedBuildInputs = with python3.pkgs; [
- jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
- numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
+ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+ numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
];
# There is no test for spyder
From 993bad16955d745cc7806c2cadb9070ce88bbb5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:45:17 +0100
Subject: [PATCH 425/494] python.pkgs.qtawesome: fix build
---
.../python-modules/qtawesome/default.nix | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index ff2d8cf0740..2fe8c0a669a 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyside }:
+{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
buildPythonPackage rec {
pname = "QtAwesome";
@@ -9,7 +9,16 @@ buildPythonPackage rec {
sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3";
};
- propagatedBuildInputs = [ qtpy six pyside ];
+ propagatedBuildInputs = [ qtpy six ];
+
+ checkInputs = [ pyqt5 pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ # Requires https://github.com/boylea/qtbot
+ doCheck = false;
meta = with stdenv.lib; {
description = "Iconic fonts in PyQt and PySide applications";
From 9382d2ea762302c7a7a5c970679e4fca14256eca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 12:58:47 +0100
Subject: [PATCH 426/494] python.pkgs.distro: mark as broken
---
pkgs/development/python-modules/distro/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 0ab37155c98..b13954e8263 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -4,11 +4,10 @@ buildPythonPackage rec {
pname = "distro";
version = "1.4.0";
- checkInputs = [ pytest pytestcov tox];
+ checkInputs = [ pytest pytestcov ];
checkPhase = ''
- touch tox.ini
- tox
+ py.test
'';
src = fetchPypi {
@@ -21,5 +20,7 @@ buildPythonPackage rec {
description = "Linux Distribution - a Linux OS platform information API.";
license = licenses.asl20;
maintainers = with maintainers; [ nand0p ];
+ # Many failing tests
+ broken = true;
};
}
From e722e0c6c1b2f9041148b368720033c88685c540 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 13:00:56 +0100
Subject: [PATCH 427/494] python.pkgs.trollius: only for python 2
---
pkgs/development/python-modules/trollius/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix
index 01ad57e55d7..476a2361416 100644
--- a/pkgs/development/python-modules/trollius/default.nix
+++ b/pkgs/development/python-modules/trollius/default.nix
@@ -17,6 +17,8 @@ buildPythonPackage rec {
./tests.patch
];
+ disabled = isPy3k;
+
postPatch = ''
# Overrides PYTHONPATH causing dependencies not to be found
sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py
From ec552248f999d359cb49dc69d149876918065e6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 15 Feb 2019 13:03:57 +0100
Subject: [PATCH 428/494] python.pkgs.pythonix: mark as broken
---
pkgs/development/python-modules/pythonix/default.nix | 1 +
pkgs/top-level/python-packages.nix | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index f7cecae8497..cd20bf72f5d 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -24,5 +24,6 @@ buildPythonPackage rec {
'';
maintainers = [ maintainers.mic92 ];
license = licenses.mit;
+ broken = true;
};
}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed6b26375eb..666be8a96c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2136,7 +2136,9 @@ in {
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
- pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { });
+ pythonix = callPackage ../development/python-modules/pythonix {
+ inherit (pkgs) pkgconfig;
+ };
pyramid = callPackage ../development/python-modules/pyramid { };
From 742fa0d7413793163f2c8c26bd11d1672629a2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 13 Feb 2019 17:48:53 +0100
Subject: [PATCH 429/494] python.pkgs.python-services: init at 1.3.1
---
.../pytest-services/default.nix | 35 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 37 insertions(+)
create mode 100644 pkgs/development/python-modules/pytest-services/default.nix
diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
new file mode 100644
index 00000000000..2a4c5591a5f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, requests
+, psutil
+, pytest
+, subprocess32
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-services";
+ version = "1.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ psutil
+ pytest
+ ] ++ lib.optional (!isPy3k) subprocess32;
+
+ # no tests in PyPI tarball
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Services plugin for pytest testing framework";
+ homepage = https://github.com/pytest-dev/pytest-services;
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 666be8a96c7..9ee6fbb23bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1566,6 +1566,8 @@ in {
pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };
+ pytest-services = callPackage ../development/python-modules/pytest-services { };
+
pytest-shutil = callPackage ../development/python-modules/pytest-shutil { };
pytestcov = callPackage ../development/python-modules/pytest-cov { };
From d35d7b35782b490a28ad6416ef7cd903aca41f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 13 Feb 2019 17:51:28 +0100
Subject: [PATCH 430/494] python3.pkgs.cherrypy: 18.0.1 -> 18.1.0
---
.../python-modules/cherrypy/default.nix | 26 ++++++++++++++-----
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 1763ccbce85..2f4ec42c7f8 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, cheroot, contextlib2, portend, routes, six
-, setuptools_scm, zc_lockfile
+, setuptools_scm, zc_lockfile, more-itertools
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
-, backports_functools_lru_cache, requests_toolbelt
+, backports_functools_lru_cache, requests_toolbelt, pytest-services
}:
let
srcInfo = if isPy3k then {
- version = "18.0.1";
- sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+ version = "18.1.0";
+ sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615";
} else {
version = "17.4.1";
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
@@ -22,14 +22,26 @@ in buildPythonPackage rec {
inherit (srcInfo) version sha256;
};
- propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
+ propagatedBuildInputs = if isPy3k then [
+ # required
+ cheroot portend more-itertools zc_lockfile
+ # optional
+ routes
+ ] else [
+ cheroot contextlib2 portend routes six zc_lockfile
+ ];
buildInputs = [ setuptools_scm ];
- checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ];
+ checkInputs = if isPy3k then [
+ objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
+ ] else [
+ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
+ ];
checkPhase = ''
- LANG=en_US.UTF-8 pytest
+ # 3 out of 5 SignalHandlingTests need network access
+ LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload"
'';
meta = with lib; {
From 9dc262c65964f481fe22b2651f5a2e79072c6a90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 08:54:52 +0100
Subject: [PATCH 431/494] pants: mark as broken
---
.../tools/build-managers/pants/default.nix | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 02bf9c23cba..9757d8cda8d 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -3,21 +3,21 @@
with stdenv.lib;
with pythonPackages;
-let
- version = "1.7.0";
-in buildPythonApplication rec {
- inherit version;
+buildPythonApplication rec {
pname = "pantsbuild.pants";
- name = "${pname}-${version}";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37";
};
+ # No tests
+ doCheck = false;
+
prePatch = ''
sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
- substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0"
+ substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0"
'';
# Unnecessary, and causes some really weird behavior around .class files, which
@@ -36,6 +36,6 @@ in buildPythonApplication rec {
homepage = "https://www.pantsbuild.org/";
license = licenses.asl20;
maintainers = with maintainers; [ copumpkin ];
- platforms = platforms.unix;
+ broken = true;
};
}
From 6f0555b030be37723f0e7bee7b1b09467cc04669 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:02:30 +0100
Subject: [PATCH 432/494] python.pkgs: rename pytestflakes to pytest-flakes
to follow naming guideline
---
pkgs/development/python-modules/mt-940/default.nix | 4 ++--
pkgs/development/python-modules/progressbar2/default.nix | 4 ++--
pkgs/development/python-modules/pylti/default.nix | 4 ++--
pkgs/development/python-modules/pytest-quickcheck/default.nix | 4 ++--
pkgs/development/python-modules/python-utils/default.nix | 4 ++--
pkgs/development/tools/devpi-client/default.nix | 2 +-
pkgs/top-level/python-packages.nix | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index d097224e52d..2693e350112 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, stdenv, pyyaml, pytest, enum34
-, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales
+, pytestpep8, pytest-flakes, fetchFromGitHub, isPy3k, lib, glibcLocales
}:
buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
- checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ];
+ checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest glibcLocales ];
checkPhase = ''
py.test
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 362e73c0d71..7a3d2264c28 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -7,7 +7,7 @@
, sphinx
, flake8
, pytestpep8
-, pytestflakes
+, pytest-flakes
, pytestcov
, pytestcache
, pytestrunner
@@ -31,7 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ python-utils ];
nativeBuildInputs = [ pytestrunner ];
checkInputs = [
- pytest sphinx flake8 pytestpep8 pytestflakes pytestcov
+ pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov
pytestcache freezegun
];
# ignore tests on the nix wrapped setup.py and don't flake .eggs directory
diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 40b639925a0..752755700b2 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -13,7 +13,7 @@
, pytestcache
, pytestcov
, covCore
-, pytestflakes
+, pytest-flakes
, pytestpep8
, sphinx
, mock
@@ -35,7 +35,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
checkInputs = [
flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
- pytestflakes pytestpep8 sphinx mock chalice
+ pytest-flakes pytestpep8 sphinx mock chalice
];
src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 1decbeb643d..1e8a49f90be 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
buildPythonPackage rec {
pname = "pytest-quickcheck";
version = "0.8.3";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ pytestflakes pytestpep8 tox ];
+ propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ];
meta = with stdenv.lib; {
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 7aa77654006..67fbd4e24eb 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }:
buildPythonPackage rec {
pname = "python-utils";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
rm tests/*.pyc
'';
- checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ];
+ checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ];
checkPhase = ''
py.test tests
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index e70971b670c..b23745a7b49 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
};
checkInputs = with pythonPackages; [
- pytest pytestflakes webtest mock
+ pytest pytest-flakes webtest mock
devpi-server tox
sphinx wheel git mercurial detox
setuptools
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ee6fbb23bc..274db7720f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1542,7 +1542,7 @@ in {
pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { };
- pytestflakes = callPackage ../development/python-modules/pytest-flakes { };
+ pytest-flakes = callPackage ../development/python-modules/pytest-flakes { };
pytest-isort = callPackage ../development/python-modules/pytest-isort { };
From 93452724bf9f696ef34695ac840de19678facb25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:23 +0100
Subject: [PATCH 433/494] python: Wand: 0.5.0 -> 0.5.1
---
pkgs/development/python-modules/Wand/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index a884b9eb7fb..0e25734cb7c 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
+ sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3";
};
postPatch = ''
From 9ed872ebe2e0bc23035ebba8bdc5ca355a470b93 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:23 +0100
Subject: [PATCH 434/494] python: WazeRouteCalculator: 0.7 -> 0.7.2
---
.../python-modules/WazeRouteCalculator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index 88248b8a15a..670e07e55d4 100644
--- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "WazeRouteCalculator";
- version = "0.7";
+ version = "0.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ff6fe5524e18ea150e49cec69acd700275b52a31204a4eea1b11831637a3c0f3";
+ sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1";
};
propagatedBuildInputs = [ requests ];
From 8b4fe86b5d9f5d57cd9fa6c71033eea30cd1f9e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 435/494] python: alerta-server: 6.7.3 -> 6.7.4
---
pkgs/development/python-modules/alerta-server/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index 7d118f41f35..fd3901f5181 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta-server";
- version = "6.7.3";
+ version = "6.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "9ce0ff9bdf1faef2c2bfaef5b213824dc9a307ba1c85f9627dd3f4b88616f4d4";
+ sha256 = "5ca2783f6e9211fdebd433b9eae83fbcf75ed127dc87946257d101a7d7a465db";
};
buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ];
From 48871fbe479a374a53cd19ef592f100d30bceead Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 436/494] python: boto3: 1.9.94 -> 1.9.96
---
pkgs/development/python-modules/boto3/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index dd8de063cff..e62936a9288 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.9.94"; # N.B: if you change this, change botocore too
+ version = "1.9.96"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "fa81dc71b23f98abe9a90de3c42ffcd98451b29ad7408465eb7c0a63e1fba95e";
+ sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
From c90dcf2c0eef6f6c5498889ed3cc921dc40c1d8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 437/494] python: botocore: 1.12.94 -> 1.12.96
---
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 17a223f20ed..801977a9620 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.12.94"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "48f780477904795b0ce559b335d0aab4c3bb9efa96fbdf24c418e22ef0745e08";
+ sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf";
};
propagatedBuildInputs = [
From 7557f5651af0766e826fcbce42047de5da4c2333 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 438/494] python: cairocffi: 1.0.1 -> 1.0.2
---
pkgs/development/python-modules/cairocffi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 93031b12840..80b23e43380 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "cairocffi";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "9ca49d9bb0a52bd6a8263de137b4818e0889f3cd8d933165fb122669924ae3b9";
+ sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
};
LC_ALL = "en_US.UTF-8";
From 2e7651528283054ae3a7faa8cfd84d27cc00890c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 439/494] python: gin-config: 0.1.2 -> 0.1.3
---
pkgs/development/python-modules/gin-config/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix
index 893f7bf5875..8701751e3a0 100644
--- a/pkgs/development/python-modules/gin-config/default.nix
+++ b/pkgs/development/python-modules/gin-config/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "gin-config";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287";
+ sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2";
};
From 0b139eb46961d6c40901230b44c67a6e14ea9740 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 440/494] python: google-cloud-dataproc: 0.3.0 -> 0.3.1
---
.../python-modules/google_cloud_dataproc/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix
index b36f651e2f7..9475c792fb9 100644
--- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2";
+ sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd";
};
checkInputs = [ pytest mock ];
From 5db9c23d66e851c387a8583cffe00637e013b01d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 441/494] python: httplib2: 0.12.0 -> 0.12.1
---
pkgs/development/python-modules/httplib2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 0fde449d825..ab9e65d78cb 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "httplib2";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "f61fb838a94ce3b349aa32c92fd8430f7e3511afdb18bf9640d647e30c90a6d6";
+ sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4";
};
# Needs setting up
From cc51f4b084216fa761ec559a26ebb779ec4e52be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 442/494] python: identify: 1.2.1 -> 1.2.2
---
pkgs/development/python-modules/identify/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index b9249476a0f..d47f5ce39fe 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0749c74180ef0f6a3874eaa0bf89a6990a523233180e83e6f3c7c27312ac9ba3";
+ sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7";
};
# Tests not included in PyPI tarball
From 23bcc77965ec434f3a5669761a28e78d5aa249ce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 443/494] python: llfuse: 1.3.5 -> 1.3.6
---
pkgs/development/python-modules/llfuse/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 21ea6de02f1..9ff2b55551d 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "llfuse";
- version = "1.3.5";
+ version = "1.3.6";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
- sha256 = "6e412a3d9be69162d49b8a4d6fb3c343d1c1fba847f4535d229e0ece2548ead8";
+ sha256 = "31a267f7ec542b0cd62e0f1268e1880fdabf3f418ec9447def99acfa6eff2ec9";
};
nativeBuildInputs = [ pkgconfig ];
From f6b47bb58156373049b9507a1b8b2763c802b271 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 444/494] python: marshmallow: 2.18.0 -> 2.18.1
---
pkgs/development/python-modules/marshmallow/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index ca7257faee5..513c277bcac 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow";
- version = "2.18.0";
+ version = "2.18.1";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "958e6640bec9a04ca15701e3d99b12c4269d0f43be596f00eeca1f2baf530abc";
+ sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6";
};
propagatedBuildInputs = [ dateutil simplejson ];
From 351bcf1b2996d5f5c367ed4725c109ba54a46257 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 445/494] python: pid: 2.2.2 -> 2.2.3
---
pkgs/development/python-modules/pid/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index 08f7e9b9f1f..68009435750 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pid";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "daa52ff1aa4f3e21cee0df5d8862be5db96dde6e5abf7613964a626a78eca5f8";
+ sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d";
};
buildInputs = [ nose ];
From 8027150275293e162367bf3382ef5b5109d0ccce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 446/494] python: PyChromecast: 2.5.0 -> 2.5.1
---
pkgs/development/python-modules/pychromecast/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index a08f5f44ea2..d7bd3eba1fe 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyChromecast";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "29f586ace15e672eeb6d37f96be2098b8566403183d78011c9d3b647a8e521bd";
+ sha256 = "936672df42f25f271c806569ee4fb7abbc0d6c17e15deba5d6c9f1128ff6974e";
};
disabled = !isPy3k;
From a056facf413169d78239ded179b6f7e810e8d4d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 447/494] python: pyro-ppl: 0.3.1 -> 0.3.1.post1
---
pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index ffbe6c0f0dd..2ef68338687 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -1,12 +1,12 @@
{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
, graphviz, networkx, six, opt-einsum, tqdm }:
buildPythonPackage rec {
- version = "0.3.1";
+ version = "0.3.1.post1";
pname = "pyro-ppl";
src = fetchPypi {
inherit version pname;
- sha256 = "2f684bdd7661d78db89297289334d801c76f2fbf1a551edb14e4d33b29985f3e";
+ sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d";
};
propagatedBuildInputs = [
From 0a9110cac8ddede76453f39a6d3727e11653c4fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 448/494] python: pytest-forked: 1.0.1 -> 1.0.2
---
pkgs/development/python-modules/pytest-forked/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index a0c0328b26b..b3ea60174a6 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pytest-forked";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "260d03fbd38d5ce41a657759e8d19bc7c8cfa6d0dcfa36c0bc9742d33bc30742";
+ sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38";
};
buildInputs = [ pytest setuptools_scm ];
From 2e1980d3f72e799dddae2241c0a53b597dde09d9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:24 +0100
Subject: [PATCH 449/494] python: pyupdate: 0.2.23 -> 0.2.26
---
pkgs/development/python-modules/pyupdate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix
index 1421c968fdf..ea49702fe19 100644
--- a/pkgs/development/python-modules/pyupdate/default.nix
+++ b/pkgs/development/python-modules/pyupdate/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyupdate";
- version = "0.2.23";
+ version = "0.2.26";
src = fetchPypi {
inherit pname version;
- sha256 = "448ee8f3e18c044877c3644c7423198d8ecfc3b0d992f0efa53f9f61392d658d";
+ sha256 = "8d30f5b011c6be41886741e31bc87cadc9762d60800faf3ce419fa52132de35c";
};
propagatedBuildInputs = [ requests ];
From 30655f92ceddb700858b3242c6a582cafe8d0a52 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:25 +0100
Subject: [PATCH 450/494] python: sopel: 6.6.2 -> 6.6.3
---
pkgs/development/python-modules/sopel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 7927b92015f..5b67fcb0964 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sopel";
- version = "6.6.2";
+ version = "6.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "40d76188ed51a2c612d2d75bd0a5a36f3cf31e3d7ac072d2798a247c2e7a0927";
+ sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1";
};
buildInputs = [ pytest ];
From ea433eb7e386406eb86dd898e556671f23cc8d52 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:25 +0100
Subject: [PATCH 451/494] python: telethon-session-sqlalchemy: 0.2.7 -> 0.2.8
---
.../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index be716c24270..1da252d374f 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "telethon-session-sqlalchemy";
- version = "0.2.7";
+ version = "0.2.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "fb83803c3ae17edc04030b375d1fc9ff1713796054f4ec8b7c0f1d0b6b21a8ed";
+ sha256 = "5097b4fe103e377b719f1840e121d14dbae38c4b7c72634c7ba1f0ec05b20533";
};
propagatedBuildInputs = [
From a6c325019ec48be7ac2ce099793dcdb8537ade5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 09:53:25 +0100
Subject: [PATCH 452/494] python: texttable: 1.6.0 -> 1.6.1
---
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 d2821310068..395deff2226 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.6.0";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2";
+ sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2";
};
meta = {
From a88c739b58513f24c522ad16ba19c85415b44942 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 16 Feb 2019 10:05:55 +0100
Subject: [PATCH 453/494] awscli: 1.16.104 -> 1.16.106
---
pkgs/tools/admin/awscli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index a2064c47577..c36b6d2fbd6 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -26,11 +26,11 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "awscli";
- version = "1.16.104"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too
src = py.pkgs.fetchPypi {
inherit pname version;
- sha256 = "d540067e72281e5b7b532d1323967d7fd43dad4a388974ec47353208d39072c4";
+ sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d";
};
# No tests included
From afa743cd4705cd51d2b4c872d574c3f4aedd631f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:07:40 +0100
Subject: [PATCH 454/494] arelle: fix build
---
pkgs/development/python-modules/arelle/default.nix | 11 +++++++----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 78cd2fca837..a0acadd8db7 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -23,9 +23,8 @@ buildPythonPackage rec {
./tests.patch
];
postPatch = "rm testParser2.py";
- buildInputs = [
+ nativeBuildInputs = [
sphinx
- pytest
py3to2
];
propagatedBuildInputs = [
@@ -33,7 +32,7 @@ buildPythonPackage rec {
isodate
numpy
openpyxl
- ] ++ lib.optional gui [
+ ] ++ lib.optionals gui [
tkinter
];
@@ -53,7 +52,11 @@ buildPythonPackage rec {
(cd apidocs && make html && cp -r _build $doc)
'';
- doCheck = if gui then true else false;
+ doCheck = false;
+
+ checkPhase = ''
+ py.test
+ '';
meta = with lib; {
description = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c0b7c8e297..2485bc9f265 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16064,7 +16064,7 @@ in
inherit (vamp) vampSDK;
};
- inherit (python3Packages) arelle;
+ arelle = with python3Packages; toPythonApplication arelle;
argo = callPackage ../applications/networking/cluster/argo { };
From e31abb97a5d5d523ac829c342381a1254673eb87 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:10:36 +0100
Subject: [PATCH 455/494] Revert "python: XStatic-Bootstrap: 3.3.7.1 ->
4.1.3.1"
because this broke the sole user bepasty
This reverts commit c7b4424d58a3d091fd62281829d740349a067851.
---
pkgs/development/python-modules/xstatic-bootstrap/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index a1e2c1a4e7b..a474bf84d0f 100644
--- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-Bootstrap";
- version = "4.1.3.1";
+ version = "3.3.7.1";
src = fetchPypi {
inherit version pname;
- sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f";
+ sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131";
};
# no tests implemented
From ea08586abbc4592ee72b67814fd81cc6d25d3e49 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:33:45 +0100
Subject: [PATCH 456/494] octoprint: 1.3.9 -> 1.3.10, still broken
need to add a bunch of custom versions of dependencies
---
pkgs/applications/misc/octoprint/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 9622689199a..4a5ec16f3e3 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -47,13 +47,13 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint";
- version = "1.3.9";
+ version = "1.3.10";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
+ sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
};
propagatedBuildInputs = with py.pkgs; [
From df12dd8ff92272a66c19e04ac66db0229c7559f9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:48:56 +0100
Subject: [PATCH 457/494] python.pkgs.alerta: fix build
---
pkgs/development/python-modules/alerta/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix
index 0b45ce4c128..c366fc770b3 100644
--- a/pkgs/development/python-modules/alerta/default.nix
+++ b/pkgs/development/python-modules/alerta/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, makeWrapper
-, six, click, requests, pytz, tabulate
+, six, click, requests, pytz, tabulate, pythonOlder
}:
buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881";
};
- buildInputs = [ six click requests pytz tabulate ];
+ propagatedBuildInputs = [ six click requests pytz tabulate ];
doCheck = false;
@@ -19,6 +19,8 @@ buildPythonPackage rec {
wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH"
'';
+ disabled = pythonOlder "3.5";
+
meta = with stdenv.lib; {
homepage = https://alerta.io;
description = "Alerta Monitoring System command-line interface";
From e5293adbb6b083929f909105d5257123a9956896 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:49:07 +0100
Subject: [PATCH 458/494] python.pkgs.alerta-server: fix build
---
pkgs/development/python-modules/alerta-server/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index fd3901f5181..cb2898785c9 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, makeWrapper
+{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml
, python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2
}:
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "5ca2783f6e9211fdebd433b9eae83fbcf75ed127dc87946257d101a7d7a465db";
};
- buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ];
+ propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml];
doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server
@@ -19,6 +19,8 @@ buildPythonPackage rec {
wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH"
'';
+ disabled = pythonOlder "3.5";
+
meta = with stdenv.lib; {
homepage = https://alerta.io;
description = "Alerta Monitoring System server";
From 94452556cc6acbde329f99b214e0b256cb471792 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 17 Feb 2019 12:51:12 +0100
Subject: [PATCH 459/494] python.pkgs.altair: fix build
---
pkgs/development/python-modules/altair/default.nix | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 313e8e22f3e..2714c8dc8e3 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -12,17 +12,16 @@ buildPythonPackage rec {
sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6";
};
+ postPatch = ''
+ # Tests require network
+ rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py
+ '';
+
checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
- # hack to prevent typing from being required for python > 3.5
- postPatch = ''
- substituteInPlace requirements.txt \
- --replace "typing" ""
- '';
-
checkPhase = ''
export LANG=en_US.UTF-8
py.test altair --doctest-modules
From f9a62dbace5b0f7924f59ade45c750479a6ab0ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 4 Feb 2019 14:46:53 -0600
Subject: [PATCH 460/494] gtk3: 3.24.4 -> 3.24.5
* add fribidi as it's now required.
* fetch patches to fix fribidi linking, autoreconf
---
pkgs/development/libraries/gtk+/3.x.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 52f1f5574dd..579fca06ffb 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection
-, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi
+, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook
, x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux
@@ -13,20 +13,20 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
- version = "3.24.4";
+ version = "3.24.5";
in
stdenv.mkDerivation rec {
name = "gtk+3-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
- sha256 = "176bl1pm5d5xkhmiwldzw833akna7shp59glkl6cjz580bzmjkyq";
+ sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
- nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ];
+ nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ];
patches = [
./3.0-immodules.cache.patch
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
- # 3.24.3: https://gitlab.gnome.org/GNOME/gtk/merge_requests/505
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
- sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
+ name = "fix-fribidi-linking.patch";
+ url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
+ sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib;
- [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas
+ [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
From 4d5295e6c96adc3bcf34687776cde52a8b09ec3c Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 18:02:07 +0100
Subject: [PATCH 461/494] mesa: update llvmPackagages 6 -> 7
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1e09af79ff..782faafffe4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11622,7 +11622,7 @@ in
libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
mesa_noglu = callPackage ../development/libraries/mesa {
- llvmPackages = llvmPackages_6;
+ llvmPackages = llvmPackages_7;
inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin;
};
From c6d84ce454aa26bd7151d5e3d04a1334b849b398 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:46:46 +0100
Subject: [PATCH 462/494] xorg/libXau: 1.0.8 -> 1.0.9
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5ddc0bff902..735cd2d3e61 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
- name = "libXau-1.0.8";
+ name = "libXau-1.0.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2;
- sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
+ url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2;
+ sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8193ddc8098..5254c31b92f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -173,7 +173,7 @@ mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
-mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
From 3117c1131bcfea6f2f356fd64d8eeafafa69f6b0 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:48:07 +0100
Subject: [PATCH 463/494] xorg/xcalc: init ad 1.0.7
---
pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++
pkgs/servers/x11/xorg/tarballs.list | 1 +
2 files changed, 14 insertions(+)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 735cd2d3e61..f6969c427cd 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
+ xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
+ name = "xcalc-1.0.7";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2;
+ sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh";
+ };
+ hardeningDisable = [ "bindnow" "relro" ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXaw xorgproto libXt ];
+ meta.platforms = stdenv.lib.platforms.unix;
+ }) {};
+
xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
name = "xcb-proto-1.13";
builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 5254c31b92f..b8d5e0f378a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -29,6 +29,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
+mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
From c72b449f3c34ec30ef19881a25619b3f6dc57f73 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:49:09 +0100
Subject: [PATCH 464/494] xorg/xcursorgen: 1.0.6 -> 1.0.7
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f6969c427cd..f23e168573f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1587,11 +1587,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation {
- name = "xcursorgen-1.0.6";
+ name = "xcursorgen-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
- sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
+ url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2;
+ sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b8d5e0f378a..befc1370f26 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -34,7 +34,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
-mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
+mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
From 0e6814e11a93c4776cbbf1e100b9f46b39b40068 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:50:19 +0100
Subject: [PATCH 465/494] xorg/xcursor-themes: 1.0.5 -> 1.0.6
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f23e168573f..c7486b8d1f7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1600,11 +1600,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation {
- name = "xcursor-themes-1.0.5";
+ name = "xcursor-themes-1.0.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2;
- sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf";
+ url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2;
+ sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index befc1370f26..dfbdcbf33e6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -73,7 +73,7 @@ mirror://xorg/individual/app/xwd-1.0.7.tar.bz2
mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
-mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2
+mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
From 3da970b8c9a318d15a32335d9ada2f045288ca8f Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:51:00 +0100
Subject: [PATCH 466/494] xorg/xf86-video-chips: 1.3.4 -> 1.4.0
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c7486b8d1f7..dd789057a61 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1834,11 +1834,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
- name = "xf86-video-chips-1.3.0";
+ name = "xf86-video-chips-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2;
- sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p";
+ url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2;
+ sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index dfbdcbf33e6..2534e986f2e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -89,7 +89,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2
From ea1ca5a4eb5846f4556f8cc6b668e679b6a99db7 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:51:39 +0100
Subject: [PATCH 467/494] xorg/xf86-video-s3virge: 1.10.7 -> 1.11.0
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dd789057a61..d89c3068854 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2107,11 +2107,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
- name = "xf86-video-s3virge-1.10.7";
+ name = "xf86-video-s3virge-1.11.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2;
- sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx";
+ url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2;
+ sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 2534e986f2e..c6cb973f30b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -110,7 +110,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
-mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
From 38004ab4bbebaf62b1188d208bf85b5e70ba5383 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 17:52:02 +0100
Subject: [PATCH 468/494] xorg/xf86-video-tdfx: 1.4.7 -> 1.5.0
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/tarballs.list | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d89c3068854..0d33dbd3219 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2211,11 +2211,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
- name = "xf86-video-tdfx-1.4.7";
+ name = "xf86-video-tdfx-1.5.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2;
- sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c";
+ url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2;
+ sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c6cb973f30b..ae6b5a37fb4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2
From b6167a6e637e9af71f6b352451413734992e0119 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 18:14:29 +0100
Subject: [PATCH 469/494] xorg/xf86-video-apm: init at 1.3.0
---
pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++
pkgs/servers/x11/xorg/tarballs.list | 1 +
2 files changed, 14 insertions(+)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0d33dbd3219..1cbea83b8ae 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1794,6 +1794,19 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
+ xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
+ name = "xf86-video-apm-1.3.0";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2;
+ sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0";
+ };
+ hardeningDisable = [ "bindnow" "relro" ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ xorgproto libpciaccess xorgserver ];
+ meta.platforms = stdenv.lib.platforms.unix;
+ }) {};
+
xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
name = "xf86-video-ark-0.7.5";
builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ae6b5a37fb4..0392ba7895a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -86,6 +86,7 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
From 6f9a7f05cf6819ae1fe3a2b58cb693ff80b67b82 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Mon, 18 Feb 2019 23:06:39 +0100
Subject: [PATCH 470/494] mesa: 18.3.3 -> 18.3.4
---
pkgs/development/libraries/mesa/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9747d8cf577..5bc1dfaf878 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
in
let
- version = "18.3.3";
+ version = "18.3.4";
branch = head (splitString "." version);
in
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "16b2jgrmlqajsyz0qkr4b2v68538bs941cn3pk635ib6d5m8idia";
+ sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j";
};
prePatch = "patchShebangs .";
From cbbde55382f03f725941b2860f9a54a44a6f36c3 Mon Sep 17 00:00:00 2001
From: Michael Eden <themichaeleden@gmail.com>
Date: Mon, 18 Feb 2019 17:41:03 -0500
Subject: [PATCH 471/494] cmake: add ability to cross-compile cmake
---
.../tools/build-managers/cmake/default.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 68d4118f049..c9efefbc330 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
+, buildPackages
# darwin attributes
, ps
, isBootstrap ? false
@@ -61,6 +62,8 @@ stdenv.mkDerivation rec {
++ optional useQt4 qt4
++ optional withQt5 qtbase;
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
propagatedBuildInputs = optional stdenv.isDarwin ps;
preConfigure = ''
@@ -71,7 +74,8 @@ stdenv.mkDerivation rec {
--subst-var-by libc_lib ${getLib stdenv.cc.libc}
substituteInPlace Modules/FindCxxTest.cmake \
--replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
- configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
+ # BUILD_CC and BUILD_CXX are used to bootstrap cmake
+ configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags"
'';
configureFlags = [
@@ -95,6 +99,11 @@ stdenv.mkDerivation rec {
# Avoid depending on frameworks.
++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
+ # make install attempts to use the just-built cmake
+ preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
+ '';
+
dontUseCmakeConfigure = true;
enableParallelBuilding = true;
From 0e78f2bd10df60c78144073a9f8dcd6086f046cf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Feb 2019 20:42:09 -0500
Subject: [PATCH 472/494] Revert "cctools: bump to latest commit"
This reverts commit ac682e362c07929b2b30bfdf4f75cd1c5250d3e7.
This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.
Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
---
.../darwin/cctools/ld-tbd-v2.patch | 98 +++++++++++++++++++
pkgs/os-specific/darwin/cctools/port.nix | 50 +++++++---
.../darwin/cctools/support-ios.patch | 13 +++
.../darwin/cctools/undo-unknown-triple.patch | 17 ++++
pkgs/top-level/all-packages.nix | 5 +
5 files changed, 171 insertions(+), 12 deletions(-)
create mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
create mode 100644 pkgs/os-specific/darwin/cctools/support-ios.patch
create mode 100644 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
new file mode 100644
index 00000000000..9aae2be1d03
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
@@ -0,0 +1,98 @@
+diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+index 09c0e12..ac6b085 100644
+--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
+@@ -187,6 +187,7 @@ struct DynamicLibrary {
+ ld::File::ObjcConstraint _objcConstraint;
+ Options::Platform _platform;
+ std::vector<Token> _allowedClients;
++ std::vector<Token> _allowableClients;
+ std::vector<Token> _reexportedLibraries;
+ std::vector<Token> _symbols;
+ std::vector<Token> _classes;
+@@ -246,6 +247,14 @@ class TBDFile {
+ });
+ }
+
++ void parseAllowableClients(DynamicLibrary& lib) {
++ if ( !hasOptionalToken("allowable-clients") )
++ return;
++ parseFlowSequence([&](Token name) {
++ lib._allowableClients.emplace_back(name);
++ });
++ }
++
+ void parseReexportedDylibs(DynamicLibrary& lib) {
+ if ( !hasOptionalToken("re-exports") )
+ return;
+@@ -306,6 +315,21 @@ class TBDFile {
+ return false;
+ }
+
++ void skipUUIDs(DynamicLibrary& lib) {
++ expectToken("uuids");
++ while ( true ) {
++ auto token = next();
++ if ( token == "]" )
++ break;
++ }
++ }
++
++ void skipParentUmbrella(DynamicLibrary& lib) {
++ if (!hasOptionalToken("parent-umbrella"))
++ return;
++ next();
++ }
++
+ void parsePlatform(DynamicLibrary& lib) {
+ expectToken("platform");
+
+@@ -410,6 +434,7 @@ class TBDFile {
+ }
+
+ parseAllowedClients(lib);
++ parseAllowableClients(lib);
+ parseReexportedDylibs(lib);
+ parseSymbols(lib);
+ if ( !hasOptionalToken("-") )
+@@ -455,17 +480,21 @@ class TBDFile {
+ return result.front();
+ }
+
+- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
+ auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
+ if (selectedArchName.empty())
+ throwf("invalid arch");
+
++ if(isTbdV2)
++ skipUUIDs(lib);
+ parsePlatform(lib);
+ parseInstallName(lib);
+ parseCurrentVersion(lib);
+ parseCompatibilityVersion(lib);
+ parseSwiftVersion(lib);
+ parseObjCConstraint(lib);
++ if(isTbdV2)
++ skipParentUmbrella(lib);
+ parseExportsBlock(lib, selectedArchName);
+ }
+
+@@ -476,7 +505,8 @@ public:
+ _tokenizer.reset();
+ DynamicLibrary lib;
+ expectToken("---");
+- parseDocument(lib, requestedArchName);
++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
++ parseDocument(lib, requestedArchName, isTbdV2);
+ expectToken("...");
+ return lib;
+ }
+@@ -486,6 +516,7 @@ public:
+ auto token = next();
+ if ( token != "---" )
+ return false;
++ hasOptionalToken("!tapi-tbd-v2");
+ return !parseAndSelectArchitecture(requestedArchName).empty();
+ }
+
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index d41f571cf97..0c8019f5206 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,10 +1,18 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
, libcxxabi, libuuid, llvm
, libobjc ? null, maloader ? null
+, enableDumpNormalizedLibArgs ? false
}:
let
+ # We need to use an old version of cctools-port to support linking TBD files
+ # in the iOS SDK. Note that this only provides support for SDK versions up to
+ # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
+ # default version here, which can support the new TBD format via Apple's
+ # libtapi.
+ useOld = stdenv.targetPlatform.isiOS;
+
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
targetPrefix = stdenv.lib.optionalString
@@ -15,27 +23,47 @@ in
# Non-Darwin alternatives
assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
+assert enableDumpNormalizedLibArgs -> (!useOld);
+
let
baseParams = rec {
name = "${targetPrefix}cctools-port-${version}";
- version = "895";
+ version = if useOld then "886" else "895";
- src = fetchFromGitHub {
+ src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
owner = "tpoechtrager";
repo = "cctools-port";
- rev = "07619027f8311fa61b4a549c75994b88739a82d8";
- sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi";
- };
+ # master with https://github.com/tpoechtrager/cctools-port/pull/34
+ rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
+ sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
+ } else if useOld then {
+ owner = "tpoechtrager";
+ repo = "cctools-port";
+ rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
+ sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
+ } else {
+ owner = "tpoechtrager";
+ repo = "cctools-port";
+ rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
+ sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
+ });
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
+ nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ];
buildInputs = [ libuuid ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
- patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ];
+ patches = [
+ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
+ ] ++ stdenv.lib.optionals useOld [
+ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
+ ./undo-unknown-triple.patch
+ ./ld-tbd-v2.patch
+ ./support-ios.patch
+ ];
- __propagatedImpureHostDeps = [
+ __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
"/usr/lib/libobjc.A.dylib"
"/usr/lib/libobjc.dylib"
@@ -48,9 +76,7 @@ let
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
configureFlags = [ "--disable-clang-as" ];
- postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
- substituteInPlace cctools/Makefile.am --replace libobjc2 ""
- '' + ''
+ postPatch = ''
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
# FIXME: there are far more absolute path references that I don't want to fix right now
diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch
new file mode 100644
index 00000000000..f78c6b63ac8
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/support-ios.patch
@@ -0,0 +1,13 @@
+diff --git a/cctools/configure.ac b/cctools/configure.ac
+index 56e8f24..0b4b3ff 100644
+--- a/cctools/configure.ac
++++ b/cctools/configure.ac
+@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
+ WARNINGS=""
+
+ case $host_os in
+- darwin* )
++ darwin* | ios*)
+ isdarwin=yes
+ AM_CONDITIONAL([ISDARWIN], [true])
+ ;;
diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
new file mode 100644
index 00000000000..7df9bdd16da
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
@@ -0,0 +1,17 @@
+diff --git a/cctools/as/driver.c b/cctools/as/driver.c
+index b06d085..c03397a 100644
+--- a/cctools/as/driver.c
++++ b/cctools/as/driver.c
+@@ -363,12 +363,6 @@ char **envp)
+ /* Add -c or clang will run ld(1). */
+ new_argv[j] = "-c";
+ j++;
+- /* cctools-port start */
+- new_argv[j] = "-target";
+- j++;
+- new_argv[j] = "unknown-apple-darwin";
+- j++;
+- /* cctools-port end */
+ new_argv[j] = NULL;
+ if(execute(new_argv, verbose))
+ exit(0);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2ea5c82ce..4d5134c7cae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6635,6 +6635,11 @@ in
name = "clang-wrapper-with-reexport-hack";
bintools = darwin.binutils.override {
useMacosReexportHack = true;
+ bintools = darwin.binutils.bintools.override {
+ cctools = darwin.cctools.override {
+ enableDumpNormalizedLibArgs = true;
+ };
+ };
};
};
From 5464dbe40a7f534bcd94c8f2dcf96f29b37b2435 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Feb 2019 20:45:35 -0500
Subject: [PATCH 473/494] cctools: add myself as maintainer
---
pkgs/os-specific/darwin/cctools/port.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 0c8019f5206..caf85b227be 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -125,6 +125,7 @@ let
homepage = http://www.opensource.apple.com/source/cctools/;
description = "MacOS Compiler Tools (cross-platform port)";
license = stdenv.lib.licenses.apsl20;
+ maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
};
};
in stdenv.mkDerivation baseParams
From 8cb7ea7daebcef9c66e5bd4dda3ed7b18b178f03 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Feb 2019 20:51:18 -0500
Subject: [PATCH 474/494] Revert "libcxx: add linker scripts for libc++.a to
ensure libc++abi.a is properly linked"
This reverts commit 72e1764199805ab6e602fa3762a4d95bfdf80cb8.
This causes the GHC panic reported in issue #55848.
---
pkgs/development/compilers/llvm/4/libc++/default.nix | 5 -----
pkgs/development/compilers/llvm/4/libc++/libc++.a | 1 -
pkgs/development/compilers/llvm/5/libc++/default.nix | 5 -----
pkgs/development/compilers/llvm/5/libc++/libc++.a | 1 -
pkgs/development/compilers/llvm/6/libc++/default.nix | 5 -----
pkgs/development/compilers/llvm/6/libc++/libc++.a | 1 -
pkgs/development/compilers/llvm/7/libc++/default.nix | 5 -----
pkgs/development/compilers/llvm/7/libc++/libc++.a | 1 -
8 files changed, 24 deletions(-)
delete mode 100644 pkgs/development/compilers/llvm/4/libc++/libc++.a
delete mode 100644 pkgs/development/compilers/llvm/5/libc++/libc++.a
delete mode 100644 pkgs/development/compilers/llvm/6/libc++/libc++.a
delete mode 100644 pkgs/development/compilers/llvm/7/libc++/libc++.a
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 6344304b84b..2b543b9d793 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/4/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 6dc81e10163..b182f1250e7 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/5/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index b90b6b7b58c..3a165e9da7b 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/6/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 8a13f3eb590..d372984dac7 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -36,11 +36,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/7/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
From 1cab56e01a284d8fb29ae6b07616732f5bd3079b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 7 Feb 2019 03:20:07 +0100
Subject: [PATCH 475/494] buildEnv: break with a proper error if one path is
actually a file
I noticed by creating `buildEnv` where I accidentally put a derivation
from `pkgs.writeText` into `paths` and got a broken build with the
following misleading error message:
```
Use of uninitialized value $stat1 in numeric ne (!=) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 74.
Use of uninitialized value $stat1 in bitwise and (&) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
different permissions in `' and `/nix/store/0vy5ss91laxvwkyvrbld5hv27i88qk5w-noise': 0000 <-> 0444 at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
```
It can be reproduced with an expression like this:
``` nix
{ pkgs ? import <nixpkgs> { } }:
let
file = pkgs.writeText "test" ''
content
'';
in
pkgs.buildEnv {
name = "test-env";
paths = [ /* ... */ file ];
}
```
---
pkgs/build-support/buildenv/builder.pl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 678f5a3fe9e..1f77edf86cb 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -84,6 +84,10 @@ sub checkCollision {
sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ if (-f $target) {
+ die "Path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ }
+
# Urgh, hacky...
return if
$relName eq "/propagated-build-inputs" ||
From 3a078594a138a6b418252fc0a0031bd89187f417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Feb 2019 11:10:00 +0100
Subject: [PATCH 476/494] libpng: always apply the debian patches
This fixes the low-severity CVE on other platforms than aarch64.
---
pkgs/development/libraries/libpng/default.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 206472187b0..765f03d9825 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -18,8 +18,7 @@ in stdenv.mkDerivation rec {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
};
- patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild
- else [
+ patches = [
(fetchurl { # https://github.com/glennrp/libpng/issues/266
url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch";
sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n";
From 9b38f6f09f226d3cb9af0e83b538f5e0833f0064 Mon Sep 17 00:00:00 2001
From: Sam Stites <sam@stites.io>
Date: Tue, 19 Feb 2019 13:21:30 -0500
Subject: [PATCH 477/494] bump cmake to 3.13.4
---
pkgs/development/tools/build-managers/cmake/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 68d4118f049..3d93e59b1a0 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -16,10 +16,10 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
- majorVersion = "3.12";
- minorVersion = "1";
- # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt
- sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
+ majorVersion = "3.13";
+ minorVersion = "4";
+ # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz
+ sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b";
version = "${majorVersion}.${minorVersion}";
in
From 5e3bdbedd30cf16fa20b68b25954f195a3d08937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 14:39:33 +0100
Subject: [PATCH 478/494] python.pkgs.mwclient: use checkInputs
---
pkgs/development/python-modules/mwclient/default.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 591aa6b0477..b100f3fa350 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
-, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, requests, requests_oauthlib, six
+, pytest, pytestpep8, pytestcache, pytestcov, responses, mock
+}:
buildPythonPackage rec {
version = "0.9.3";
pname = "mwclient";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "mwclient";
@@ -13,9 +14,9 @@ buildPythonPackage rec {
sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw";
};
- buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
+ checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ];
- propagatedBuildInputs = [ six requests requests_oauthlib ];
+ propagatedBuildInputs = [ requests requests_oauthlib six ];
checkPhase = ''
py.test
From c1b7deab9f208626f5f2c48e8064033df66a7cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 15:05:16 +0100
Subject: [PATCH 479/494] python.pkgs.git-annex-adapter: use patch to hardcode
git-annex path
---
.../git-annex-adapter/default.nix | 22 +++---
.../git-annex-adapter/git-annex-path.patch | 75 +++++++++++++++++++
2 files changed, 86 insertions(+), 11 deletions(-)
create mode 100644 pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index d8fc12b1c42..ec58825878a 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
-, utillinux, pygit2, gitMinimal, git-annex
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
+, python, utillinux, pygit2, gitMinimal, git-annex
}:
buildPythonPackage rec {
@@ -16,22 +16,22 @@ buildPythonPackage rec {
sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097";
};
- prePatch = ''
- substituteInPlace git_annex_adapter/process.py \
- --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \
- --replace "'git-annex'" "'${git-annex}/bin/git-annex'"
- '';
+ patches = [
+ (substituteAll {
+ src = ./git-annex-path.patch;
+ gitAnnex = "${git-annex}/bin/git-annex";
+ })
+ ];
checkInputs = [
+ gitMinimal
utillinux # `rev` is needed in tests/test_process.py
];
- propagatedBuildInputs = [ pygit2 gitMinimal ];
-
- buildInputs = [ git-annex ];
+ propagatedBuildInputs = [ pygit2 ];
checkPhase = ''
- python -m unittest
+ ${python.interpreter} -m unittest
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
new file mode 100644
index 00000000000..8b1b854058b
--- /dev/null
+++ b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch
@@ -0,0 +1,75 @@
+diff --git a/git_annex_adapter/process.py b/git_annex_adapter/process.py
+index 6ddb985..bbd0ab8 100644
+--- a/git_annex_adapter/process.py
++++ b/git_annex_adapter/process.py
+@@ -389,7 +389,7 @@ class GitAnnexBatchProcess:
+ _procclass = Process
+
+ def __init__(self, args, workdir):
+- self.args = ('git', 'annex', *args)
++ self.args = ('@gitAnnex@', *args)
+ self.workdir = workdir
+ self._process = None
+ self._dead_process = None
+@@ -586,7 +586,7 @@ class ProcessRunner:
+ class GitAnnexRunner(ProcessRunner):
+ """Helper class to run git-annex commands."""
+ def __init__(self, args_prefix, workdir):
+- args_prefix = ('git-annex', *args_prefix)
++ args_prefix = ('@gitAnnex@', *args_prefix)
+ super().__init__(args_prefix, workdir)
+
+ def __call__(self, *args_suffix):
+diff --git a/tests/test_process.py b/tests/test_process.py
+index ed619bb..9335078 100644
+--- a/tests/test_process.py
++++ b/tests/test_process.py
+@@ -181,7 +181,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
+ def test_process_annex_metadata_batch(self):
+ """Process should be able to read one line"""
+ with Process(
+- ['git', 'annex', 'metadata', '--batch', '--json'],
++ ['@gitAnnex@', 'metadata', '--batch', '--json'],
+ str(self.tempdir),
+ ) as proc:
+ proc.writeline(
+@@ -202,7 +202,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
+ def test_jsonprocess_annex_metadata_batch(self):
+ """JsonProcess should encode and decode properly"""
+ with JsonProcess(
+- ['git', 'annex', 'metadata', '--batch', '--json'],
++ ['@gitAnnex@', 'metadata', '--batch', '--json'],
+ str(self.tempdir),
+ ) as proc:
+ obj = proc({'key':'SHA256E-s0--0'})
+@@ -218,7 +218,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
+ def test_process_annex_info_batch(self):
+ """Process should be able to read multiple lines"""
+ with Process(
+- ['git', 'annex', 'info', '--batch'],
++ ['@gitAnnex@', 'info', '--batch'],
+ str(self.tempdir),
+ ) as proc:
+ proc.writeline('here')
+diff --git a/tests/utils.py b/tests/utils.py
+index 281ee3f..969aedc 100644
+--- a/tests/utils.py
++++ b/tests/utils.py
+@@ -107,7 +107,7 @@ class TempAnnexTestCase(TempRepoTestCase):
+ # Have to uninit before cleaning directory, since git-annex
+ # marks its objects read-only so that they don't get deleted.
+ subprocess.run(
+- ['git', 'annex', 'uninit'],
++ ['@gitAnnex@', 'uninit'],
+ cwd=self.repo.workdir,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+@@ -122,7 +122,7 @@ class TempAnnexTestCase(TempRepoTestCase):
+ path.write_text(text)
+
+ subprocess.run(
+- ['git', 'annex', 'add', '--quiet', relpath],
++ ['@gitAnnex@', 'add', '--quiet', relpath],
+ cwd=self.repo.workdir,
+ check=True,
+ )
From 9d2ea84f55c381cfb76ab558be56ff240d973fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 17:31:19 +0100
Subject: [PATCH 480/494] python.pkgs.celery: 4.2.1 -> 4.3.0rc1
Using a pre-release because it currently does not build due to
updated dependencies.
---
.../python-modules/celery/default.nix | 33 +++----------------
1 file changed, 5 insertions(+), 28 deletions(-)
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 498729bb132..c22bb427a34 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,39 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect,
- pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
+{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect
+, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
}:
buildPythonPackage rec {
pname = "celery";
- version = "4.2.1";
+ version = "4.3.0rc1";
src = fetchPypi {
inherit pname version;
- sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp";
+ sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf";
};
- # See https://github.com/celery/celery/issues/4500
- # TODO: Remove once upgraded to 4.3
- disabled = isPy37;
-
- patches = [
- # Skip test_RedisBackend.test_timeouts_in_url_coerced
- # See https://github.com/celery/celery/pull/4847
- (fetchpatch {
- url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch;
- sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq";
- })
- # Allow usage of a newer pytest version
- # See https://github.com/celery/celery/pull/4912
- (fetchpatch {
- url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch;
- sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594";
- })
- ];
-
- postPatch = ''
- substituteInPlace requirements/test.txt --replace ",<3.9" ""
- '';
-
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
@@ -43,7 +20,7 @@ buildPythonPackage rec {
unset NIX_REDIRECTS LD_PRELOAD
'';
- checkInputs = [ pytest case ];
+ checkInputs = [ case pytest boto3 moto ];
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
meta = with stdenv.lib; {
From 4527d4fb7afd2782589d41e15a19781b41f82836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 18:12:01 +0100
Subject: [PATCH 481/494] python.pkgs.paster-pastedeploy: fix tests
compatibility with PasteDeploy 2+
---
.../python-modules/plaster-pastedeploy/default.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index ac6cdc31f48..e794b53950e 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi, fetchpatch
, plaster, PasteDeploy
, pytest, pytestcov
}:
@@ -12,6 +12,15 @@ buildPythonPackage rec {
sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae";
};
+ patches = [
+ # Fix tests compatibility with PasteDeploy 2+
+ # https://github.com/Pylons/plaster_pastedeploy/pull/17
+ (fetchpatch {
+ url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch;
+ sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf";
+ })
+ ];
+
checkPhase = ''
py.test
'';
From 4b8049ee4a6c90b7429fbc149d963bc8c75b7d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 19:55:45 +0100
Subject: [PATCH 482/494] python.pkgs.readthedocs-sphinx-ext: init at 0.5.16
---
.../readthedocs-sphinx-ext/default.nix | 36 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 38 insertions(+)
create mode 100644 pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
new file mode 100644
index 00000000000..d5515614d5b
--- /dev/null
+++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, pytest
+, mock
+, sphinx
+}:
+
+buildPythonPackage rec {
+ pname = "readthedocs-sphinx-ext";
+ version = "0.5.16";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "42b1c63d63dd483a188b541599bd08a540b2d08ec2b166660179618b6ccc3bb0";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [ pytest mock sphinx ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ # https://github.com/rtfd/readthedocs-sphinx-ext/pull/60
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Sphinx extension for Read the Docs overrides";
+ homepage = http://github.com/rtfd/readthedocs-sphinx-ext;
+ # Not sure which one: https://github.com/rtfd/readthedocs-sphinx-ext/issues/59
+ license = licenses.bsdOriginal;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 274db7720f1..7ac5263e30a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3989,6 +3989,8 @@ in {
owslib = callPackage ../development/python-modules/owslib { };
+ readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { };
+
resampy = callPackage ../development/python-modules/resampy { };
restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { };
From 8cf396442dde4bbdf16f295bd4baa584d86fe7d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 19:57:06 +0100
Subject: [PATCH 483/494] python.pkgs.sphinx_rtd_theme: fix tests
---
.../python-modules/sphinx_rtd_theme/default.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index fcdb3abbe66..515f6b6156a 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -2,6 +2,8 @@
, buildPythonPackage
, fetchPypi
, sphinx
+, readthedocs-sphinx-ext
+, pytest
}:
buildPythonPackage rec {
@@ -15,6 +17,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ sphinx ];
+ checkInputs = [ readthedocs-sphinx-ext pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
meta = with stdenv.lib; {
description = "ReadTheDocs.org theme for Sphinx";
homepage = https://github.com/snide/sphinx_rtd_theme/;
From 4348c8a0ba49b1f12e4fd74415f71d9ce22b8605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 19:59:03 +0100
Subject: [PATCH 484/494] python.pkgs.soco: use pytest_3
Otherwise, we get
[pytest] section in setup.cfg files is no longer supported,
change to [tool:pytest] instead
---
pkgs/development/python-modules/soco/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index d039756eb81..4c938490eb4 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
# Test dependencies
-, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
+, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
, sphinx_rtd_theme
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ xmltodict requests ];
checkInputs = [
- pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
+ pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx
sphinx_rtd_theme
];
From 5124cf7a1487a6e65665f11b26ea0a17c29d4884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 20:07:21 +0100
Subject: [PATCH 485/494] beets: use checkInputs
---
pkgs/tools/audio/beets/default.nix | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 8d2bf5e634c..070a2bec314 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -140,19 +140,22 @@ in pythonPackages.buildPythonApplication rec {
++ optional enableAlternatives plugins.alternatives
++ optional enableCopyArtifacts plugins.copyartifacts;
- buildInputs = with pythonPackages; [
- beautifulsoup4
+ buildInputs = [
imagemagick
- mock
- nose
- rarfile
- responses
] ++ (with gst_all_1; [
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
]);
+ checkInputs = with pythonPackages; [
+ beautifulsoup4
+ mock
+ nose
+ rarfile
+ responses
+ ];
+
patches = [
./replaygain-default-bs1770gain.patch
./keyfinder-default-bin.patch
@@ -212,9 +215,7 @@ in pythonPackages.buildPythonApplication rec {
LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \
BEETS_TEST_SHELL="${testShell}" \
BASH_COMPLETION_SCRIPT="${completion}" \
- HOME="$(mktemp -d)" \
- # Exclude failing test https://github.com/beetbox/beets/issues/2652
- nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash
+ HOME="$(mktemp -d)" nosetests -v
runHook postCheck
'';
From c01276654e900cc5eabfb689fc0728316314b6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 20:27:31 +0100
Subject: [PATCH 486/494] python.pkgs.pygame: fix build
after setting `strictDeps = true;`
---
pkgs/development/python-modules/pygame/default.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 8fbd73dfc1f..199107022df 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11
+{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
}:
@@ -6,11 +6,15 @@ buildPythonPackage rec {
pname = "pygame";
version = "1.9.4";
- src = fetchurl {
- url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6";
};
+ nativeBuildInputs = [
+ pkg-config SDL
+ ];
+
buildInputs = [
SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
portmidi libX11 freetype
@@ -35,7 +39,7 @@ buildPythonPackage rec {
LOCALBASE=/ ${python.interpreter} config.py
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Python library for games";
homepage = http://www.pygame.org/;
license = licenses.lgpl21Plus;
From eb22e4c775a9cbed876bfc743a59cc314f11b75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 20:32:04 +0100
Subject: [PATCH 487/494] python.pkgs.fb-re2: no tests in tarball
---
pkgs/development/python-modules/fb-re2/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
index 0cdfd287647..40a1d759c12 100644
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ b/pkgs/development/python-modules/fb-re2/default.nix
@@ -16,10 +16,8 @@ buildPythonPackage rec {
buildInputs = [ re2 ];
- checkInputs = [ pytest ];
- checkPhase = ''
- py.test
- '';
+ # no tests in PyPI tarball
+ doCheck = false;
meta = {
description = "Python wrapper for Google's RE2";
From c335003b8d2b7f72ca5d6d70a13c8bc1f95b1497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 21:02:45 +0100
Subject: [PATCH 488/494] octoprint: ignore version constraints
---
pkgs/applications/misc/octoprint/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 4a5ec16f3e3..513e0882d5a 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -32,14 +32,17 @@ let
"flask"
"future"
"futures"
+ "monotonic"
"pkginfo"
"psutil"
"pyserial"
"python-dateutil"
"requests"
"rsa"
+ "sarge"
"scandir"
"semantic_version"
+ "watchdog"
"websocket-client"
"werkzeug"
"wrapt"
From 080832f411a9ce87154c1fea56e43ee165acb729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 20 Feb 2019 21:09:17 +0100
Subject: [PATCH 489/494] octoprint: fix tests
---
pkgs/applications/misc/octoprint/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 513e0882d5a..e173f6d0d7d 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -78,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
setup.py
'';
- checkPhase = "nosetests";
+ checkPhase = ''
+ HOME=$(mktemp -d) nosetests
+ '';
meta = with stdenv.lib; {
homepage = https://octoprint.org/;
From 9fcd3bffc2f6d5d91d72973eca3cc5b2993fddba Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 20 Feb 2019 10:41:20 +0100
Subject: [PATCH 490/494] buildEnv: improve file check to avoid false-positives
The original change in #55372 was supposed to fix the case where a store
path which is a file should be placed into `buildEnv` which broke with a
fairly misleading Perl error.
Unfortunately this introduced a regression, `findFiles` can have targets
that are files if the file isn't a store path. Rather than adding more
obscure checks with probably further regressions, I figured that it's
better to replicate the behavior of `lib.isStorePath` and explicitly
check if the store path is a file and break in this case only.
This should also fix recent staging issues.
---
pkgs/build-support/buildenv/builder.pl | 12 ++++++++++--
pkgs/build-support/buildenv/default.nix | 11 +++++++++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 1f77edf86cb..b699d762d29 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -26,6 +26,13 @@ sub isInPathsToLink {
return 0;
}
+# Similar to `lib.isStorePath`
+sub isStorePath {
+ my $path = shift;
+ my $storePath = "@storeDir@";
+
+ return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
+}
# For each activated package, determine what symlinks to create.
@@ -84,8 +91,9 @@ sub checkCollision {
sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
- if (-f $target) {
- die "Path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ # The store path must not be a file
+ if (-f $target && isStorePath $target) {
+ die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
}
# Urgh, hacky...
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 41a1e67ef42..f858048d694 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution.
-{ buildPackages, runCommand, lib }:
+{ buildPackages, runCommand, lib, substituteAll }:
lib.makeOverridable
({ name
@@ -43,6 +43,13 @@ lib.makeOverridable
, meta ? {}
}:
+let
+ builder = substituteAll {
+ src = ./builder.pl;
+ inherit (builtins) storeDir;
+ };
+in
+
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
@@ -67,6 +74,6 @@ runCommand name
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
}
''
- ${buildPackages.perl}/bin/perl -w ${./builder.pl}
+ ${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild"
'')
From c1d1bd2391d66c997cb4d4d136f751439c8a84f6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 20 Feb 2019 21:50:31 -0600
Subject: [PATCH 491/494] file: 5.35 -> 5.36
https://mailman.astron.com/pipermail/file/2019-February/000073.html
---
pkgs/tools/misc/file/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index cefddbd65ef..ed31d01f09d 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "file-${version}";
- version = "5.35";
+ version = "5.36";
src = fetchurl {
urls = [
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"https://distfiles.macports.org/file/${name}.tar.gz"
];
- sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h";
+ sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v";
};
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
From c2239ffde61d6ac07af333b8c12cbbd804257437 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 21 Feb 2019 17:10:39 -0600
Subject: [PATCH 492/494] Revert "file: 5.35 -> 5.36"
---
pkgs/tools/misc/file/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index ed31d01f09d..cefddbd65ef 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "file-${version}";
- version = "5.36";
+ version = "5.35";
src = fetchurl {
urls = [
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"https://distfiles.macports.org/file/${name}.tar.gz"
];
- sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v";
+ sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h";
};
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
From c7a1b77a670e6ca7a5ecbef55f1814e5916f3c83 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Feb 2019 01:50:28 -0600
Subject: [PATCH 493/494] nghttp2: 1.35.1 -> 1.36.0
https://github.com/nghttp2/nghttp2/releases/tag/v1.36.0
---
pkgs/development/libraries/nghttp2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index fdc21b26271..971c70c4f2c 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
- version = "1.35.1";
+ version = "1.36.0";
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
- sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam";
+ sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn";
};
outputs = [ "bin" "out" "dev" "lib" ];
From e1895a52a6c2e69966a7a70e0e31c347355c27c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 22 Feb 2019 10:05:40 +0100
Subject: [PATCH 494/494] python: readthedocs-sphinx-ext: 0.5.16 -> 0.5.17
---
.../python-modules/readthedocs-sphinx-ext/default.nix | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
index d5515614d5b..6f85280979b 100644
--- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
+++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "readthedocs-sphinx-ext";
- version = "0.5.16";
+ version = "0.5.17";
src = fetchPypi {
inherit pname version;
- sha256 = "42b1c63d63dd483a188b541599bd08a540b2d08ec2b166660179618b6ccc3bb0";
+ sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff";
};
propagatedBuildInputs = [ requests ];
@@ -24,13 +24,9 @@ buildPythonPackage rec {
py.test
'';
- # https://github.com/rtfd/readthedocs-sphinx-ext/pull/60
- doCheck = false;
-
meta = with lib; {
description = "Sphinx extension for Read the Docs overrides";
homepage = http://github.com/rtfd/readthedocs-sphinx-ext;
- # Not sure which one: https://github.com/rtfd/readthedocs-sphinx-ext/issues/59
- license = licenses.bsdOriginal;
+ license = licenses.mit;
};
}