From 9745611ed6464998f56b6fb25fdf7216b29a38c2 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 00:40:23 -0400
Subject: [PATCH 001/282] lammps: 16Feb16 -> patch_2Aug2018

Major changes and update to lammps build

 - using fetchFromGitHub to get source instead of lammps mirror
 - configurable lammps packages included and includes for compilation
 - cleaner build script
 - preserving the executable, shared library names, and include headers
---
 .../molecular-dynamics/lammps/default.nix     | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index 9a89b88d7a5..03e37ad9d93 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -1,25 +1,37 @@
-{ stdenv, writeText, fetchurl,
-  libpng, fftw,
-  mpiSupport ? false, mpi ? null
+{ lib
+, bash
+, stdenv
+, writeText
+, fetchFromGitHub
+, libpng
+, gzip
+, fftw
+, openblas
+, mpiSupport ? false, mpi ? null
 }:
 
 assert mpiSupport -> mpi != null;
 
 stdenv.mkDerivation rec {
   # LAMMPS has weird versioning converted to ISO 8601 format
-  version = "2016-02-16";
+  version = "patch_2Aug2018";
   name = "lammps-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lammps/lammps-16Feb16.tar.gz";
-    sha256 = "1yzfbkxma3xa1288rnn66h4w0smbmjkwq1fx1y60pjiw0prmk105";
+  lammps_packages = "asphere body class2 colloid compress coreshell dipole granular kspace manybody mc misc molecule opt peri qeq replica rigid shock snap srd user-reaxc";
+  lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64";
+
+  src = fetchFromGitHub {
+    owner = "lammps";
+    repo = "lammps";
+    rev = "${version}";
+    sha256 = "1ph9pr7s11wgmspmnhxa55bh1pq2cyl8iimfi62lbpbpl9pr1ilc";
   };
 
   passthru = {
     inherit mpi;
   };
 
-  buildInputs = [ fftw libpng ]
+  buildInputs = [ fftw libpng openblas gzip bash ]
   ++ (stdenv.lib.optionals mpiSupport [ mpi ]);
 
   # Must do manual build due to LAMMPS requiring a seperate build for
@@ -27,13 +39,19 @@ stdenv.mkDerivation rec {
   builder = writeText "builder.sh" ''
     source $stdenv/setup
 
-    tar xzf $src
-    cd lammps-*/src
-    make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
-    make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    mkdir lammps
+    cp -r $src/lib $src/src lammps
+    chmod -R 755 lammps/src/
+    cd lammps/src
+    for pack in ${lammps_packages}; do make "yes-$pack" SHELL=$SHELL; done
+    make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
 
     mkdir -p $out/bin
-    cp -v lmp_* $out/bin/lammps
+    cp -v lmp_* $out/bin/
+
+    mkdir -p $out/include
+    cp -v *.h $out/include/
 
     mkdir -p $out/lib
     cp -v liblammps* $out/lib/
@@ -51,5 +69,6 @@ stdenv.mkDerivation rec {
     homepage = http://lammps.sandia.gov;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ costrouc ];
   };
 }

From 90c353d44e6c89cb77d05e5452120386b65fc919 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:36:50 -0400
Subject: [PATCH 002/282] pythonPackages.py-cpuinfo: init at 4.0.0

 - fetchFromGitHub to run all tests
 - all tests pass
---
 .../python-modules/py-cpuinfo/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-cpuinfo/default.nix

diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
new file mode 100644
index 00000000000..37cf601695e
--- /dev/null
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+}:
+
+buildPythonPackage rec {
+  pname = "py-cpuinfo";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+     owner = "workhorsy";
+     repo = pname;
+     rev = "v${version}";
+     sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm";
+  };
+
+  meta = {
+    description = "Get CPU info with pure Python 2 & 3";
+    homepage = https://github.com/workhorsy/py-cpuinfo;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af1895d9d14..c28a824ae34 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -384,6 +384,8 @@ in {
 
   PyChromecast = callPackage ../development/python-modules/pychromecast { };
 
+  py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { };
+
   pydbus = callPackage ../development/python-modules/pydbus { };
 
   pydocstyle = callPackage ../development/python-modules/pydocstyle { };

From 6e9d37713a867946d299491d241ce16a815dd539 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:37:45 -0400
Subject: [PATCH 003/282] pythonPackages.statistics: init at 1.0.3.5

 - package does not come with tests
---
 .../python-modules/statistics/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/statistics/default.nix

diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix
new file mode 100644
index 00000000000..4380e592ff5
--- /dev/null
+++ b/pkgs/development/python-modules/statistics/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, docutils
+}:
+
+buildPythonPackage rec {
+  pname = "statistics";
+  version = "1.0.3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2dc379b80b07bf2ddd5488cad06b2b9531da4dd31edb04dc9ec0dc226486c138";
+  };
+
+  propagatedBuildInputs = [ docutils ];
+
+  # statistics package does not have any tests
+  doCheck = false;
+
+  meta = {
+    description = "A Python 2.* port of 3.4 Statistics Module";
+    homepage = https://github.com/digitalemagine/py-statistics;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c28a824ae34..fdf3e91cbb9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -509,6 +509,8 @@ in {
 
   spglib = callPackage ../development/python-modules/spglib { };
 
+  statistics = callPackage ../development/python-modules/statistics { };
+
   sumo = callPackage ../development/python-modules/sumo { };
 
   supervise_api = callPackage ../development/python-modules/supervise_api { };

From eb6e376753619cb1fcb57e3ef2075e836ec9dd3e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:38:38 -0400
Subject: [PATCH 004/282] pythonPackages.pytest-benchmark: init at 3.1.1

 - fetchFromGitHub to get all tests
 - all tests pass
 - python 2.7, 3+
---
 .../pytest-benchmark/default.nix              | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-benchmark/default.nix

diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
new file mode 100644
index 00000000000..0f3475f715d
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestrunner
+, pytest
+, py-cpuinfo
+, pythonOlder
+, pathlib
+, statistics
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-benchmark";
+  version = "3.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ionelmc";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ch079dlc6c9ag74dh4dg6plkmh0h8kn78ari3fgadc75bald71m";
+  };
+
+  propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optional (pythonOlder "3.4") [ pathlib statistics ];
+
+  meta = {
+    description = "Py.test fixture for benchmarking code";
+    homepage = https://github.com/ionelmc/pytest-benchmark;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fdf3e91cbb9..c2a1237e4e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1844,6 +1844,8 @@ in {
 
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
 
+  pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { };
+
   pytestcache = callPackage ../development/python-modules/pytestcache { };
 
   pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { };

From da136c461865d29d6502c7b4b347552c81185ac3 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:39:53 -0400
Subject: [PATCH 005/282] pythonPackages.docutils: refactored

 - moved docutils to `python-modules`
---
 .../python-modules/docutils/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 33 ++---------------
 2 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/python-modules/docutils/default.nix

diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
new file mode 100644
index 00000000000..c31cfceebba
--- /dev/null
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, isPy3k
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "docutils";
+  version = "0.14";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/docutils/${pname}.tar.gz";
+    sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+  };
+
+  checkPhase = if isPy3k then ''
+    ${python.interpreter} test3/alltests.py
+  '' else ''
+    ${python.interpreter} test/alltests.py
+  '';
+
+  # Create symlinks lacking a ".py" suffix, many programs depend on these names
+  postFixup = ''
+    (cd $out/bin && for f in *.py; do
+      ln -s $f $(echo $f | sed -e 's/\.py$//')
+    done)
+  '';
+
+  meta = {
+    description = "Docutils -- Python Documentation Utilities";
+    homepage = http://docutils.sourceforge.net/;
+    maintainers = with lib.maintainers; [ garbas AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2a1237e4e9..8e9ff72c752 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -272,6 +272,8 @@ in {
 
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
+  docutils = callPackage ../development/python-modules/docutils { };
+
   dogtail = callPackage ../development/python-modules/dogtail { };
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
@@ -5006,37 +5008,6 @@ in {
     };
   };
 
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-${version}";
-    version = "0.14";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/docutils/${name}.tar.gz";
-      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
-    };
-
-    checkPhase = if isPy3k then ''
-      ${python.interpreter} test3/alltests.py
-    '' else ''
-      ${python.interpreter} test/alltests.py
-    '';
-
-    # Create symlinks lacking a ".py" suffix, many programs depend on these names
-    postFixup = ''
-      (cd $out/bin && for f in *.py; do
-        ln -s $f $(echo $f | sed -e 's/\.py$//')
-      done)
-    '';
-
-    meta = {
-      description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX";
-      homepage = http://docutils.sourceforge.net/;
-      maintainers = with maintainers; [ garbas AndersonTorres ];
-    };
-  };
-
-
   dtopt = buildPythonPackage rec {
     name = "dtopt-0.1";
 

From 0513a0054dc5e0953cc5123ef1ac11707b059aaf Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:40:45 -0400
Subject: [PATCH 006/282] pythonPackages.pathlib: init at 1.0.1

 - python 2.7, 3+
 - all tests pass
 - package is depricated but is required by a package
---
 .../python-modules/pathlib/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 ++-------------
 2 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/pathlib/default.nix

diff --git a/pkgs/development/python-modules/pathlib/default.nix b/pkgs/development/python-modules/pathlib/default.nix
new file mode 100644
index 00000000000..d70178dac85
--- /dev/null
+++ b/pkgs/development/python-modules/pathlib/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  pname = "pathlib";
+  version = "1.0.1";
+  disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = {
+    description = "Object-oriented filesystem paths";
+    homepage = https://pathlib.readthedocs.org/;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e9ff72c752..c8b4a8ace41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -344,6 +344,8 @@ in {
 
   palettable = callPackage ../development/python-modules/palettable { };
 
+  pathlib = callPackage ../development/python-modules/pathlib { };
+
   pdf2image = callPackage ../development/python-modules/pdf2image { };
 
   pdfminer = callPackage ../development/python-modules/pdfminer_six { };
@@ -9458,27 +9460,6 @@ in {
 
   patator = callPackage ../development/python-modules/patator { };
 
-  pathlib = buildPythonPackage rec {
-    name = "pathlib-${version}";
-    version = "1.0.1";
-    disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pathlib/${name}.tar.gz";
-      sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    meta = {
-      description = "Object-oriented filesystem paths";
-      homepage = "https://pathlib.readthedocs.org/";
-      license = licenses.mit;
-    };
-  };
-
   pathlib2 = callPackage ../development/python-modules/pathlib2 { };
 
   pathpy = callPackage ../development/python-modules/path.py { };

From 4716facdd18213e1627b0610ef226965ec709cf8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:41:46 -0400
Subject: [PATCH 007/282] pythonPackage.ase: init at 3.16.2

 - tests just hang so skipping tests
 - python 2.7, 3+
 - repository is in gitlab so had to fetchurl
---
 .../python-modules/ase/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/ase/default.nix

diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
new file mode 100644
index 00000000000..1f7b9419278
--- /dev/null
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, numpy
+, scipy
+, matplotlib
+, flask
+, pillow
+, psycopg2
+}:
+
+buildPythonPackage rec {
+  version = "3.16.2";
+  pname = "ase";
+
+  src = fetchurl {
+     url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
+     sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds";
+  };
+
+  propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
+
+  checkPhase = ''
+    $out/bin/ase test
+  '';
+
+  # tests just hang most likely due to something with subprocesses and cli
+  doCheck = false;
+
+  meta = {
+    description = "Atomic Simulation Environment";
+    homepage = https://wiki.fysik.dtu.dk/ase/;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8b4a8ace41..d48741ce8a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -182,6 +182,8 @@ in {
 
   asana = callPackage ../development/python-modules/asana { };
 
+  ase = callPackage ../development/python-modules/ase { };
+
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 
   aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };

From def307e476da03fa282633abfabfb45578700347 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:42:52 -0400
Subject: [PATCH 008/282] pagmo2: init at 2.8

 - c++ headers for library
 - parallel optimization framework
 - all tests but 1/55 pass so skipping tests
---
 pkgs/development/libraries/pagmo2/default.nix | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/libraries/pagmo2/default.nix

diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
new file mode 100644
index 00000000000..367cef46dc4
--- /dev/null
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, cmake
+, eigen
+, nlopt
+, ipopt
+, boost
+, writeText
+}:
+
+stdenv.mkDerivation rec {
+  name = "pagmo2-${version}";
+  version = "2.8";
+
+  src = fetchFromGitHub {
+     owner = "esa";
+     repo = "pagmo2";
+     rev = "v${version}";
+     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
+  };
+
+  buildInputs = [ cmake eigen nlopt ipopt boost ];
+
+  preBuild = ''
+    cp -r $src/* .
+  '';
+
+  cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no"
+                 "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes"
+                 "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
+                 "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
+
+  checkPhase = ''
+    ctest
+  '';
+
+  # All but one test pass skip for now (tests also take about 30 min to compile)
+  doCheck = false;
+
+  meta = {
+    homepage = https://esa.github.io/pagmo2/;
+    description = "Scientific library for massively parallel optimization";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1340020d5b9..a4a6f2cbd66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4419,6 +4419,8 @@ with pkgs;
 
   padthv1 = callPackage ../applications/audio/padthv1 { };
 
+  pagmo2 = callPackage ../development/libraries/pagmo2 { };
+
   pakcs = callPackage ../development/compilers/pakcs {};
 
   pal = callPackage ../tools/misc/pal { };

From ff27546351e00f62dd21d0334a0df2279160d084 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:43:58 -0400
Subject: [PATCH 009/282] pythonPackages.pygmo: init at 2.8

 - python 2.7, 3+
 - skipping tests becuase none are easy to run (require some parallel workers)
 - fetchFromgitHub so that running tests in future is possible
---
 .../python-modules/pygmo/default.nix          | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/pygmo/default.nix

diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix
new file mode 100644
index 00000000000..2500121dc9e
--- /dev/null
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, cmake
+, eigen
+, nlopt
+, ipopt
+, boost
+, pagmo2
+, numpy
+, cloudpickle
+, ipyparallel
+, numba
+}:
+
+buildPythonPackage rec {
+  pname = "pygmo";
+  version = "2.8";
+
+  src = fetchFromGitHub {
+     owner = "esa";
+     repo = "pagmo2";
+     rev = "v${version}";
+     sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
+  };
+
+  buildInputs = [ cmake eigen nlopt ipopt boost pagmo2 ];
+  propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ];
+
+  preBuild = ''
+    cp -v -r $src/* .
+    cmake -DCMAKE_INSTALL_PREFIX=$out -DPAGMO_BUILD_TESTS=no -DCMAKE_SYSTEM_NAME=Linux -DPagmo_DIR=${pagmo2} -DPAGMO_BUILD_PYGMO=yes -DPAGMO_BUILD_PAGMO=no -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so -DPAGMO_WITH_IPOPT=yes -DIPOPT=${ipopt}
+
+    make install
+    mv $out/lib/python*/site-packages/pygmo wheel
+    cd wheel
+  '';
+
+  # dont do tests
+  doCheck = false;
+
+  meta = {
+    description = "Parallel optimisation for Python";
+    homepage = https://esa.github.io/pagmo2/;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d48741ce8a4..8399005534f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -408,6 +408,8 @@ in {
 
   pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
 
+  pygmo = callPackage ../development/python-modules/pygmo { };
+
   pygobject2 = callPackage ../development/python-modules/pygobject { };
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };

From fb40e62657337f254dcf28157765d86cb60e2183 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:45:38 -0400
Subject: [PATCH 010/282] pythonPackages.pymatgen-lammps: init at 0.4.5

 - all tests pass
 - python 3+
 - fetchurl since package is on gitlab
---
 .../pymatgen-lammps/default.nix               | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymatgen-lammps/default.nix

diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix
new file mode 100644
index 00000000000..dbe9107c7c8
--- /dev/null
+++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pymatgen
+, lammps
+, pytestrunner
+, pytest
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "pymatgen-lammps";
+  version = "0.4.5";
+  disabled = (!isPy3k);
+
+  src = fetchurl {
+     url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
+     sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx";
+  };
+
+  buildInputs = [ pytestrunner ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ pymatgen ];
+
+  meta = {
+    description = "A LAMMPS wrapper using pymatgen";
+    homepage = https://gitlab.com/costrouc/pymatgen-lammps;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8399005534f..a74d0bc8579 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -439,6 +439,8 @@ in {
 
   pymatgen = callPackage ../development/python-modules/pymatgen { };
 
+  pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
+
   pynisher = callPackage ../development/python-modules/pynisher { };
 
   pyparser = callPackage ../development/python-modules/pyparser { };

From dc552ab32e5cf266d3a4592323fbe7196169a1ab Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:46:44 -0400
Subject: [PATCH 011/282] pythonPackages.lammps-cython: init at 0.5.7

 - python 3+
 - all tests pass
 - fetchurl since project based in gitlab and to run tests
---
 .../python-modules/lammps-cython/default.nix  | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/lammps-cython/default.nix

diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix
new file mode 100644
index 00000000000..501e4adc21d
--- /dev/null
+++ b/pkgs/development/python-modules/lammps-cython/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, lammps-mpi
+, mpi
+, mpi4py
+, numpy
+, cython
+, pymatgen
+, ase
+, pytestrunner
+, pytest
+, pytestcov
+, isPy3k
+, openssh
+}:
+
+buildPythonPackage rec {
+  pname = "lammps-cython";
+  version = "0.5.7";
+  disabled = (!isPy3k);
+
+  src = fetchurl {
+     url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
+     sha256 = "1wj9scmjdl00af13b5ihfccrjpikrdgkzd88ialam1nkxvxi42bl";
+  };
+
+  buildInputs = [ cython pytestrunner ];
+  checkInputs = [ pytest pytestcov openssh ];
+  propagatedBuildInputs = [ mpi4py pymatgen ase numpy ];
+
+  preBuild = ''
+    echo "Creating lammps.cfg file..."
+    cat << EOF > lammps.cfg
+    [lammps]
+    lammps_include_dir = ${lammps-mpi}/include
+    lammps_library_dir = ${lammps-mpi}/lib
+    lammps_library = lammps_mpi
+
+    [mpi]
+    mpi_include_dir = ${mpi}/include
+    mpi_library_dir = ${mpi}/lib
+    mpi_library     = mpi
+    EOF
+  '';
+
+  meta = {
+    description = "Pythonic Wrapper to LAMMPS using cython";
+    homepage = https://gitlab.com/costrouc/lammps-cython;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a74d0bc8579..f1499b5d42a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -308,6 +308,10 @@ in {
 
   jira = callPackage ../development/python-modules/jira { };
 
+  lammps-cython = callPackage ../development/python-modules/lammps-cython {
+    mpi = pkgs.openmpi;
+  };
+
   lmtpd = callPackage ../development/python-modules/lmtpd { };
 
   logster = callPackage ../development/python-modules/logster { };

From 058e22e0a3bd3bda79ab6bba6421b8d134907ab6 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 10 Aug 2018 16:47:46 -0400
Subject: [PATCH 012/282] pythonPackages.dftfit: init at 0.4.11

 - tests require lfs download so not run
 - python 3+
 - fetchpypi since fetchurl is large download
---
 .../python-modules/dftfit/default.nix         | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/dftfit/default.nix

diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix
new file mode 100644
index 00000000000..711f4ac1e0e
--- /dev/null
+++ b/pkgs/development/python-modules/dftfit/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pymatgen
+, marshmallow
+, pyyaml
+, pygmo
+, pandas
+, scipy
+, numpy
+, scikitlearn
+, lammps-cython
+, pymatgen-lammps
+, pytestrunner
+, pytest
+, pytestcov
+, pytest-benchmark
+, isPy3k
+, openssh
+}:
+
+buildPythonPackage rec {
+  pname = "dftfit";
+  version = "0.4.11";
+  disabled = (!isPy3k);
+
+  src = fetchPypi {
+     inherit pname version;
+     sha256 = "c6e36a793f9f94746bb8a04fb8316404aeacfa918704de07b15e1b4b8b62242d";
+  };
+
+  buildInputs = [ pytestrunner ];
+  checkInputs = [ pytest pytestcov pytest-benchmark openssh ];
+  propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo
+                            pandas scipy numpy scikitlearn
+                            lammps-cython pymatgen-lammps ];
+
+  # tests require git lfs download. and is quite large so skip tests
+  doCheck = false;
+
+  meta = {
+    description = "Ab-Initio Molecular Dynamics Potential Development";
+    homepage = https://gitlab.com/costrouc/dftfit;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1499b5d42a..8240e7b9557 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -264,6 +264,8 @@ in {
     dbus = pkgs.dbus;
   };
 
+  dftfit = callPackage ../development/python-modules/dftfit { };
+
   discid = callPackage ../development/python-modules/discid { };
 
   discordpy = callPackage ../development/python-modules/discordpy { };

From 26d5d030fe498b64a307af35ff96ff215ccd967a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 17 Aug 2018 14:49:52 +0200
Subject: [PATCH 013/282] openblas: add pkg-config aliases

---
 pkgs/applications/science/math/sage/default.nix | 10 +++-------
 .../science/math/sage/openblas-pc.nix           | 17 -----------------
 .../applications/science/math/sage/sage-env.nix |  6 +++---
 .../science/math/sage/sage-with-env.nix         |  6 ------
 pkgs/applications/science/math/sage/sagelib.nix |  7 +------
 .../libraries/science/math/openblas/default.nix | 14 ++++++++++++++
 6 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/science/math/sage/openblas-pc.nix

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 7e62f0cf75e..08e3a752b8b 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -21,7 +21,7 @@ let
 
       sagelib = self.callPackage ./sagelib.nix {
         inherit flint ecl arb;
-        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        inherit sage-src pynac singular;
         linbox = nixpkgs.linbox.override { withSage = true; };
       };
 
@@ -41,13 +41,13 @@ let
       };
 
       sage-env = self.callPackage ./sage-env.nix {
-        inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
+        inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
       };
 
       sage-with-env = self.callPackage ./sage-with-env.nix {
         inherit pythonEnv;
-        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        inherit sage-src pynac singular;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
         three = nodePackages_8_x.three;
       };
@@ -60,10 +60,6 @@ let
     };
   };
 
-  openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
-  openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
-  openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
-
   sage-src = callPackage ./sage-src.nix {};
 
   pythonRuntimeDeps = with python.pkgs; [
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
deleted file mode 100644
index f4669a6557e..00000000000
--- a/pkgs/applications/science/math/sage/openblas-pc.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ openblasCompat
-, writeTextFile
-, name
-}:
-
-writeTextFile {
-  name = "openblas-${name}-pc-${openblasCompat.version}";
-  destination = "/lib/pkgconfig/${name}.pc";
-  text = ''
-    Name: ${name}
-    Version: ${openblasCompat.version}
-
-    Description: ${name} for SageMath, provided by the OpenBLAS package.
-    Cflags: -I${openblasCompat}/include
-    Libs: -L${openblasCompat}/lib -lopenblas
-  '';
-}
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 317eb6e16c4..74c2e0aa036 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -37,7 +37,7 @@
 , lcalc
 , rubiks
 , flintqs
-, openblas-cblas-pc
+, openblasCompat
 , flint
 , gmp
 , mpfr
@@ -98,9 +98,9 @@ writeTextFile rec {
     export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
         # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
         # for it outside of the tests. However since singular and openblas are runtime dependencies anyways
-        # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
+        # it doesn't really hurt to include.
         singular
-        openblas-cblas-pc
+        openblasCompat
       ])
     }'
     export SAGE_ROOT='${sage-src}'
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 63b9772b823..8ccf8b5a493 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -4,9 +4,6 @@
 , sage-env
 , sage-src
 , openblasCompat
-, openblas-blas-pc
-, openblas-cblas-pc
-, openblas-lapack-pc
 , pkg-config
 , three
 , singular
@@ -32,9 +29,6 @@ let
     makeWrapper
     pkg-config
     openblasCompat # lots of segfaults with regular (64 bit) openblas
-    openblas-blas-pc
-    openblas-cblas-pc
-    openblas-lapack-pc
     singular
     three
     pynac
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index abcefba5e26..c1dbcf38304 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -3,9 +3,6 @@
 , buildPythonPackage
 , arb
 , openblasCompat
-, openblas-blas-pc
-, openblas-cblas-pc
-, openblas-lapack-pc
 , brial
 , cliquer
 , cypari2
@@ -59,9 +56,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    openblas-blas-pc
-    openblas-cblas-pc
-    openblas-lapack-pc
+    openblasCompat
     jupyter_core
   ];
 
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e00a5ca9f8d..ced200f905c 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -136,6 +136,20 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "tests";
 
+  postInstall = ''
+    # Write pkgconfig aliases. Upstream report:
+    # https://github.com/xianyi/OpenBLAS/issues/1740
+    for alias in blas cblas lapack; do
+      cat <<EOF > $out/lib/pkgconfig/openblas-$alias.pc
+Name: $alias
+Version: ${version}
+Description: $alias provided by the OpenBLAS package.
+Cflags: -I$out/include
+Libs: -L$out/lib -lopenblas
+EOF
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;

From 5a4bdba25b982b421fc3fcea9cd20d58cf6fa834 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 12:09:08 +0200
Subject: [PATCH 014/282] Flexget: 2.14.9 -> 2.14.18

---
 pkgs/applications/networking/flexget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 87c7bddab6f..2ba5213bcc5 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -40,7 +40,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q";
+    sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9";
   };
 
   postPatch = ''

From ea1b4c7a9689067d9fde159de8ecc577f3635500 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 12:10:33 +0200
Subject: [PATCH 015/282] Flexget: 2.14.9 -> 2.14.18

---
 pkgs/applications/networking/flexget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 2ba5213bcc5..53ee46e2060 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,7 +36,7 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.14.9";
+  version = "2.14.18";
 
   src = fetchPypi {
     inherit pname version;

From fb70ad3d6010d77b26a14ba44d80b8f138e07a90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 03:57:05 -0700
Subject: [PATCH 016/282] hdf5-threadsafe: 1.10.2 -> 1.10.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hdf5-threadsafe/versions.
---
 pkgs/tools/misc/hdf5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 31813c0b880..e481a31e926 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -16,11 +16,11 @@ assert !cpp || mpi == null;
 let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
-  version = "1.10.2";
+  version = "1.10.3";
   name = "hdf5-${version}";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
-    sha256 = "0wfb3w6dzi6zr2g1sdswqy9lxbp7yr4blvyi7k2xya7izmxmpb8w";
+    sha256 = "1a85v6812afi6k3gmfdcj80f6ys9kc80v7ysz39pz9948z7dqp66";
  };
 
   passthru = {

From c10d616ee5d4ff88691d870f7bc65395da42a609 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 13:17:51 +0200
Subject: [PATCH 017/282] Plex: 1.13.4 -> 1.13.5

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 6f7f9e74ec5..88a8d0e8707 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.13.4.5271";
-    vsnHash = "200287a06";
-    sha256 = "c8aa459f680ad9db92f285dae2f3dcffbf082324e1b7ea2f356bdbe745fe6b8e";
+    version = "1.13.5.5291";
+    vsnHash = "6fa5e50a8";
+    sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx";
   };
 
 in stdenv.mkDerivation rec {

From a66cd66f796dfa638b0f22e02cf17092d06df10a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 11:50:10 -0700
Subject: [PATCH 018/282] clipgrab: 3.6.8 -> 3.6.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions.
---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 031202ad646..96e0bb04031 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.6.8";
+  version = "3.6.9";
 
   src = fetchurl {
-    sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p";
+    sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From e56f668bfd992190a8057cd8930a5aa5e2ca420e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 12:54:44 -0700
Subject: [PATCH 019/282] charybdis: 4.1 -> 4.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/charybdis/versions.
---
 pkgs/servers/irc/charybdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index 332372830d6..dc053f4581c 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-4.1";
+  name = "charybdis-4.1.1";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw";
+    sha256 = "0wvssc8b1xq6svcqrwxrpc1ga8ip0sksv73wwbk8na0pmysdvpg0";
   };
 
   postPatch = ''

From df126e2adf8b43a62a2dd8ee598002438afcf88e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 16:54:21 -0700
Subject: [PATCH 020/282] maven: 3.5.3 -> 3.5.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions.
---
 .../development/tools/build-managers/apache-maven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 19ca5b9c078..455cd0a3fe8 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.5.3"; in
+let version = "3.5.4"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "0244mpziz4rw35x2cahsqlxpnygvi6qpll16g4kx87db7wvmcadm";
+    sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f";
   };
 
   buildInputs = [ makeWrapper ];

From 7361cadbdb4214839a4cfb56c46efbe908510fa4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:21:37 +0200
Subject: [PATCH 021/282] python: absl-py: 0.2.2 -> 0.3.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 1cb5275a6c3..3dd40a20e6c 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e0eb8358b549552b1cc5972350bc3e41dd0a926c15b3ff95ce60f3c78c80824c";
+    sha256 = "fcb729e9a3cf1a8f88f6c3a6465859c42116f23e1feb6208825eb88f3fd2b880";
   };
 
   propagatedBuildInputs = [ six ];

From 8667acf426f92f57a4854d1528540d1c98fca89e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:21:45 +0200
Subject: [PATCH 022/282] python: aiofiles: 0.3.2 -> 0.4.0

---
 pkgs/development/python-modules/aiofiles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index 572c18171d1..55d68f93f2c 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "aiofiles";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10";
+    sha256 = "021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee";
   };
 
   disabled = pythonOlder "3.3";

From cd14cbeed855030bc7141540479106550209a327 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:21:52 +0200
Subject: [PATCH 023/282] python: APScheduler: 3.5.1 -> 3.5.2

---
 pkgs/development/python-modules/APScheduler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 5e108cd7dcf..25d3bc0b505 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "952c8f46a11f32b9d5bfbe3e347dac2cdf0680d8b4799590dc9c3a9865b73b65";
+    sha256 = "6aba721f4db411be8f5ffe89acbaa174fe46425e15edf32ed7bfdfafb6ec1eb4";
   };
 
   buildInputs = [

From 43bb4ac8abf90d374dad945a1e990ed290e17b75 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:21:59 +0200
Subject: [PATCH 024/282] python: astroid: 2.0.1 -> 2.0.4

---
 pkgs/development/python-modules/astroid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index ea087ce4f5f..ccf6f405526 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.0.1";
+  version = "2.0.4";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f";
+    sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
   };
 
   # From astroid/__pkginfo__.py

From abf0cf692ff2c178bb86696d748289f33e2bbacd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:06 +0200
Subject: [PATCH 025/282] python: astropy: 3.0.3 -> 3.0.4

---
 pkgs/development/python-modules/astropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 4901b798955..acbd7c2ec65 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.3";
+  version = "3.0.4";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6af07abe5e263820a3dec93832a6ad74005013071490e125afbc6514411721da";
+    sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

From cc55de08cd8d696599d3f1b09c1b43eb2fe00bba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:13 +0200
Subject: [PATCH 026/282] python: async_generator: 1.9 -> 1.10

---
 pkgs/development/python-modules/async_generator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix
index 4f46376b62d..6bf77ecd75e 100644
--- a/pkgs/development/python-modules/async_generator/default.nix
+++ b/pkgs/development/python-modules/async_generator/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "async_generator";
-  version = "1.9";
+  version = "1.10";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7d5465c6174fe86dba498ececb175f93a6097ffb7cc91946405e1f05b848371";
+    sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144";
   };
 
   checkInputs = [ pytest pytest-asyncio ];

From d72794bf324402810ac6ada47ee88d7ce9ee381f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:20 +0200
Subject: [PATCH 027/282] python: autobahn: 18.6.1 -> 18.7.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 30479ce8266..fac9fe48d5e 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -5,11 +5,11 @@
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "18.6.1";
+  version = "18.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24";
+    sha256 = "163dd329c2a29f4ef82f7fe85a6f6e654a2aa6837bd83834cf537e4efa9204be";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which

From a799aa98381d0f7be355564e4f7eed9ce3303f48 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:27 +0200
Subject: [PATCH 028/282] python: beautifulsoup4: 4.6.0 -> 4.6.3

---
 pkgs/development/python-modules/beautifulsoup4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index 6ae838265b1..7cf4f36a2f0 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
-  version = "4.6.0";
+  version = "4.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0";
+    sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
   };
 
   buildInputs = [ nose ];

From 37a577a8f91c500113e39311e0897b6a3990a142 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:34 +0200
Subject: [PATCH 029/282] python: botocore: 1.10.65 -> 1.10.75

---
 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 f1475aed693..9875c4eaff6 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.10.65";
+  version = "1.10.75";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35f626029a6b17bfd503ce3379b121606e3f965edcab2612bc75ce8603fdf08c";
+    sha256 = "82055917cb431c1cee7c737189a170cc92ffc3824a6da504e8d3ff4df9fa2eab";
   };
 
   propagatedBuildInputs = [

From d962411a3451625e52c024a8d7e0e1e8003e7c81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:41 +0200
Subject: [PATCH 030/282] python: breathe: 4.9.1 -> 4.10.0

---
 pkgs/development/python-modules/breathe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index a76b7b2611b..645f75eb323 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.9.1";
+  version = "4.10.0";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684";
+    sha256 = "e94370b8b607a32d9611ed8246e635f02c21dc6847f04e888a00f66a12694eff";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

From 75683a6eb87669bf68cdac54d8379dcf7f5548c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:48 +0200
Subject: [PATCH 031/282] python: BTrees: 4.5.0 -> 4.5.1

---
 pkgs/development/python-modules/btrees/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index c031c872da3..c96d305a7f6 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "BTrees";
-  version = "4.5.0";
+  version = "4.5.1";
 
   buildInputs = [ transaction ];
   propagatedBuildInputs = [ persistent zope_interface ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "46b02cb69b26a5238db771ea1955b503df73ecf254bb8063af4c61999fc75b5c";
+    sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";
   };
 
   meta = with stdenv.lib; {

From b1cd6aa314fd16d833d41b4b4a96ec3c24d0f0a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:22:55 +0200
Subject: [PATCH 032/282] python: zc.buildout: 2.2.5 -> 2.12.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 9efc53ebe6d..c75b9fdb6cc 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.2.5";
+  version = "2.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fb08f24f9e51e647e29d714f6e9ad51a4ea28673dddeed831315617bb5a805d0";
+    sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
   };
 
   meta = with stdenv.lib; {

From 4fc5ebd1d03c6fa2c598226d16fe139b6f29c44f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:02 +0200
Subject: [PATCH 033/282] python: cairocffi: 0.8.1 -> 0.9.0

---
 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 13d00d0529c..39799daca21 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.8.1";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y373vafv7q35msg7gqdn7niifr3j4j4n070hflxshahs59irss7";
+    sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337";
   };
 
   LC_ALL = "en_US.UTF-8";

From e2b4a7a9e8a4fec7bac648b2b28e0a9ede4d206a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:09 +0200
Subject: [PATCH 034/282] python: certifi: 2018.4.16 -> 2018.8.13

---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 3bc686121cf..429fd47f72e 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2018.4.16";
+  version = "2018.8.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7";
+    sha256 = "4c1d68a1408dd090d2f3a869aa94c3947cc1d967821d1ed303208c9f41f0f2f4";
   };
 
   meta = {

From 65dbc4235e6ffcc6831324c4c6ae5942b337f163 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:16 +0200
Subject: [PATCH 035/282] python: chainer: 4.3.0 -> 4.3.1

---
 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 d332d99cf80..80219c3f95a 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683";
+    sha256 = "d56b769720ef9de93d5b74faea96729b076beb5362f97565654de3c723f2c822";
   };
 
   checkInputs = [

From 7834477dc4b98c470a284c0c73cdb37c8f161ea4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:23 +0200
Subject: [PATCH 036/282] python: docker: 3.4.1 -> 3.5.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 dd4aafe1aa9..85c2a4b0230 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.4.1";
+  version = "3.5.0";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99";
+    sha256 = "bc693be5a84b3b9e5aaf156068c5c0a445ee5138c638c3fbc857133bf67ebe07";
   };
 
   propagatedBuildInputs = [

From e48f98325430c7ea73ee0fdf5c4308f781b84161 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:30 +0200
Subject: [PATCH 037/282] python: dogpile.cache: 0.6.6 -> 0.6.7

---
 pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 9a840e5112a..b830d34589b 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "dogpile.cache";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "044d4ea0a0abc72491044f3d3df8e1fc9e8fa7a436c6e9a0da5850d23a0d16c1";
+    sha256 = "fca7deb7c276b879b01c15c5d39b3c05701dc43b263ec3fef1e52cb851cf88ab";
   };
 
   # Disable concurrency tests that often fail,

From 566a915f8c9df464cfebe20c187b2bcf3cc05d26 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:37 +0200
Subject: [PATCH 038/282] python: dulwich: 0.19.5 -> 0.19.6

---
 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 2617249b75a..4713ff0ab28 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.5";
+  version = "0.19.6";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34f99e575fe1f1e89cca92cec1ddd50b4991199cb00609203b28df9eb83ce259";
+    sha256 = "9a7dc5c5759f3d3b7a9ac0a684aa2c47f099e1722d9caab5b043cef1d73ff4a2";
   };
 
   LC_ALL = "en_US.UTF-8";

From abeee701bdf8d1451684c5e95f09e470c1298d53 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:44 +0200
Subject: [PATCH 039/282] python: ECPy: 0.9.0 -> 0.9.1

---
 pkgs/development/python-modules/ecpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 97f04828300..5338a963cfb 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "ECPy";
-  version = "0.9.0";
+  version = "0.9.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef41346ae24789699f3bc3ddefbfac03ad6b73b7d3d19b998ba9ce47b67c7277";
+    sha256 = "f0df66be67f3de0152dfb3c453f4247bdfa2b4e37aa75b98617a637376032229";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ];

From 691270a594707a101ea4dc2be2af027ac3584b86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:51 +0200
Subject: [PATCH 040/282] python: elasticsearch: 6.3.0 -> 6.3.1

---
 pkgs/development/python-modules/elasticsearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 087ca3910c5..6c5ab07db19 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage (rec {
   pname = "elasticsearch";
-  version = "6.3.0";
+  version = "6.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80ff7a1a56920535a9987da333c7e385b2ded27595b6de33860707dab758efbe";
+    sha256 = "aada5cfdc4a543c47098eb3aca6663848ef5d04b4324935ced441debc11ec98b";
   };
 
   # Check is disabled because running them destroy the content of the local cluster!

From 59fafef2e2c1f83bc19126d63849f41387365794 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:23:58 +0200
Subject: [PATCH 041/282] python: Flask-PyMongo: 2.0.1 -> 2.1.0

---
 pkgs/development/python-modules/Flask-PyMongo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 6a14607ad27..862fd84c492 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-PyMongo";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5";
+    sha256 = "0b99dd99985660ebbc4b34bb44550f88a527cbc573faa01febccce3c4ab28347";
   };
 
   checkInputs = [ pytest ];

From 5fe8728e3e028f990894c5f3fd2e97357d8b6c28 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:06 +0200
Subject: [PATCH 042/282] python: folium: 0.5.0 -> 0.6.0

---
 pkgs/development/python-modules/folium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index eeb787ea3c0..cd6bac2962d 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e";
+    sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79";
   };
 
   checkInputs = [ pytest numpy nbconvert pandas mock ];

From e591f2858f65d4f4e5e0b1e4291b475e5f3299c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:13 +0200
Subject: [PATCH 043/282] python: fonttools: 3.28.0 -> 3.29.0

---
 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 4874fbba3c6..4759e9d3c83 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.28.0";
+  version = "3.29.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ebf2ee25a6060e8551880a3b05d6ecadcdcfbd1b32fc272ff7b3acdb22945b6f";
+    sha256 = "aab38c8c131670684321437d4857dcb4de1c775efd152a9ca9c4d81f1cb97fe7";
     extension = "zip";
   };
 

From 465860d9a985cbac2ffbed07986e44d90fa5e90b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:28 +0200
Subject: [PATCH 044/282] python: google-api-core: 1.2.1 -> 1.3.0

---
 pkgs/development/python-modules/google_api_core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 2273b48b5b3..ded728bdc0d 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e24e391054ed6e925ff6d03f225d9f66f3da97d0ab6f61e59274fb918fbe3ef1";
+    sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77";
   };
 
   propagatedBuildInputs = [

From c82458090d9d14ffb752ccb2b7abd24b39d53e67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:35 +0200
Subject: [PATCH 045/282] python: google-auth: 1.5.0 -> 1.5.1

---
 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 d908bb04151..fde773e738b 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.0";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1745c9066f698eac3da99cef082914495fb71bc09597ba7626efbbb64c4acc57";
+    sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530";
   };
 
   checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];

From 60c35659bfc67e4af026196bba4ddb84f00a7370 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:43 +0200
Subject: [PATCH 046/282] python: gphoto2: 1.8.2 -> 1.8.3

---
 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 29aa0400ec5..9757cb950dc 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.2";
+  version = "1.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1806bdjc18qh0wyayxymgjnqqqlxs2iwvgk594anxw9y69hrxqni";
+    sha256 = "0257f90f0d8342b8bc996ff1b45b2cd3219a29f8123aa21a6da159ee3566e49f";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6696977b50a9db78e1cf0d578bee274361e055ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:50 +0200
Subject: [PATCH 047/282] python: grpcio: 1.13.0 -> 1.14.1

---
 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 204080fe115..3d3824cdabe 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.13.0";
+  version = "1.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426";
+    sha256 = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;

From 3dc7a273ed36a0825ab4ff74f509e84a2ff5973d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:24:57 +0200
Subject: [PATCH 048/282] python: grpcio-tools: 1.13.0 -> 1.14.1

---
 pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 8d4c925acf8..c111e5f75a7 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.13.0";
+  version = "1.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ck6818kb4nb6skm9lqg492brqs7kfk65f4hh2c7h7c8pkbrpcw1";
+    sha256 = "4ce5aa660d7884f23aac1eafa93b97a4c3e2b512edff871e91fdb6ee86ebd5ea";
   };
 
   enableParallelBuilding = true;

From 140b3cc62fd4a8add751ff6ebe27bf10032a0b92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:05 +0200
Subject: [PATCH 049/282] python: hvac: 0.6.2 -> 0.6.3

---
 pkgs/development/python-modules/hvac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index f18d8eadec8..310bd91b22b 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hvac";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4bc80744df5f09882b1cc91755b03b7b62b093fc63c8c4abb26fbfb9c9e878dd";
+    sha256 = "54672a93f75453a7de13c7c10c6d8a51630e2559a8e2a563d8e272e9e188443f";
   };
 
   propagatedBuildInputs = [ requests ];

From b1bcd547639560241dfcc2a5046d97c2a75f8aa0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:12 +0200
Subject: [PATCH 050/282] python: IBMQuantumExperience: 1.9.8 -> 2.0.1

---
 .../python-modules/ibmquantumexperience/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
index 0fcb2662801..9ded458312f 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "IBMQuantumExperience";
-  version = "1.9.8";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "78a7d9770fa2884d79d3c8b18f374644866e4d22ec151cf703053f7530bb7b7c";
+    sha256 = "ed164685ab743a4b216275f147227568ce27077068af33d0bd9a301ab1639e6e";
   };
 
   propagatedBuildInputs = [

From 9346ed7554a597a8daf2e79e3138e49e2898e2d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:19 +0200
Subject: [PATCH 051/282] python: invoke: 1.1.0 -> 1.1.1

---
 pkgs/development/python-modules/invoke/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 20d2973ca4f..8785f1fa6db 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "invoke";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6";
+    sha256 = "1c2cf54c9b9af973ad9704d8ba81b225117cab612568cacbfb3fc42958cc20a9";
   };
 
   # errors with vendored libs

From c119ef323c8286e2d1983a9c67bfd875175170d7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:27 +0200
Subject: [PATCH 052/282] python: ipython: 6.4.0 -> 6.5.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 2c0e4aaf4db..efc6933807f 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eca537aa61592aca2fef4adea12af8e42f5c335004dfa80c78caf80e8b525e5c";
+    sha256 = "b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''

From d575a899d49f29ea176608e8e904238e922d9263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:34 +0200
Subject: [PATCH 053/282] python: ipywidgets: 7.3.0 -> 7.4.0

---
 pkgs/development/python-modules/ipywidgets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index 9f15a2fc5c2..dde041140b9 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ce93db970a94f06f38121da70757cdbcce884ecd14f79a4dd9bc49a47e0f33b";
+    sha256 = "fd24a66d82f2ea49e281da7714a7c656340d3ec24dff376b17590fa59469b817";
   };
 
   # Tests are not distributed

From 3ba840a60f818a59a2807f2a4ea78df35cc0e376 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:42 +0200
Subject: [PATCH 054/282] python: jdatetime: 2.2.1 -> 3.0.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 db79050077f..a7c362231ca 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jdatetime";
-  version = "2.2.1";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "030a47ad3acbde45cb03872e2c6415c675dbb4a82462302971e93076145b5096";
+    sha256 = "07cdb02e8d6610c38e8ae7746b12cbc39068cc5d54fb2baa915579b60d781b5b";
   };
 
   propagatedBuildInputs = [ six ];

From e96b38b3a5ad5b11bb781cd268463f2b18d0763d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:49 +0200
Subject: [PATCH 055/282] python: jira: 1.0.15 -> 2.0.0

---
 pkgs/development/python-modules/jira/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index ac4f45f4e9d..b9bc923e7e0 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "jira";
-  version = "1.0.15";
+  version = "2.0.0";
 
   PBR_VERSION = version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20108a1d5b0dd058d5d4e0047f2d09ee06aaa413b22ca4d5c249e86167417fe8";
+    sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93";
   };
 
   buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ];

From 97408bf8bb0646a21710b6ffa20c4a453652c3e4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:25:57 +0200
Subject: [PATCH 056/282] python: joblib: 0.12.1 -> 0.12.2

---
 pkgs/development/python-modules/joblib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 8b42e6e1ea1..9133980754e 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -9,10 +9,10 @@
 
 buildPythonPackage rec {
   pname = "joblib";
-  version = "0.12.1";
+  version = "0.12.2";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524";
+    sha256 = "e9f04885cf11704669f3a731ea6ac00bbc7dea16137aa4394ef7c272cdb9d008";
   };
 
   checkInputs = [ sphinx numpydoc pytest ];

From 660d04b657dd77c8fe348994a534a5c662323a2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:04 +0200
Subject: [PATCH 057/282] python: junos-eznc: 2.1.8 -> 2.1.9

---
 pkgs/development/python-modules/junos-eznc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index f72bec57e90..fb34f4696ee 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "junos-eznc";
-  version = "2.1.8";
+  version = "2.1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "daa62e5abfc66ef12e4fb43a1c264673e662e6f2d937cd10666c1c6dcf2ac6ac";
+    sha256 = "a6729c35efd764e1f22457b72898bba554986466306ad29ad2d0bb071e997093";
   };
 
 

From 1e3880dd0ba4aefc5514d1220c1023bae3e07a6e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:12 +0200
Subject: [PATCH 058/282] python: jupyterlab: 0.33.7 -> 0.33.10

---
 pkgs/development/python-modules/jupyterlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index e47fdfa15ba..1ac5e85c404 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "0.33.7";
+  version = "0.33.10";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab9f7bcbc3b4e107897f368aa0527cdc1b4ccf0c370e218ae03ac1d75fac261c";
+    sha256 = "2f9147a2085541118923a71700733ecd1067630b4bc7d8be0ae8d0f9d8131bd9";
   };
 
   propagatedBuildInputs = [

From 3c357901f27753e1cb0b49e4f1dd8483fc70f9c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:19 +0200
Subject: [PATCH 059/282] python: jupyterlab_launcher: 0.11.2 -> 0.13.1

---
 .../python-modules/jupyterlab_launcher/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index 79d22b6b1c9..1831b47ee79 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -1,11 +1,11 @@
 { lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
 buildPythonPackage rec {
   pname = "jupyterlab_launcher";
-  version = "0.11.2";
+  version = "0.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "236a647f4c3f8417413643a918a893a5f662fb5d2fdccce2fd101e3cca2e7fd1";
+    sha256 = "f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0";
   };
 
   propagatedBuildInputs = [

From 9ee7e0208ec54cd442cc8d19368255189fccb910 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:26 +0200
Subject: [PATCH 060/282] python: ldap3: 2.5 -> 2.5.1

---
 pkgs/development/python-modules/ldap3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index 24690d9d530..3735cbf5852 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
 
 buildPythonPackage rec {
-  version = "2.5";
+  version = "2.5.1";
   pname = "ldap3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "55078bbc981f715a8867b4c040402627fdfccf5664e0277a621416559748e384";
+    sha256 = "cc09951809678cfb693a13a6011dd2d48ada60a52bd80cb4bd7dcc55ee7c02fd";
   };
 
   buildInputs = [ gssapi ];

From 0bd401b65a8fb5c470897f958fe43fd2065f3c90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:33 +0200
Subject: [PATCH 061/282] python: libagent: 0.11.3 -> 0.12.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 20312ed81d3..950a0dd5ba6 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.11.3";
+  version = "0.12.0";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "cb6199c3572e1223756465e758fb525e7f406a4808e9d7cfdddf089bec710047";
+    sha256 = "55af1ad2a6c95aef1fc5588c2002c9e54edbb14e248776b64d00628235ceda3e";
   };
 
   buildInputs = [

From 8cdc9e6cebbcccac95326dd950cdfea054adbb67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:41 +0200
Subject: [PATCH 062/282] python: lxml: 4.2.3 -> 4.2.4

---
 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 8589e47be21..3778098922a 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.3";
+  version = "4.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "622f7e40faef13d232fb52003661f2764ce6cdef3edb0a59af7c1559e4cc36d1";
+    sha256 = "e2afbe403090f5893e254958d02875e0732975e73c4c0cdd33c1f009a61963ca";
   };
 
   buildInputs = [ libxml2 libxslt ];

From 430fb0d9760b8ffbac0ee94a1702dae72d69a124 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:49 +0200
Subject: [PATCH 063/282] python: m2r: 0.1.15 -> 0.2.0

---
 pkgs/development/python-modules/m2r/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 4cb7744f3d9..8b1618515c8 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -2,11 +2,11 @@
   mistune, docutils } :
 buildPythonPackage rec {
   pname = "m2r";
-  version = "0.1.15";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c358d8bf21ff70e569968d604a0e3c9b05fe01b5f362389235e97bc7c0cd542";
+    sha256 = "b64ee5ac870311a69967fe787be8607df67b02a329f0fc76c8bf477336a99c78";
   };
 
   propagatedBuildInputs = [ mistune docutils ];

From 00c912661e332c2cea68333ab499605c316d0392 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:26:56 +0200
Subject: [PATCH 064/282] python: marshmallow: 2.15.3 -> 2.15.4

---
 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 242244726e5..20543faeb16 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.15.3";
+  version = "2.15.4";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "171f409d48b44786b7df2793cbd7f1a9062f0fe2c14d547da536b5010f671ade";
+    sha256 = "0f3776aa5b5405f6000c9304841abe6d4d708bb08207fc89a5ecd86622ec9e54";
   };
 
   propagatedBuildInputs = [ dateutil simplejson ];

From 1bc66be7e8db45f9d2a40a93c81bed0314b845d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:04 +0200
Subject: [PATCH 065/282] python: matplotlib: 2.2.2 -> 2.2.3

---
 pkgs/development/python-modules/matplotlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 794124ef3bf..f9aa8cb2ebe 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -21,12 +21,12 @@ assert enableTk -> (tcl != null)
 assert enableQt -> pyqt4 != null;
 
 buildPythonPackage rec {
-  version = "2.2.2";
+  version = "2.2.3";
   pname = "matplotlib";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8";
+    sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 4aa2b4af19ca9cdbcc5a3d4619bd260927126867 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:12 +0200
Subject: [PATCH 066/282] python: more-itertools: 4.2.0 -> 4.3.0

---
 pkgs/development/python-modules/more-itertools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index 6a58a6a8a28..c39bf461bec 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "more-itertools";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8";
+    sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e";
   };
 
   checkInputs = [ nose ];

From ed3ee4e56dfff0a8cb0fac2b46ec3a6069d2a948 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:19 +0200
Subject: [PATCH 067/282] python: moto: 1.3.3 -> 1.3.4

---
 pkgs/development/python-modules/moto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index cfb70724210..6d2c503d5ef 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "45d14aca2b06b0083d5e82cfd770ebca0ba77b5070aec6928670240939a78681";
+    sha256 = "7c86d1c3bd6362954afaded735354c11afd22037eb6736152f057a1bff0c8868";
   };
 
   postPatch = ''

From db94f0620bebf25c3359c060c665807334df6bc6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:26 +0200
Subject: [PATCH 068/282] python: multipledispatch: 0.5.0 -> 0.6.0

---
 .../python-modules/multipledispatch/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix
index f568e53c573..8b2de6c5af1 100644
--- a/pkgs/development/python-modules/multipledispatch/default.nix
+++ b/pkgs/development/python-modules/multipledispatch/default.nix
@@ -1,20 +1,23 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, six
 }:
 
 buildPythonPackage rec {
   pname = "multipledispatch";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e92d63efad2c9b68562175d9148d8cb32d04bf5557991190e643749bf4ed954";
+    sha256 = "a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea";
   };
 
   # No tests in archive
   doCheck = false;
 
+  propagatedBuildInputs = [ six ];
+
   meta = {
     homepage = https://github.com/mrocklin/multipledispatch/;
     description = "A relatively sane approach to multiple dispatch in Python";

From fafa17e93ea553bb6becb3f386413c9b159fb6a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:35 +0200
Subject: [PATCH 069/282] python: mutagen: 1.41.0 -> 1.41.1

---
 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 054d0247600..78271de6f69 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.0";
+  version = "1.41.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dab6038c7f0e17c1b67fb8f56303e8be21e73ac47760f1a8e716856f1bdf5057";
+    sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200";
   };
 
   checkInputs = [

From 3d9da297b2bd909db4e178f681898eb2baca3797 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:43 +0200
Subject: [PATCH 070/282] python: netCDF4: 1.4.0 -> 1.4.1

---
 pkgs/development/python-modules/netcdf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 0baa323d53c..7e403fb9e56 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
 }:
 buildPythonPackage rec {
   pname = "netCDF4";
-  version = "1.4.0";
+  version = "1.4.1";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388";
+    sha256 = "d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403";
   };
 
   checkInputs = [ pytest ];

From 0c0e408db90fb04a6ce16b37c8fdf445d2156a5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:50 +0200
Subject: [PATCH 071/282] python: nipype: 1.1.0 -> 1.1.2

---
 pkgs/development/python-modules/nipype/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 3785986ad28..8b0ee06b349 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -34,11 +34,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a5ebbc9244a18e3b2d83a9639da09248e92bc0742b81a86550ef1a18c1fccbc";
+    sha256 = "f2fe29bf863cb643bd5c8d2bdeaaf488308c293c9fb9913bc7a9504dc3bf8db6";
   };
 
   # see https://github.com/nipy/nipype/issues/2240

From b4eb92777c1ca22c7f9006936a8056a73fe3180a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:27:57 +0200
Subject: [PATCH 072/282] python: numexpr: 2.6.6 -> 2.6.7

---
 pkgs/development/python-modules/numexpr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 09f6c6636c1..0d9e0d2a6d0 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.6.6";
+  version = "2.6.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97c1f7fa409439ae933494014cd41d43de84cfe6c98b7f93392f94d54de1b453";
+    sha256 = "3d007946b6c042fc9feb1db52dd0847d2f9b7f3175ae0591476ea80dcd664771";
   };
 
   propagatedBuildInputs = [ numpy ];

From f695fec875492784f7d58d0872c0b20e09c1c663 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:04 +0200
Subject: [PATCH 073/282] python: numpy: 1.14.5 -> 1.15.0

---
 pkgs/development/python-modules/numpy/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index d9e884dabbe..96a3a524298 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -1,17 +1,17 @@
-{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }:
+{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas, hostPlatform }:
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.14.5";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac";
+    sha256 = "f28e73cf18d37a413f7d5de35d024e6b98f14566a10d82100f9dc491a7d449f9";
   };
 
   disabled = isPyPy;
-  buildInputs = [ gfortran nose blas ];
+  buildInputs = [ gfortran pytest blas ];
 
   patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
     # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
@@ -56,10 +56,6 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  postInstall = ''
-    ln -s $out/bin/f2py* $out/bin/f2py
-  '';
-
   passthru = {
     blas = blas;
   };

From 3845d16dcc866b7642149120c59d79439bbe13ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:12 +0200
Subject: [PATCH 074/282] python: oauthenticator: 0.7.3 -> 0.8.0

---
 pkgs/development/python-modules/oauthenticator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 362554b9bb8..f35562d7c42 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "oauthenticator";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cb0b2564e46db28350693bc3e6457333c4ee21af5066ac743730e3f3173ea7ed";
+    sha256 = "39908f01cda98186c0fedc350b68342d6016ee325615f4c8475c1e64a55d9e4f";
   };
 
   checkPhase = ''

From b91d2777993799d42b7cd2461327e6ec015d7af4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:19 +0200
Subject: [PATCH 075/282] python: openpyxl: 2.5.4 -> 2.5.5

---
 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 7b8f4602140..311b12c12ae 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.4";
+  version = "2.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9239b74faf175dc4276a5fc277655fc53c2f704ded39e680d35e6a39e1913f69";
+    sha256 = "0f391b0035d7c98f25aad539726e8efc77eea250ff1a120ea7d264c03a16f5fe";
   };
 
   checkInputs = [ pytest ];

From 6e0424a77c4c390e0978a5c74c763ee88a438173 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:26 +0200
Subject: [PATCH 076/282] python: pandas: 0.23.3 -> 0.23.4

---
 pkgs/development/python-modules/pandas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 9e4ed217b92..1cc33ad51e3 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -28,11 +28,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.23.3";
+  version = "0.23.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9cd3614b4e31a0889388ff1bd19ae857ad52658b33f776065793c293a29cf612";
+    sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4";
   };
 
   checkInputs = [ pytest glibcLocales moto ];

From 66ccd57e5f6c4d1451397e59a4936416d7d5bead Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:34 +0200
Subject: [PATCH 077/282] python: pbr: 4.1.1 -> 4.2.0

---
 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 666df965f87..e1843e4a75d 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "4.1.1";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "754e766b4f4bad3aa68cfd532456298da1aa39375da8748392dbae90860d5f18";
+    sha256 = "1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45";
   };
 
   # circular dependencies with fixtures

From 7474dee69de0088a644604ab91d99c3c27398cf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:41 +0200
Subject: [PATCH 078/282] python: pendulum: 2.0.2 -> 2.0.3

---
 pkgs/development/python-modules/pendulum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index 5368a4f878e..e9d482e42ac 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pendulum";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e";
+    sha256 = "d07962450e808556b3e6209a5830e2bbf8c7747129580c3b5b09e641f72617ab";
   };
 
   propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing;

From 00358af730bde3efa9b7cddf2a9a1762450eaacd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:49 +0200
Subject: [PATCH 079/282] python: persistent: 4.2.4.2 -> 4.3.0

---
 pkgs/development/python-modules/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 4f2e7f3ca84..b3c6bd755d8 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "persistent";
-  version = "4.2.4.2";
+  version = "4.3.0";
 
   propagatedBuildInputs = [ zope_interface ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf264cd55866c7ffbcbe1328f8d8b28fd042a5dd0c03a03f68c0887df3aa1964";
+    sha256 = "d8e2253a35f46ae318e65f0e3b51cdce16d4646e284a26f88a2d84b4d2507f81";
   };
 
   meta = {

From ed29f31cb9d40169d246ee14754673f0fd84f437 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:28:57 +0200
Subject: [PATCH 080/282] python: phonopy: 1.13.2.13 -> 1.13.2.107

---
 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 57ddeeeb8ec..cf15ccc18fc 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.13";
+  version = "1.13.2.107";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "23970ecdf698e743f9204711e8edfbb33c97667f5f88c7bda3322abbc91d0682";
+    sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905";
   };
 
   propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];

From 924f38f0d12cb2967caf5f019bc160e568d5705a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:04 +0200
Subject: [PATCH 081/282] python: plac: 0.9.6 -> 1.0.0

---
 pkgs/development/python-modules/plac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index c16c8d3f750..d0e7b0d81ee 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -5,11 +5,11 @@
 }:
 buildPythonPackage rec {
   pname = "plac";
-  version = "0.9.6";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs";
+    sha256 = "b03f967f535b3bf5a71b191fa5eb09872a5cfb1e3b377efc4138995e10ba36d7";
   };
 
   checkPhase = ''

From c9667db797c466052127aca787d70fb831fa64dd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:12 +0200
Subject: [PATCH 082/282] python: plotly: 3.1.0 -> 3.1.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 9d2df2a89eb..79648c8104b 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "015a5b8ca616d19eb96433dd597c3ccccc80e3afba02a23bd526a017ff4fce05";
+    sha256 = "2e565c8907ea6f9c517423cf5452e4f4b85635bd0dd400aae943339c826d4176";
   };
 
   propagatedBuildInputs = [

From 5fab087fd3015b503e0bcf4d4a890ef36ad29492 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:19 +0200
Subject: [PATCH 083/282] python: pluggy: 0.6.0 -> 0.7.1

---
 pkgs/development/python-modules/pluggy/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index 2a6996c628e..236c0213392 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -1,15 +1,16 @@
 { buildPythonPackage
 , lib
 , fetchPypi
+, setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "pluggy";
-  version = "0.6.0";
+  version = "0.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff";
+    sha256 = "95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1";
   };
 
   checkPhase = ''
@@ -19,6 +20,8 @@ buildPythonPackage rec {
   # To prevent infinite recursion with pytest
   doCheck = false;
 
+  buildInputs = [ setuptools_scm ];
+
   meta = {
     description = "Plugin and hook calling mechanisms for Python";
     homepage = "https://pypi.python.org/pypi/pluggy";

From 2ff5927840804ddf5f0f6a56ab54e8bfdbbc5062 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:26 +0200
Subject: [PATCH 084/282] python: plumbum: 1.6.6 -> 1.6.7

---
 pkgs/development/python-modules/plumbum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 2c6eb7e5fbf..13afce05ef7 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.6.6";
+  version = "1.6.7";
 
   checkInputs = [ pytest ];
 
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d179b90a9927f91427a28c1bac2864c61342cb43ef39aa7324c7c9a96bcc23eb";
+    sha256 = "d143f079bfb60b11e9bec09a49695ce2e55ce5ca0246877bdb0818ab7c7fc312";
   };
 }
\ No newline at end of file

From 68d979f8eea87ef80af3ea959c6ec28df52ab654 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:34 +0200
Subject: [PATCH 085/282] python: plyfile: 0.5 -> 0.6

---
 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 1ac8afc8cfb..6a7f09a1451 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.5";
+  version = "0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cspvhfy2nw1rfwpvrd69wkz0b6clr4wzqpwpmdk872vk2q89yzi";
+    sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce";
   };
 
   propagatedBuildInputs = [ numpy ];

From 30b0f7521b691d45b54e9af8ae04720ba567918a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:41 +0200
Subject: [PATCH 086/282] python: prometheus_client: 0.3.0 -> 0.3.1

---
 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 be014bc0f7e..4529ad95175 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.3.0";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "69494dc1ac967c0f626c8193e439755c2b95dd4ed22ef31c277601778a50c7ff";
+    sha256 = "17bc24c09431644f7c65d7bce9f4237252308070b6395d6d8e87767afe867e24";
   };
 
   doCheck = false;

From 4f1c7b2c7f252f6b2b77fbdf892e337cefcf9454 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:29:56 +0200
Subject: [PATCH 087/282] python: py3status: 3.11 -> 3.12

---
 pkgs/development/python-modules/py3status/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index e47771d5ca0..8a7dcc63f57 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -18,10 +18,10 @@
 
 buildPythonPackage rec {
   pname = "py3status";
-  version = "3.11";
+  version = "3.12";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba6930427d57b79cf344262494fdcbddbf75f6e37794489d445f2ebb8bc53ec5";
+    sha256 = "c9ef49f72c2d83976d2841ab7e70faee3c77f4d7dbb2d3390ef0f0509473ea9a";
   };
   doCheck = false;
   propagatedBuildInputs = [ pytz requests tzlocal ];

From 9782a5a5dccfe1183d4133031ae755a5c90d24c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:03 +0200
Subject: [PATCH 088/282] python: pyaxmlparser: 0.3.9 -> 0.3.10

---
 pkgs/development/python-modules/pyaxmlparser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 483ad84eb66..7f9cbf9518e 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,12 +1,12 @@
 { buildPythonPackage, stdenv, lxml, click, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.3.9";
+  version = "0.3.10";
   pname = "pyaxmlparser";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af714d8adafcea776dd14cbd6d09f5d6d278f7ba333f540dde3b4c34f5f04784";
+    sha256 = "5c1f569f4dc2232d7f146eb190bc513373ff6555f97ae904740f966f0fb2dd77";
   };
 
   propagatedBuildInputs = [ lxml click ];

From f2e647b662ad82e463e6916863f35e3536349114 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:11 +0200
Subject: [PATCH 089/282] python: pycryptodome: 3.6.4 -> 3.6.5

---
 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 27ccc7f4687..b4f044cf038 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "3.6.4";
+  version = "3.6.5";
   pname = "pycryptodome";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9c7790ffd291c81b934fe0ca8155a67235d33f70d4914bbf7467a447d9dbcb09";
+    sha256 = "99d653f3a92f35e3c768a142aa83c8c7b104a787655c51e25dca89ed778960b8";
   };
 
   meta = {

From 6c62513f6de46e7d38e5f83cfed1d63e4bedb1ae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:18 +0200
Subject: [PATCH 090/282] python: pycryptodomex: 3.6.4 -> 3.6.5

---
 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 b5487a24b77..c9741a46438 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycryptodomex";
-  version = "3.6.4";
+  version = "3.6.5";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4daabe7c0404e673b9029aa43761c779b9b4df2cbe11ccd94daded6a0acd8808";
+    sha256 = "ff7d28474ef2134fe3027b53fa3cf13ed5f776ce15d6209b0e48fbc7592f9396";
   };
 }

From d3731041f827bf822e86dd59dd84f4a91dc0fb00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:25 +0200
Subject: [PATCH 091/282] python: pycuda: 2017.1.1 -> 2018.1

---
 pkgs/development/python-modules/pycuda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 2774a363f85..2d1da5339af 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -22,11 +22,11 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2017.1.1";
+  version = "2018.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qxmcjax32p1ywicw9sha2rvfbak4kjbx9pq57j3wq4cwf296nkb";
+    sha256 = "7079f7738e83ee79ae26f0827ada29fe55921fec9760201199cc2bfb69446c92";
   };
 
   preConfigure = ''

From ac916967d4c1e2c5aade2ad035e84718eaa3527d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:40 +0200
Subject: [PATCH 092/282] python: pylast: 2.3.0 -> 2.4.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 89ae2f37d10..64479a7b5af 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.3.0";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1e8615bac27386712ab74338e6dbd01ff7adbf6648a3debf921cef6bad80014";
+    sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb";
   };
 
   propagatedBuildInputs = [ certifi six ];

From 99ae554b9ac023daf368306726d8cef8af32d652 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:48 +0200
Subject: [PATCH 093/282] python: pylint: 2.0.1 -> 2.1.1

---
 pkgs/development/python-modules/pylint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 0156e92738a..c9a44548c14 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.0.1";
+  version = "2.1.1";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c90a24bee8fae22ac98061c896e61f45c5b73c2e0511a4bf53f99ba56e90434";
+    sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
   };
 
   checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ];

From 555e3ed264426cf3fe5e303673d3c6a4efe2cdbd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:30:56 +0200
Subject: [PATCH 094/282] python: PyLTI: 0.6.0 -> 0.7.0

---
 pkgs/development/python-modules/pylti/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 600d6406405..32cef1e5da8 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "PyLTI";
-  version = "0.6.0";
+  version = "0.7.0";
 
   disabled = !isPy27;
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3203c5d0d8a527c092518d82d312757c036055ff628023985ab615ef471e602";
+    sha256 = "80938a235b1ab390f6889a95237d087ea7adde5cc50fcae9c80c49898e8ee78e";
   };
 
   meta = {

From 5a282a423eb9db6a5eb024da935e22a439046b23 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:04 +0200
Subject: [PATCH 095/282] python: pymatgen: 2018.6.27 -> 2018.8.10

---
 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 874f7bfa308..d810a5d6b4d 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.6.27";
+  version = "2018.8.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8078af7fda4f9a07f1e389ffe08de3511213acdf9fb2ed9f9ffe89b9b12b8568";
+    sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603";
   };
 
   nativeBuildInputs = [ glibcLocales ];

From f1dba212e7d50c7a88f3cfbce2e7bc241775afd0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:11 +0200
Subject: [PATCH 096/282] python: pyowm: 2.8.0 -> 2.9.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 55f96416efd..58a8dee155a 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.8.0";
+  version = "2.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y2r322pcamabar70513pbyiq26x33l1aq9cim6k30lk9p4aq310";
+    sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849";
   };
 
   propagatedBuildInputs = [ requests ];

From 974d04eec68be5bd3d6ebb225012d1a1339eac20 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:19 +0200
Subject: [PATCH 097/282] python: pytest: 3.6.3 -> 3.7.1

---
 pkgs/development/python-modules/pytest/default.nix | 8 ++++----
 pkgs/top-level/python-packages.nix                 | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 0e3f89fa152..9c158a55b81 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,9 +1,9 @@
 { stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText
+, atomicwrites, mock, writeText, pathlib2
 }:
 buildPythonPackage rec {
-  version = "3.6.3";
+  version = "3.7.1";
   pname = "pytest";
 
   preCheck = ''
@@ -13,13 +13,13 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752";
+    sha256 = "86a8dbf407e437351cef4dba46736e9c5a6e3c3ac71b2e942209748e76ff2086";
   };
 
   checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
-    ++ (stdenv.lib.optional (!isPy3k) funcsigs);
+    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ];
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 322f831b4b5..20d665d7ed6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1832,15 +1832,15 @@ in {
     };
   };
 
-  pytest = self.pytest_36;
+  pytest = self.pytest_37;
 
-  pytest_36 = callPackage ../development/python-modules/pytest {
+  pytest_37 = callPackage ../development/python-modules/pytest {
     # hypothesis tests require pytest that causes dependency cycle
     hypothesis = self.hypothesis.override { doCheck = false; };
   };
 
   # Needed for celery
-  pytest_32 = self.pytest_36.overridePythonAttrs( oldAttrs: rec {
+  pytest_32 = self.pytest_37.overridePythonAttrs( oldAttrs: rec {
     version = "3.2.5";
     src = oldAttrs.src.override {
       inherit version;

From 68dd59345ab29685fad5cfa723242e09ec3620ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:26 +0200
Subject: [PATCH 098/282] python: pytest-asyncio: 0.8.0 -> 0.9.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 e1ff0998396..6d90521900f 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 }:
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.8.0";
+  version = "0.9.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e";
+    sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf";
   };
 
   buildInputs = [ pytest ];

From 86a55f9f3cadfb7b55954cfc77b0e67a2c0723ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:34 +0200
Subject: [PATCH 099/282] python: pytest-flakes: 3.0.2 -> 4.0.0

---
 pkgs/development/python-modules/pytest-flakes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index c8ae9882a1e..f8823b966da 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-flakes";
-  version = "3.0.2";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "763ec290b89e2dc8f25f49d71cb9b869b8df843697b730233f61c78f847f2e57";
+    sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143";
   };
 
   buildInputs = [ pytestpep8 pytest ];

From bc8131047e6a041ff71c3213fe00a5853133aa02 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:41 +0200
Subject: [PATCH 100/282] python: pytest-xdist: 1.22.3 -> 1.22.5

---
 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 2e88a765417..34c94d6aacd 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.22.3";
+  version = "1.22.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48868d1f461122ac8c5fb60487b6da03c0d73dcb06a9d79e06c4eab8ef62a5c3";
+    sha256 = "3308c4f6221670432d01e0b393b333d77c1fd805532e1d64450e8140855eb51b";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From a025deaa01569c3960764ba8e7c85350923bfbba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:48 +0200
Subject: [PATCH 101/282] python: python-ctags3: 1.2.4 -> 1.3.0

---
 pkgs/development/python-modules/python-ctags3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
index ba29154df3a..c37abf7b55f 100644
--- a/pkgs/development/python-modules/python-ctags3/default.nix
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-ctags3";
-  version = "1.2.4";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e";
+    sha256 = "69029185ec70db4180be2b58e9a7245700c7ddcdc9049bf0641448f439112176";
   };
 
   meta = with lib; {

From 36e7ea630f3323235bcbc27e20fb207b2a4d1a61 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:31:55 +0200
Subject: [PATCH 102/282] python: python_openzwave: 0.4.7 -> 0.4.9

---
 pkgs/development/python-modules/python_openzwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
index d29365c86ba..e04915a503d 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python_openzwave";
-  version = "0.4.7";
+  version = "0.4.9";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b28a3abefc04d1d04dd68ee5a695b091e96ba7ab9a9eaa67db43dd55b61a4664";
+    sha256 = "97ddd104f52e3a4d7115c3de5d2136631d1f66627fc9b45d56956c3f2b6e0cdb";
     extension = "zip";
   };
 

From 56e306a1de6a8d77e2538dce47aaa74654debf10 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:02 +0200
Subject: [PATCH 103/282] python: pyunifi: 2.13 -> 2.14

---
 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 31ec613df4c..e0bc32746e3 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.13";
+  version = "2.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq";
+    sha256 = "9439ffc992ce381a39d64b5e3f4460e53872faa9cca60dcf5cee94fc0eba7fca";
   };
 
   propagatedBuildInputs = [ requests ];

From 09e6f5c583465d0a1fa6aa471709c98d8255b499 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:10 +0200
Subject: [PATCH 104/282] python: pyzmq: 17.1.0 -> 17.1.2

---
 pkgs/development/python-modules/pyzmq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 26c453e3a09..31b08d0a9e0 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyzmq";
-  version = "17.1.0";
+  version = "17.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4";
+    sha256 = "a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf";
   };
 
   checkInputs = [  pytest tornado ];

From 386741823eccf7d47e132738493cb68b65f4d90c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:18 +0200
Subject: [PATCH 105/282] python: rlp: 1.0.1 -> 1.0.2

---
 pkgs/development/python-modules/rlp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 381a784d24a..77ada95b301 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rlp";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512";
+    sha256 = "040fb5172fa23d27953a886c40cac989fc031d0629db934b5a9edcd2fb28df1e";
   };
 
   checkInputs = [ pytest ];

From e7dd0aed0069b9608ecab824feddd25c91d3899f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:25 +0200
Subject: [PATCH 106/282] python: rope: 0.10.7 -> 0.11.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 db08ad2a5c0..e5164f27f56 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.10.7";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lc01pjn0yr6yqcpbf6kk170zg8zhnyzj8kqlsch1mag0g9dz7m0";
+    sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2";
   };
 
   meta = with stdenv.lib; {

From 141438f0073a659015732d1ecf56e43c14964206 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:33 +0200
Subject: [PATCH 107/282] python: setuptools_scm: 2.1.0 -> 3.1.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 1420428e973..f6e0daea5ad 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 = "2.1.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379";
+    sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40";
   };
 
   buildInputs = [ pip ];

From 0bca28c89078ddc25aca0c1f8c50d3bafdd36412 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:41 +0200
Subject: [PATCH 108/282] python: shippai: 0.2.3 -> 0.3.1

---
 pkgs/development/python-modules/shippai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix
index ac035061692..b386fe6c2fa 100644
--- a/pkgs/development/python-modules/shippai/default.nix
+++ b/pkgs/development/python-modules/shippai/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "shippai";
   # Please make sure that vdirsyncer still builds if you update this package.
-  version = "0.2.3";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ppwywzg4d12h658682ssmingm6ls6a96p4ak26i2w9d4lf8pfsc";
+    sha256 = "9e8d1ca5a742a7ea175cebda3090497d42348517e8d2f05f9854d0f30f1a48ad";
   };
 
   meta = with stdenv.lib; {

From adabd20893a963615523ab6e0ccf1c0701538c4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:48 +0200
Subject: [PATCH 109/282] python: simpleeval: 0.9.5 -> 0.9.6

---
 pkgs/development/python-modules/simpleeval/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index b3377e75f67..831cfede950 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "simpleeval";
-  version = "0.9.5";
+  version = "0.9.6";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3";
+    sha256 = "848fdb9ee5f30cf93b9f0d840db6e7562633d20abf7d67c2382a0a2162a79410";
   };
   meta = {
     homepage = https://github.com/danthedeckie/simpleeval;

From 4e3e049c9e89de481b5eedb6deec403d15e9d4ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:32:55 +0200
Subject: [PATCH 110/282] python: snakeviz: 0.4.1 -> 1.0.0

---
 pkgs/development/python-modules/snakeviz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 9a3afc3fb4b..2b0ff6e443a 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "snakeviz";
-  version = "0.4.1";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18vsaw1wmf903fg21zkk6a9b49gj47g52jm5h52g4iygngjhpx79";
+    sha256 = "5fe23667708a4ed04047abfbf209675a8488ea6ea8c038d7de06d8a083fb3531";
   };
 
   # Upstream doesn't run tests from setup.py

From 6438ab2871bf6c319f55e9607793aaf38cd34b81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:01 +0200
Subject: [PATCH 111/282] python: spglib: 1.10.4.1 -> 1.10.4.11

---
 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 9b51c445e73..7385387eb86 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.1";
+  version = "1.10.4.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a50c48dfea450c431a6d6790aa2ebbb10dc43eef97f2794f5038ed1eeecbd30";
+    sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e";
   };
 
   propagatedBuildInputs = [ numpy ];

From f25881563b635f2a60d95725bf5a79571c71328d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:09 +0200
Subject: [PATCH 112/282] python: sqlmap: 1.2.7 -> 1.2.8

---
 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 674d1e66f7e..5713d7591dc 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.7";
+  version = "1.2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e570fcac05b3231d5e01398e496b88a78601938bba228e381994a1b3fe3bd88";
+    sha256 = "d261d93e7abed20543c261327d30b9f9936f0bed3c1a595f39218eeb66094526";
   };
 
   # No tests in archive

From 31911f1eebac58e1ff6330f40f7122a3aa1cde4d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:16 +0200
Subject: [PATCH 113/282] python: stripe: 2.0.3 -> 2.4.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 f2e4b946b5d..6c3e340c461 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.0.3";
+  version = "2.4.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 = "17a618541c19a48d5591f4011a282cbcbbe2d05c361109f8f5381aeec05eb270";
+    sha256 = "02c63cec551bba9b4785d156b518699e8ff0e6e6f96d00a72daa075683487202";
   };
 
   checkInputs = [ unittest2 mock ];

From 83b888eb79907475b03f19b9e33279eb4e435e62 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:24 +0200
Subject: [PATCH 114/282] python: sybil: 1.0.8 -> 1.0.9

---
 pkgs/development/python-modules/sybil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 6930cb2a559..c78016d7296 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname   = "sybil";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e17e10bac4c56ef5b6752866a7d100f5ae856ff97d805c4d6cac73be80863d3";
+    sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8";
   };
 
   checkInputs = [ pytest nose ];

From 19b030543a35292190af945e0f28c76ed79015ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:46 +0200
Subject: [PATCH 115/282] python: tox: 3.1.2 -> 3.2.1

---
 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 7719687f2ea..1cb9770367a 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "3.1.2";
+  version = "3.2.1";
 
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ packaging pluggy py six virtualenv ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059";
+    sha256 = "eb61aa5bcce65325538686f09848f04ef679b5cd9b83cc491272099b28739600";
   };
 
   meta = with lib; {

From 59c3a5e875ef41c1861108480e09a41c01f03ce9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:33:53 +0200
Subject: [PATCH 116/282] python: tqdm: 4.23.4 -> 4.24.0

---
 pkgs/development/python-modules/tqdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index fd5cd47be38..23a7a9dac6e 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.23.4";
+  version = "4.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "77b8424d41b31e68f437c6dd9cd567aebc9a860507cb42fbd880a5f822d966fe";
+    sha256 = "60bbaa6700e87a250f6abcbbd7ddb33243ad592240ba46afce5305b15b406fad";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

From 30ad941dcd5227b318881f5907fbf77569506a8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:07 +0200
Subject: [PATCH 117/282] python: txaio: 2.10.0 -> 18.7.1

---
 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 5558a7e339a..2bfdbae918a 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "txaio";
-  version = "2.10.0";
+  version = "18.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4797f9f6a9866fe887c96abc0110a226dd5744c894dc3630870542597ad30853";
+    sha256 = "701de939e90bb80f7e085357081552437526752199def5541dddfc34c0b0593f";
   };
 
   checkInputs = [ pytest mock ];

From 53dd95a22a12e653a488fcac519635121e0e31e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:14 +0200
Subject: [PATCH 118/282] python: typeguard: 2.2.0 -> 2.2.1

---
 pkgs/development/python-modules/typeguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index a6eb75b53cf..de7a110a8f4 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "typeguard";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e588ff78b7093fc31c3b00c78db09b9b3764157b03b867f25ccd1dd3efd96ffb";
+    sha256 = "89159e9ab54a436db4759c32eeb0ae6e9b65cf7fe5b838daad4a658024ec3b43";
   };
 
   buildInputs = [ setuptools_scm ];

From f42c1ef89847ea78dad7929f4e53e99f4ff43a48 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:21 +0200
Subject: [PATCH 119/282] python: uproot: 2.9.6 -> 2.9.11

---
 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 368f787313b..e2cc1105f09 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "2.9.6";
+  version = "2.9.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fb8dd19bd1f1ed376a96e92b32ff44f7d3688bda55eda9055898111fdac8391";
+    sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2";
   };
 
   propagatedBuildInputs = [

From 5dbc860c1fa661e7f19d04dea70b5631dc6450fa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:29 +0200
Subject: [PATCH 120/282] python: voluptuous: 0.11.1 -> 0.11.5

---
 pkgs/development/python-modules/voluptuous/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix
index 0d4f250509f..b45a46b3a83 100644
--- a/pkgs/development/python-modules/voluptuous/default.nix
+++ b/pkgs/development/python-modules/voluptuous/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "voluptuous";
-  version = "0.11.1";
+  version = "0.11.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
+    sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef";
   };
 
   checkInputs = [ nose ];

From b22dec2c51cfe220d3ca41909348eff61a6cc9c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:36 +0200
Subject: [PATCH 121/282] python: whitenoise: 4.0b4 -> 4.0

---
 pkgs/development/python-modules/whitenoise/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index d2359b2195f..007bb9c879b 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "whitenoise";
-  version = "4.0b4";
+  version = "4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ra2bbsihwfhnf1ibahzzabgfjfghxqcrbfx6r5r50mlil5n8bf4";
+    sha256 = "1e206c5adfb849942ddd057e599ac472ec1a85d56ae78a5ba24f243ea46a89c5";
   };
 
   # No tests

From b766bdbe69a7fa0185cddf2ea87a37cab69a2304 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:42 +0200
Subject: [PATCH 122/282] python: widgetsnbextension: 3.3.0 -> 3.4.0

---
 .../development/python-modules/widgetsnbextension/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 0f102dda106..db992c7b932 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "widgetsnbextension";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c5280a62d293735cdadc7b8884e2affcfb0488420ee09963577f042359726392";
+    sha256 = "c9d6e426a1d79d132b57b93b368feba2c66eb7b0fd34bdb901716b4b88e94497";
   };
 
   propagatedBuildInputs = [ notebook ];

From b62b9659b303219e69e99580197cf33c46cfc1f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:49 +0200
Subject: [PATCH 123/282] python: zeep: 3.0.0 -> 3.1.0

---
 pkgs/development/python-modules/zeep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index b14e0226d73..09beb9d8991 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "faab59d57275ce35845f42371cca83b3957982cdca9621228153fb99c770c4fc";
+    sha256 = "b2d96881689c3f29e8ea5c8c6abb2b17fb0f470deee15d0d7bec4e74592850f6";
   };
 
   propagatedBuildInputs = [

From 95ae8956cdc3f96baf1313ffb39e015fa62acfbc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 09:34:57 +0200
Subject: [PATCH 124/282] python: zodbpickle: 1.0.1 -> 1.0.2

---
 pkgs/development/python-modules/zodbpickle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index c3f41d281c6..746099368fb 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "1.0.1";
+  version = "1.0.2";
   disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5fdfa84f05b25511a4e1190ec98728aa487e2eb6db016a951fdbb79bcc7307e0";
+    sha256 = "f26e6eba6550ff1575ef2f2831fc8bc0b465f17f9757d0b6c7db55fab5702061";
   };
 
   # fails..

From 381639716f7d72efffc6ec3f6530555c6349bcf3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 11:44:06 +0200
Subject: [PATCH 125/282] pythonPackages.backports_lzma: fix build

---
 pkgs/development/python-modules/backports_lzma/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix
index c650076d4c0..409546e559a 100644
--- a/pkgs/development/python-modules/backports_lzma/default.nix
+++ b/pkgs/development/python-modules/backports_lzma/default.nix
@@ -25,6 +25,9 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec {
     PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test
   '';
 
+  # Relative import does not seem to function.
+  doCheck = false;
+
   meta = {
     description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
     homepage = https://github.com/peterjc/backports.lzma;

From 4e659884f998d2dd9386a15762d31d1b7bb16214 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 11:51:42 +0200
Subject: [PATCH 126/282] pythonPackages.pytest_32: move into celery

as that's the only consumer of this version of Pytest.
---
 pkgs/development/python-modules/celery/default.nix | 13 ++++++++++++-
 pkgs/top-level/python-packages.nix                 | 11 +----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 71911da08f4..8eef07ac3bb 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -2,7 +2,18 @@
   pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:
 
-buildPythonPackage rec {
+let
+
+  # Needed for celery
+  pytest_32 = pytest.overridePythonAttrs( oldAttrs: rec {
+    version = "3.2.5";
+    src = oldAttrs.src.override {
+      inherit version;
+      sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
+    };
+  });
+
+in buildPythonPackage rec {
   pname = "celery";
   version = "4.2.0";
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20d665d7ed6..3b03287b4f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1455,7 +1455,7 @@ in {
     '';
   };
 
-  celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; };
+  celery = callPackage ../development/python-modules/celery { };
 
   cerberus = callPackage ../development/python-modules/cerberus { };
 
@@ -1839,15 +1839,6 @@ in {
     hypothesis = self.hypothesis.override { doCheck = false; };
   };
 
-  # Needed for celery
-  pytest_32 = self.pytest_37.overridePythonAttrs( oldAttrs: rec {
-    version = "3.2.5";
-    src = oldAttrs.src.override {
-      inherit version;
-      sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
-    };
-  });
-
   pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
 
   pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { };

From e6f18ba0e00e2ff4084f130d947e1fbc8703c1ae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 14:41:32 +0200
Subject: [PATCH 127/282] pythonPackages.jinja2: disable tests

---
 pkgs/development/python-modules/jinja2/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix
index 7432b3bb99c..b800303c20c 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -14,9 +14,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ markupsafe ];
 
   checkPhase = ''
-    pytest -v
+    pytest -v tests
   '';
 
+  # RecursionError: maximum recursion depth exceeded
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = http://jinja.pocoo.org/;
     description = "Stand-alone template engine";

From 7a17ac0531d937870856f932c7ac454957992a7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:07 +0200
Subject: [PATCH 128/282] python: absl-py: 0.3.0 -> 0.4.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 3dd40a20e6c..17a0240f7e8 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fcb729e9a3cf1a8f88f6c3a6465859c42116f23e1feb6208825eb88f3fd2b880";
+    sha256 = "932e6acb1a57bdcfb784a1ce6ad46a2f50b89d355a5619ed6df60db1414173d2";
   };
 
   propagatedBuildInputs = [ six ];

From 0dc21c5e27365f3ed750a0861bdf5db1d90e9cec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:15 +0200
Subject: [PATCH 129/282] python: aiohue: 1.6.0 -> 1.7.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 1492a15aadf..d5572bb6d1d 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.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87f0f86865e88ea715ab358b1e5f2838b79ee7cdc0bdf762e9ed60aaf4c8bd4a";
+    sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8";
   };
 
   propagatedBuildInputs = [ aiohttp ];

From 69583398e8c2d87f7d20944676651b412b533d35 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:23 +0200
Subject: [PATCH 130/282] python: allpairspy: 2.4.0 -> 2.4.1

---
 pkgs/development/python-modules/allpairspy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index e21b43c60e0..d1f97d8e7c7 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "allpairspy";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034";
+    sha256 = "e8b35751f91692bf0318091b3f44cdf9bbbe3f37a2ff4786eaffc09dc7114fb3";
   };
 
   propagatedBuildInputs = [ six ];

From c2c69186f59182a8b45c08fe2d123e49d5baa913 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:30 +0200
Subject: [PATCH 131/282] python: APScheduler: 3.5.2 -> 3.5.3

---
 pkgs/development/python-modules/APScheduler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 25d3bc0b505..f3c8c57f576 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6aba721f4db411be8f5ffe89acbaa174fe46425e15edf32ed7bfdfafb6ec1eb4";
+    sha256 = "6599bc78901ee7e9be85cbd073d9cc155c42d2bc867c5cde4d4d1cc339ebfbeb";
   };
 
   buildInputs = [

From db2cd1de468be902b2562273ab5843ad3837f84a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:37 +0200
Subject: [PATCH 132/282] python: argon2_cffi: 18.1.0 -> 18.3.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 ce371076256..120928656b4 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.1.0";
+  version = "18.3.0";
   name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b";
+    sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d";
   };
 
   propagatedBuildInputs = [ cffi six ];

From aedf32c80957655096e0e691f27c441b3e236c9a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:44 +0200
Subject: [PATCH 133/282] python: autobahn: 18.7.1 -> 18.8.1

---
 pkgs/development/python-modules/autobahn/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index fac9fe48d5e..87a337a154d 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,22 +1,22 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
   unittest2, mock, pytest, trollius, asyncio,
-  pytest-asyncio, futures,
+  pytest-asyncio, futures, cffi,
   six, twisted, txaio, zope_interface
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "18.7.1";
+  version = "18.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "163dd329c2a29f4ef82f7fe85a6f6e654a2aa6837bd83834cf537e4efa9204be";
+    sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
   # is pythn3 only. Therefore, tests are skipped for python2.
   doCheck = isPy3k;
-  buildInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
-  propagatedBuildInputs = [ six twisted zope_interface txaio ] ++
+  checkInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
+  propagatedBuildInputs = [ cffi six twisted zope_interface txaio ] ++
     (stdenv.lib.optional isPy33 asyncio) ++
     (stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
 
@@ -29,6 +29,5 @@ buildPythonPackage rec {
     homepage    = "https://crossbar.io/autobahn";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
-    platforms   = platforms.all;
   };
 }

From c0321ebb179e4357331f45a08d3c5f58e4407451 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:51 +0200
Subject: [PATCH 134/282] python: bitmath: 1.3.1.2 -> 1.3.3.1

---
 pkgs/development/python-modules/bitmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix
index bb2e6046886..092ad6c1003 100644
--- a/pkgs/development/python-modules/bitmath/default.nix
+++ b/pkgs/development/python-modules/bitmath/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitmath";
-  version = "1.3.1.2";
+  version = "1.3.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd";
+    sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8";
   };
 
   checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ];

From d810c70f6cec9d0d68a7997774aa9e1dcc129490 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:42:58 +0200
Subject: [PATCH 135/282] python: bleach: 2.1.3 -> 2.1.4

---
 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 786564b92e0..3c5f1d44190 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 = "2.1.3";
+  version = "2.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44";
+    sha256 = "0ee95f6167129859c5dce9b1ca291ebdb5d8cd7e382ca0e237dfd0dad63f63d8";
   };
 
   checkInputs = [ pytest pytestrunner ];

From 996fd7996713cdedc7e128d9930432c79d637f69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:05 +0200
Subject: [PATCH 136/282] python: botocore: 1.10.75 -> 1.11.1

---
 pkgs/development/python-modules/botocore/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 9875c4eaff6..32e527e8b67 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -7,15 +7,16 @@
 , simplejson
 , mock
 , nose
+, urllib3
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.10.75";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "82055917cb431c1cee7c737189a170cc92ffc3824a6da504e8d3ff4df9fa2eab";
+    sha256 = "5b2d2393c02a082d605dac13c1322c3c553a4d4cf23de7b48268ae7f4a105eb3";
   };
 
   propagatedBuildInputs = [
@@ -24,6 +25,7 @@ buildPythonPackage rec {
     docutils
     ordereddict
     simplejson
+    urllib3
   ];
 
   checkInputs = [ mock nose ];

From 89b89c06dd7412a9030e576caa4b07e807ce4204 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:12 +0200
Subject: [PATCH 137/282] python: bugwarrior: 1.5.1 -> 1.6.0

---
 pkgs/development/python-modules/bugwarrior/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix
index ada8397f975..844aebbbb96 100644
--- a/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/pkgs/development/python-modules/bugwarrior/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "bugwarrior";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb";
+    sha256 = "cfa4fac19b4f4638928347b8fe192315f72813c3e8ed668867e5891338c7e4ec";
   };
 
   buildInputs = [ mock unittest2 nose /* jira megaplan */ ];

From 25296ed8f348158c73014f0374ee440fcc116221 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:18 +0200
Subject: [PATCH 138/282] python: cement: 2.10.12 -> 3.0.0

---
 pkgs/development/python-modules/cement/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 9b744957540..8947ff436fa 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cement";
-  version = "2.10.12";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70";
+    sha256 = "e50e1033d61d18b36787a60d52cad0d3fe20780e7e2f78f0204bde32000645f9";
   };
 
   # Disable test tests since they depend on a memcached server running on

From 52f3e8ac0f6eb888d4995982735fa864b83b8832 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:26 +0200
Subject: [PATCH 139/282] python: certifi: 2018.8.13 -> 2018.8.24

---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 429fd47f72e..40b3338fdec 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2018.8.13";
+  version = "2018.8.24";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c1d68a1408dd090d2f3a869aa94c3947cc1d967821d1ed303208c9f41f0f2f4";
+    sha256 = "376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638";
   };
 
   meta = {

From cffef355b0b47ca8a095eddcade2136243320d69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:33 +0200
Subject: [PATCH 140/282] python: cftime: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/cftime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 425a53987ca..9190f274a24 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f62fe79ed2ad38f4211477e59f6f045c91278351f4ce7578e33ddf52fb121ea8";
+    sha256 = "20556931f546838d09be5d589482dfae6164e0d403f0aab2163c006b680d3b92";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

From 236a2e57b9936892dbae90603bbf41a6a1ecb6a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:41 +0200
Subject: [PATCH 141/282] python: chainer: 4.3.1 -> 4.4.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 80219c3f95a..d0467888a88 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d56b769720ef9de93d5b74faea96729b076beb5362f97565654de3c723f2c822";
+    sha256 = "9cc4d43e1ea3e0766e211e4e755dbb879f2cf27a805cfa52e32b99fd1e5f24dd";
   };
 
   checkInputs = [

From e2d4d0a3b579c5668ba32ce40c924743953c3db3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:49 +0200
Subject: [PATCH 142/282] python: channels: 2.1.2 -> 2.1.3

---
 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 c63fe87dedc..cdcfc72000d 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.2";
+  version = "2.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173441ccf2ac3a93c3b4f86135db301cbe95be58f5815c1e071f2e7154c192a2";
+    sha256 = "8d503d18b92cef488ba68808a2205e055d29a6a1abae92d277f8f7a9c8752f13";
   };
 
   # Files are missing in the distribution

From d73fd699529aadd0c38931eceefa4c83f108fc34 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 25 Aug 2018 15:26:52 +0300
Subject: [PATCH 143/282] iwd: 0.4 -> 0.7

---
 nixos/modules/services/networking/iwd.nix |  9 +--------
 pkgs/os-specific/linux/iwd/default.nix    | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index cfc536fc5b5..eb03d2e1d63 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -20,14 +20,7 @@ in {
 
     services.dbus.packages = [ pkgs.iwd ];
 
-    systemd.services.iwd = {
-      description = "Wireless daemon";
-      before = [ "network.target" ];
-      wants = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
-    };
+    systemd.packages = [ pkgs.iwd ];
 
     systemd.tmpfiles.rules = [
       "d /var/lib/iwd 0700 root root -"
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 833609f9fc2..79179f3fcbb 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }:
+{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }:
 
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.7";
-     sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7";
+     rev = "0.9";
+     sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.4";
+  version = "0.7";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs";
+    sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab";
   };
 
   nativeBuildInputs = [
@@ -35,8 +35,9 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-dbus-datadir=$(out)/etc/"
-    "--localstatedir=/var"
-    "--disable-systemd-service"
+    "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
+    "--with-systemd-unitdir=$(out)/lib/systemd/system/"
+    "--localstatedir=/var/"
   ];
 
   postUnpack = ''
@@ -55,6 +56,11 @@ in stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
+  postFixup = ''
+    substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
+                      --replace /bin/false ${coreutils}/bin/false
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     description = "Wireless daemon for Linux";

From 87232bc38266476277072f501118cb4f28c34050 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:49:58 +0000
Subject: [PATCH 144/282] [cpan2nix] perlPackages.ArchiveZip: 1.60 -> 1.62

---
 pkgs/top-level/perl-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5add53c0dc2..5a455f9fc95 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -526,12 +526,11 @@ let
   };
 
   ArchiveZip = buildPerlPackage {
-    name = "Archive-Zip-1.60";
+    name = "Archive-Zip-1.62";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz;
-      sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza";
+      url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.62.tar.gz;
+      sha256 = "1jax173w7nm5r6k7ymfcskvs1rw590lyscbqrnfbkjj4cxc65wrb";
     };
-    buildInputs = [ TestMockModule ];
     meta = {
       description = "Provide an interface to ZIP archive files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 9fa1b9e0d8b232792febc0a75751950421cf754d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:50:02 +0000
Subject: [PATCH 145/282] [cpan2nix] perlPackages.CPANPerlReleases: 3.70 ->
 3.74

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5a455f9fc95..0046b300872 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2870,10 +2870,10 @@ let
   };
 
   CPANPerlReleases = buildPerlPackage rec {
-    name = "CPAN-Perl-Releases-3.70";
+    name = "CPAN-Perl-Releases-3.74";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "1yv9gq3rzhccskmpd9nn2n8v8zc6r9rlq5x47l0yva29yfgqb16r";
+      sha256 = "0qdh79fl38cyq9kp2g2s934gl1nn5jd88rgmqarqcmja8xhpfcp3";
     };
     meta = {
       homepage = https://github.com/bingos/cpan-perl-releases;

From 0ed9c00de0fbb63c917be951377691296bd09924 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:50:13 +0000
Subject: [PATCH 146/282] [cpan2nix] perlPackages.CpanelJSONXS: 4.04 -> 4.05

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0046b300872..a80fdda4c7a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2780,10 +2780,10 @@ let
   };
 
   CpanelJSONXS = buildPerlPackage rec {
-    name = "Cpanel-JSON-XS-4.04";
+    name = "Cpanel-JSON-XS-4.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
-      sha256 = "e128702a266b9a690bd3d380f726c229f9d6d795e8e206b9d32309d06825b2cd";
+      sha256 = "dd2b69265604ac6f18b47131565f712d55ed8df3b85f8f58f0c98cad17383663";
     };
     meta = {
       description = "CPanel fork of JSON::XS, fast and correct serializing";

From 7c523808fbe77d4a7888b9e97e1f0dfa7726934e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:50:44 +0000
Subject: [PATCH 147/282] [cpan2nix] perlPackages.Filter: 1.58 -> 1.59

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a80fdda4c7a..aa3bf8e4133 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6255,10 +6255,10 @@ let
   };
 
   Filter = buildPerlPackage {
-    name = "Filter-1.58";
+    name = "Filter-1.59";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.58.tar.gz;
-      sha256 = "6de91cb4cbfe08d0ccffbca39aed57f9237be602b8183f13fd163fc8cb657f3d";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz;
+      sha256 = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a";
     };
     meta = {
       description = "Source Filters";

From f5db4a4669780acd48a5a6b54c321a83477fa5db Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:07 +0000
Subject: [PATCH 148/282] [cpan2nix] perlPackages.LogAny: 1.706 -> 1.707

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aa3bf8e4133..24a33db8947 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8760,10 +8760,10 @@ let
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.706";
+    name = "Log-Any-1.707";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz";
-      sha256 = "3ed0e5a4b7d490ab00624b7f905421239261f1dc976192aad2c0d1509bec08be";
+      sha256 = "74510f8cbee12637462e7c6020c8943d447a1e8e149a256f8168ee47562c65f1";
     };
     # Syslog test fails.
     preCheck = "rm t/syslog.t";

From bbc658ffde88ffecc1522fd6ca25a61cfb33c022 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:09 +0000
Subject: [PATCH 149/282] [cpan2nix] perlPackages.MLDBM: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 24a33db8947..fa2d6e624aa 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9541,7 +9541,7 @@ let
     };
   };
 
-  MLDBM = buildPerlPackage rec {
+  MLDBM = buildPerlModule rec {
     name = "MLDBM-2.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz";

From ff1e4c79a515e4a6c9c416c933cc4f2379843937 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:14 +0000
Subject: [PATCH 150/282] [cpan2nix] perlPackages.ModuleCoreList: 5.20180720 ->
 5.20180820

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fa2d6e624aa..e36e7530299 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9715,10 +9715,10 @@ let
   };
 
   ModuleCoreList = buildPerlPackage {
-    name = "Module-CoreList-5.20180720";
+    name = "Module-CoreList-5.20180820";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180720.tar.gz;
-      sha256 = "0l6dyj4m4qgv2yzq3pp0bkvg1j9nh9mcm1p4x3g3j93gkba7whws";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180820.tar.gz;
+      sha256 = "1ccs5mqcfxjv8bax2nfsg11b2vc3sqyapfapxyzrjhaa2fmdn54l";
     };
     meta = {
       homepage = http://dev.perl.org/;

From 471b3f1dec0a077748083d181660c0c6ddd21086 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:17 +0000
Subject: [PATCH 151/282] [cpan2nix] perlPackages.Mojolicious: 7.88 -> 7.93

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e36e7530299..8b3c7c27aee 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10017,10 +10017,10 @@ let
     };
   };
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-7.88";
+    name = "Mojolicious-7.93";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785";
+      sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d";
     };
     meta = {
       homepage = https://mojolicious.org/;

From 433d1496458ba994f4b9ab656459e4e0811bbdcb Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:20 +0000
Subject: [PATCH 152/282] [cpan2nix] perlPackages.NetPing: 2.68 -> 2.70

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b3c7c27aee..89b5a773b1e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11334,10 +11334,10 @@ let
   };
 
   NetPing = buildPerlPackage {
-    name = "Net-Ping-2.68";
+    name = "Net-Ping-2.70";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.68.tar.gz;
-      sha256 = "d01ac2fcdf684c4a23a07104fbb147cfbdbda47fd5b660912124258f29afd7e3";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.70.tar.gz;
+      sha256 = "41400089736f528cfa1196083905d4bbd313c4653a03fab8578cebd5b5b6aa5a";
     };
     meta = {
       description = "Check a remote host for reachability";

From 2898f68e81f63fb85b27ec218c6fa2d032587c04 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:28 +0000
Subject: [PATCH 153/282] [cpan2nix] perlPackages.Paranoid: 2.05 -> 2.06

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89b5a773b1e..34617a385fe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11848,10 +11848,10 @@ let
   };
 
   Paranoid = buildPerlPackage rec {
-    name = "Paranoid-2.05";
+    name = "Paranoid-2.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz";
-      sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df";
+      sha256 = "48763ec19d0a4194ecf613bd63e46325510228da9100c2e796615dc778612d3c";
     };
     patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ];
     preConfigure = ''

From a110976924d46ff0826219c454aad2b53bbe181e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:29 +0000
Subject: [PATCH 154/282] [cpan2nix] perlPackages.PathTiny: 0.106 -> 0.108

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 34617a385fe..b5c9382aae7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11986,10 +11986,10 @@ let
   };
 
   PathTiny = buildPerlPackage {
-    name = "Path-Tiny-0.106";
+    name = "Path-Tiny-0.108";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.106.tar.gz;
-      sha256 = "308e39087b626013569a15783b896d61916fd1e67d06017f40cff567af36464d";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz;
+      sha256 = "3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5";
     };
     meta = {
       description = "File path utility";

From 9a2529672c14c594a246f43dc6a7a8f1960929d5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:51:32 +0000
Subject: [PATCH 155/282] [cpan2nix] perlPackages.PkgConfig: 0.19026 -> 0.21026

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5c9382aae7..f20381a25a7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12242,10 +12242,10 @@ let
   };
 
   PkgConfig = buildPerlPackage rec {
-    name = "PkgConfig-0.19026";
+    name = "PkgConfig-0.21026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
-      sha256 = "5cb6e934d29dd93e04c2fa779f4b7e51361edaf56957b47a232017a4bb7e922c";
+      sha256 = "018f8d3c74e661df66046b26e57f4c5991adafe202af7ea2d1c6f6bcafde584b";
     };
     meta = {
       description = "Pure-Perl Core-Only replacement for pkg-config";

From ef498e603314b8ed7fbd95934dbb752c4fec977c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:52:06 +0000
Subject: [PATCH 156/282] [cpan2nix] perlPackages.TestSimple13: 1.302138 ->
 1.302140

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f20381a25a7..048fb305407 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15837,10 +15837,10 @@ let
   };
 
   TestSimple13 = buildPerlPackage rec {
-    name = "Test-Simple-1.302138";
+    name = "Test-Simple-1.302140";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz;
-      sha256 = "568615a551075d3657cb0cbca55cf3672734c954f0306e9823ecd002aa911655";
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302140.tar.gz;
+      sha256 = "73f5440c7ae55e13706e9ebeaa7247df973226470f028344ea3cd21e1642bd1d";
     };
     meta = {
       description = "Basic utilities for writing tests";

From e6fa561afc84e28607a7b9b9b1091e286bcf1200 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:52:10 +0000
Subject: [PATCH 157/282] [cpan2nix] perlPackages.TextCSV: 1.95 -> 1.97

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 048fb305407..838a7cc30c0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16189,10 +16189,10 @@ let
   };
 
   TextCSV = buildPerlPackage rec {
-    name = "Text-CSV-1.95";
+    name = "Text-CSV-1.97";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz;
-      sha256 = "7e0a11d9c1129a55b68a26aa4b37c894279df255aa63ec8341d514ab848dbf61";
+      url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.97.tar.gz;
+      sha256 = "cc350462efa8d39d5c8a1da5f205bc31620cd52d9865a769c8e3ed1b41640fd5";
     };
     meta = {
       description = "Comma-separated values manipulator (using XS or PurePerl)";

From ad6d0e42f7ba938b80d069d52adedf7aee230331 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:52:55 +0000
Subject: [PATCH 158/282] [cpan2nix] perlPackages.IOSocketSSL: 2.058 -> 2.059

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 838a7cc30c0..854524487b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7781,10 +7781,10 @@ let
   };
 
   IOSocketSSL = buildPerlPackage rec {
-    name = "IO-Socket-SSL-2.058";
+    name = "IO-Socket-SSL-2.059";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
-      sha256 = "746cd17c292cfc206b394497a060b0582d0b06a1040e6bb27e6530d56786e40b";
+      sha256 = "217debbe0a79f0b7c5669978b4d733271998df4497f4718f78456e5f54d64849";
     };
     propagatedBuildInputs = [ NetSSLeay ];
     # Fix path to default certificate store.

From c184a1be95034e7db06c6ba91b15871f10ab5db5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:03 +0000
Subject: [PATCH 159/282] [cpan2nix] perlPackages.ModuleScanDeps: 1.24 -> 1.25

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 854524487b9..408da5a59b0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9938,11 +9938,11 @@ let
     };
   };
 
-  ModuleScanDeps = let version = "1.24"; in buildPerlPackage {
+  ModuleScanDeps = let version = "1.25"; in buildPerlPackage {
     name = "Module-ScanDeps-${version}";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz";
-      sha256 = "0s6cj90ckhy351gql52ksh4ms1x8piv26iadl09fcpzkx7j0srw9";
+      sha256 = "13280nq0d6zc58mcz3kvs2m85a741czq0fabk69ks1nr4j1w2nl4";
     };
     buildInputs = [ TestRequires ];
     meta = {

From 05e5a6dd0e3818621da1696574648b7267a19525 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:12 +0000
Subject: [PATCH 160/282] [cpan2nix] perlPackages.TypeTiny: 1.002002 ->
 1.004002

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 408da5a59b0..eff17c6e7e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16981,10 +16981,10 @@ let
   };
 
   TypeTiny = buildPerlPackage {
-    name = "Type-Tiny-1.002002";
+    name = "Type-Tiny-1.004002";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002002.tar.gz;
-      sha256 = "a85b0c8f99b5c9b5558f0bcc8893b44299fcccf3c264ff924940d09d91d8882c";
+      url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004002.tar.gz;
+      sha256 = "e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707";
     };
     propagatedBuildInputs = [ ExporterTiny ];
     meta = {

From 4aae8f0fa6a86c3af51e24c8cef55082fd1d6b03 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:13 +0000
Subject: [PATCH 161/282] [cpan2nix] perlPackages.XMLParserLite: 0.721 -> 0.722

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eff17c6e7e5..a38b03c344a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17687,10 +17687,10 @@ let
   };
 
   XMLParserLite = buildPerlPackage {
-    name = "XML-Parser-Lite-0.721";
+    name = "XML-Parser-Lite-0.722";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz;
-      sha256 = "1fh8g77nkfv9n07ivilnfxdapx6jx13whf8q0anrmnxrr9pa6qjq";
+      url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz;
+      sha256 = "1vk3jwh1kfcsmc5kvxzqdnb1cllvf0yf27fg0ra0w6jkw4ks143g";
     };
     buildInputs = [ TestRequires ];
     meta = {

From 0eda6c26a651f08e4d18e2b324233e7656fa8f10 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:28 +0000
Subject: [PATCH 162/282] [cpan2nix] perlPackages.NetDNS: 1.16 -> 1.17

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a38b03c344a..4209b0486f4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11204,10 +11204,10 @@ let
   };
 
   NetDNS = buildPerlPackage rec {
-    name = "Net-DNS-1.16";
+    name = "Net-DNS-1.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz";
-      sha256 = "8163eebaf46d1a870b6f596684f345da7c3a7461d7dba2b85f23e02d8982ea37";
+      sha256 = "9a79fd8fea1a708726c18d193ae4437479206ccb20ffa7f0971371e172e2c2e0";
     };
     propagatedBuildInputs = [ DigestHMAC IOSocketIP ];
     makeMakerFlags = "--noonline-tests";

From fb58820af55bab2d9e7e8a272a92bd6da9077296 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:36 +0000
Subject: [PATCH 163/282] [cpan2nix] perlPackages.TextQuoted: 2.09 -> 2.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4209b0486f4..ba28093e4e6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16390,10 +16390,10 @@ let
   };
 
   TextQuoted = buildPerlPackage {
-    name = "Text-Quoted-2.09";
+    name = "Text-Quoted-2.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AL/ALEXMV/Text-Quoted-2.09.tar.gz;
-      sha256 = "446c3e8da7e65f7988cd36e9da1159614eb0b337d6c4c0dec8f6df7673b96c5f";
+      url = mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz;
+      sha256 = "081bf95ec9220af26cec89161e61bf73f9fbcbfeee1d9af15139e5d7b708f445";
     };
     propagatedBuildInputs = [ TextAutoformat ];
     meta = {

From dd8e22220368117b139bdb6dccbff8164a43a7a2 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:36 +0000
Subject: [PATCH 164/282] [cpan2nix] perlPackages.TextSimpleTable: 2.05 -> 2.07

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ba28093e4e6..6c2bee3cf1f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16442,10 +16442,10 @@ let
   };
 
   TextSimpleTable = buildPerlPackage {
-    name = "Text-SimpleTable-2.05";
+    name = "Text-SimpleTable-2.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.05.tar.gz;
-      sha256 = "1akcv3iq4y6mjc88p0j9yvv6g0g5cnc9nvzxnmsswnx5si7v5am5";
+      url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz;
+      sha256 = "1v8r8qpzg283p2pqqr8dqrak2bxray1b2jmib0qk75jffqw3yv95";
     };
     meta = {
       description = "Simple eyecandy ASCII tables";

From a8d2126f44608c4ab0fec7efa754e4d5ee3a360a Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:55 +0000
Subject: [PATCH 165/282] [cpan2nix] perlPackages.CGISimple: 1.15 -> 1.16

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6c2bee3cf1f..1a4536761e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1853,10 +1853,10 @@ let
   };
 
   CGISimple = buildPerlModule rec {
-    name = "CGI-Simple-1.15";
+    name = "CGI-Simple-1.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.15.tar.gz;
-      sha256 = "013dcy9k4sj9alkksk5aqz65ryxw0rxgg71c7w666y941gd8n46q";
+      url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.16.tar.gz;
+      sha256 = "1j07qy22a9k4g1xasxma7yzfmwwn3iy50rkxdhz8hz9f09hiym0f";
     };
     propagatedBuildInputs = [ IOStringy ];
     meta = {

From ee263f3371141e3c93a9922bfe4c3e2fea3ca17c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:55 +0000
Subject: [PATCH 166/282] [cpan2nix] perlPackages.CarpAlways: 0.13 -> 0.16

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1a4536761e0..f894f419a1a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1093,10 +1093,10 @@ let
   };
 
   CarpAlways = buildPerlPackage rec {
-    name = "Carp-Always-0.13";
+    name = "Carp-Always-0.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz";
-      sha256 = "0i2rifkr7ybfcdsqana52487z7vxp2l5qdra0f6ik0ddhn6rzii1";
+      sha256 = "1wb6b0qjga7kvn4p8df6k4g1pl2yzaqiln1713xidh3i454i3alq";
     };
     meta = {
       description = "Warns and dies noisily with stack backtraces";

From f2dbd4ecb123a45cefce7f8b601686b9b1671446 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:53:55 +0000
Subject: [PATCH 167/282] [cpan2nix] perlPackages.Coro: 6.514 -> 6.52

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f894f419a1a..78846878813 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2740,10 +2740,10 @@ let
   };
 
   Coro = buildPerlPackage rec {
-     name = "Coro-6.514";
+     name = "Coro-6.52";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.514.tar.gz;
-       sha256 = "0qndvq74knyra9r98pyllsxz0s80dzc1ljx10arjv9whja1l6cyq";
+       url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.52.tar.gz;
+       sha256 = "1q744smw6m676v8n0ww8jvmh1zg1iw7f7clzblwbfgmhy03h5ja9";
      };
      propagatedBuildInputs = [ AnyEvent Guard commonsense ];
      buildInputs = [ CanaryStability ];

From 9d7599fb00e1b5e3bf160e794747ddc2538ee42b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:54:01 +0000
Subject: [PATCH 168/282] [cpan2nix] perlPackages.PodMarkdown: 3.005 -> 3.101

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 78846878813..4bc6786156c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12932,10 +12932,10 @@ let
   };
 
   PodMarkdown = buildPerlPackage {
-    name = "Pod-Markdown-3.005";
+    name = "Pod-Markdown-3.101";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.005.tar.gz;
-      sha256 = "00s3745kl4vbxqyi2lx149q5ghyfazc4fd00kcpl84bb87jfgdzq";
+      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.101.tar.gz;
+      sha256 = "0h7hx4k1c3k00cfnlf226bkxnxaz01705m10vxm9cxh52xn6pzz8";
     };
     buildInputs = [ TestDifferences ];
     meta = {

From 66e597d89389652f60a8887d0591f5a9100282d7 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:54:13 +0000
Subject: [PATCH 169/282] [cpan2nix] perlPackages.CGI: 4.38 -> 4.40

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4bc6786156c..78b4577526c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1741,10 +1741,10 @@ let
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.38";
+    name = "CGI-4.40";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4";
+      sha256 = "10efff3061b3c31a33b3cc59f955aef9c88d57d12dbac46389758cef92f24f56";
     };
     buildInputs = [ TestDeep TestNoWarnings TestWarn ];
     propagatedBuildInputs = [ HTMLParser ];

From 79195003188d67d89bf1649ec49643d9ce7dc5e1 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:54:16 +0000
Subject: [PATCH 170/282] [cpan2nix] perlPackages.FileMimeInfo: 0.28 -> 0.29

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 78b4577526c..e2badab85a1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5936,10 +5936,10 @@ let
   };
 
   FileMimeInfo = buildPerlPackage rec {
-    name = "File-MimeInfo-0.28";
+    name = "File-MimeInfo-0.29";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.28.tar.gz;
-      sha256 = "1ipbh63bkh1r2gy5g7q4bzhki8j29mm1jkhbv60p9vwsdys5s91a";
+      url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz;
+      sha256 = "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi";
     };
     doCheck = false; # Failed test 'desktop file is the right one'
     buildInputs = [ FileBaseDir FileDesktopEntry ];

From 0d0584ea4bc1f6ca5b9d59b719fced6e04372d66 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:00 +0000
Subject: [PATCH 171/282] [cpan2nix] perlPackages.MonitoringPlugin: 0.39 ->
 0.40

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e2badab85a1..bd4047ad33c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10043,10 +10043,10 @@ let
   };
 
   MonitoringPlugin = buildPerlPackage rec {
-    name = "Monitoring-Plugin-0.39";
+    name = "Monitoring-Plugin-0.40";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NI/NIERLEIN/${name}.tar.gz";
-      sha256 = "030cw86j8712z8rn66k935gbilb5rcj3lnk4n53vh1b2phrszvjw";
+      sha256 = "0vr3wwdn3zs246qwi04bqk8jir6l88j5m59jk97hmfyj4xz6pfpq";
     };
     propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ];
     meta = {

From dfb78acae5dde7db561fea43d2a00ef44c2ef964 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:04 +0000
Subject: [PATCH 172/282] [cpan2nix] perlPackages.GamesSolitaireVerify: 0.1800
 -> 0.1900

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bd4047ad33c..29b563034e2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6353,10 +6353,10 @@ let
   };
 
   GamesSolitaireVerify = buildPerlModule {
-    name = "Games-Solitaire-Verify-0.1800";
+    name = "Games-Solitaire-Verify-0.1900";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1800.tar.gz;
-      sha256 = "935ba997c49437a095adb39fd18233d5e378941aa9974df46e56aa6234f1fced";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1900.tar.gz;
+      sha256 = "6b17847bd69da05ee089562cf40f2aac15e64c113175eca4fb501d4e86b48181";
     };
     buildInputs = [ TestDifferences ];
     propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ];

From ad47c381bda2d38cddb96e15efd4ea5b4836f542 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:08 +0000
Subject: [PATCH 173/282] [cpan2nix] perlPackages.GetoptLongDescriptive: 0.102
 -> 0.103

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 29b563034e2..a3f3da1e099 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6451,10 +6451,10 @@ let
   };
 
   GetoptLongDescriptive = buildPerlPackage rec {
-    name = "Getopt-Long-Descriptive-0.102";
+    name = "Getopt-Long-Descriptive-0.103";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846";
+      sha256 = "70e1bae7404a9dfb638b5d12e5bd4ea97e3bee743a4555909307d68e0111f4b2";
     };
     buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
     propagatedBuildInputs = [ ParamsValidate SubExporter ];

From 1b4b076e77a811dcebd6f59eafc14bcc5c8b03c3 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:10 +0000
Subject: [PATCH 174/282] [cpan2nix] perlPackages.ProtocolHTTP2: 1.08 -> 1.09

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a3f3da1e099..e362c6bedd0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12664,11 +12664,11 @@ let
   };
 
   ProtocolHTTP2 = buildPerlModule rec {
-    name = "Protocol-HTTP2-1.08";
+    name = "Protocol-HTTP2-1.09";
 
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CR/CRUX/${name}.tar.gz";
-      sha256 = "06y1djgzbn340hixav85728dvp8mj2mx2qf5fzkqxh145g5q860g";
+      sha256 = "1bc0ybkqhv81dscgzlbr62w4zqjsidcikmkbjanzn83g2b6ia9nc";
     };
     buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ];
   };

From b7010ba7566dae333e88566194de82e4051e35b6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:16 +0000
Subject: [PATCH 175/282] [cpan2nix] perlPackages.PPIxRegexp: 0.061 -> 0.062

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e362c6bedd0..2b20b3708cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12552,10 +12552,10 @@ let
   };
 
   PPIxRegexp = buildPerlModule rec {
-    name = "PPIx-Regexp-0.061";
+    name = "PPIx-Regexp-0.062";
     src = fetchurl {
       url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz";
-      sha256 = "e2d63a4102024e15994c685672d30c6d708272a1600abcd6241e6f2c1b3b7c92";
+      sha256 = "1218fe4c94b3cb9d894c6cd8a69bb4172eac54ce083b70f7a8bf13868a5a0733";
     };
     propagatedBuildInputs = [ PPI ];
     meta = {

From c80bbbb9e3c433a597a6d7ea403b3cf3f5e46b9d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:29 +0000
Subject: [PATCH 176/282] [cpan2nix] perlPackages.XMLSemanticDiff: 1.0006 ->
 1.0007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2b20b3708cf..cd120b69015 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17801,10 +17801,10 @@ let
   };
 
   XMLSemanticDiff = buildPerlModule {
-    name = "XML-SemanticDiff-1.0006";
+    name = "XML-SemanticDiff-1.0007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-SemanticDiff-1.0006.tar.gz;
-      sha256 = "1z0lkb7xzhw9calz4pbwzry2lqqpy6pw6pvfn2gv70ry1xqycr0k";
+      url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz;
+      sha256 = "1xd00821y795fy2rag8aizb5wsbbzfxgmdf9qwpvdxn3pgpyzz85";
     };
     propagatedBuildInputs = [ XMLParser ];
     meta = {

From fab711473cdc7741cc3278238fab35ce615ff528 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:32 +0000
Subject: [PATCH 177/282] [cpan2nix] perlPackages.Mouse: v2.5.4 -> v2.5.6

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cd120b69015..bc67aa45928 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10909,10 +10909,10 @@ let
   };
 
   Mouse = buildPerlModule rec {
-    name = "Mouse-2.5.4";
+    name = "Mouse-2.5.6";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.4.tar.gz;
-      sha256 = "041nm46bxxyi1fd8w69r45k434b6m43va2s06pr3bys6igxic79d";
+      url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz;
+      sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l";
     };
     buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ];
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";

From c5a4ce386d74f408725ebf417b36e6b3c2652b68 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:37 +0000
Subject: [PATCH 178/282] [cpan2nix] perlPackages.RESTClient: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bc67aa45928..a03dff5c3ce 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13216,7 +13216,7 @@ let
       url = "mirror://cpan/authors/id/K/KK/KKANE/${name}.tar.gz";
       sha256 = "a8652a2214308faff2c68be5ce64c904dcccc5e86be7f32376c1590869d01844";
     };
-    propagatedBuildInputs = [ LWP LWPProtocolhttps URI ];
+    propagatedBuildInputs = [ LWPProtocolHttps ];
     meta = {
       description = "A simple client for interacting with RESTful http/https resources";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 35227f7bcb144350f9d70b056da735e0b3170095 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:37 +0000
Subject: [PATCH 179/282] [cpan2nix] perlPackages.ApacheAuthCookie: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a03dff5c3ce..5ae683b98d1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -215,7 +215,7 @@ let
       url = "mirror://cpan/authors/id/M/MS/MSCHOUT/${name}.tar.gz";
       sha256 = "58daeb3e44c681ff88f8fb00e4aabaa7a40cbee73dbdb84fcf6c285b15d357bd";
     };
-    buildInputs = [ ApacheTest URI ];
+    buildInputs = [ ApacheTest ];
     propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ];
 
     # Fails because /etc/protocols is not available in sandbox and make

From 45e03cef9d3be8a85cbc3b378f419a51692afcc9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:39 +0000
Subject: [PATCH 180/282] [cpan2nix] perlPackages.ParamsValidationCompiler:
 0.27 -> 0.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5ae683b98d1..ac7b9f8ec15 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11834,10 +11834,10 @@ let
   };
 
   ParamsValidationCompiler = buildPerlPackage rec {
-     name = "Params-ValidationCompiler-0.27";
+     name = "Params-ValidationCompiler-0.30";
      src = fetchurl {
-       url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.27.tar.gz;
-       sha256 = "1cpr188c2xm0kkmdir6slcsgv7v6ibqff4lax8s0whwx6ml9kaah";
+       url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz;
+       sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw";
      };
      propagatedBuildInputs = [ EvalClosure ExceptionClass ];
      buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ];

From 1c613fdd8e418ce292d11f730338c88e262fb4af Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:55:42 +0000
Subject: [PATCH 181/282] [cpan2nix] perlPackages.NetDBus: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ac7b9f8ec15..96c0c525ed1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11194,7 +11194,7 @@ let
       sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ TestPod TestPodCoverage pkgs.dbus ];
+    buildInputs = [ pkgs.dbus TestPod TestPodCoverage ];
     propagatedBuildInputs = [ XMLTwig ];
     meta = {
       homepage = http://www.freedesktop.org/wiki/Software/dbus;

From ea4aaa5c582c0dd00b2e72e6814848024ae866a4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:56:04 +0000
Subject: [PATCH 182/282] [cpan2nix] perlPackages.DateTime: 1.49 -> 1.50

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 96c0c525ed1..4cc673a2dd2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3643,10 +3643,10 @@ let
   };
 
   DateTime = buildPerlPackage rec {
-    name = "DateTime-1.49";
+    name = "DateTime-1.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh";
+      sha256 = "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd";
     };
     buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ];

From 6e9d2c5da9cec6af8a4b33babcd02c00e30d576d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 12:56:31 +0000
Subject: [PATCH 183/282] [cpan2nix] perlPackages.MooseXGetopt: 0.71 -> 0.72

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4cc673a2dd2..7761e42f544 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10479,12 +10479,12 @@ let
   };
 
   MooseXGetopt = buildPerlModule rec {
-    name = "MooseX-Getopt-0.71";
+    name = "MooseX-Getopt-0.72";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "de18f8ea0a5650cbbdebecb8f4c028f5f951fc5698332f7b8e20c7874902c259";
+      sha256 = "a378411a061ed239554d2b7f86b2b82bf55f600901243a6ec3fd29557d171b2e";
     };
-    buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings ];
+    buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ];
     propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ];
     meta = {
       homepage = https://github.com/moose/MooseX-Getopt;

From 9654348e8221014b97e89cf18c7e62b0c4893311 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 25 Aug 2018 13:04:38 +0000
Subject: [PATCH 184/282] [cpan2nix] perlPackages.DBFile: 1.841 -> 1.842

---
 pkgs/development/perl-modules/DB_File/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index b34ea387366..b3ca12421e4 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, db}:
 
 buildPerlPackage rec {
-  name = "DB_File-1.841";
+  name = "DB_File-1.842";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn";
+    sha256 = "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg";
   };
 
   preConfigure = ''

From a6e0625f3799f44149d529c340c4e0659f3a0a66 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:43:57 +0200
Subject: [PATCH 185/282] python: CherryPy: 17.0.0 -> 17.3.0

---
 pkgs/development/python-modules/cherrypy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index e9ae4bde8cc..cb3c48c0882 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,20 +1,20 @@
 { lib, buildPythonPackage, fetchPypi
-, cheroot, portend, routes, six
-, setuptools_scm
+, cheroot, contextlib2, portend, routes, six
+, setuptools_scm, zc_lockfile
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
 , backports_functools_lru_cache, requests_toolbelt
 }:
 
 buildPythonPackage rec {
   pname = "CherryPy";
-  version = "17.0.0";
+  version = "17.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7";
+    sha256 = "c3e4d76232ade4c47666b9008f92556465df517b8dca833ece3bed027028ae7d";
   };
 
-  propagatedBuildInputs = [ cheroot portend routes six ];
+  propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
 
   buildInputs = [ setuptools_scm ];
 

From 986aca49593aa17387a382fff5c4782a3c056760 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:05 +0200
Subject: [PATCH 186/282] python: cloudpickle: 0.5.3 -> 0.5.5

---
 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 acae5d73b2c..f70ebee411a 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.5.3";
+  version = "0.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54858c7b7dc763ed894ff91059c1d0b017d593fe23850d3d8d75f47d98398197";
+    sha256 = "6ea4b548f61a4f616b065182716318c7dced8c053517f35ac59cec22802daf3d";
   };
 
   buildInputs = [ pytest mock ];

From ca7b397379c13e03055a19f33e2b6dd469279643 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:12 +0200
Subject: [PATCH 187/282] python: cmd2: 0.9.3 -> 0.9.4

---
 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 1997c2389ab..4c2e78a102e 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -5,11 +5,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417";
+    sha256 = "0037dcf92331c63ae43e7e644536e646fff8be2fd5a83da06b3482f910f929c6";
   };
 
   LC_ALL="en_US.UTF-8";

From 9c838e9d5d8afa445bad15db93abac6e135ed99d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:20 +0200
Subject: [PATCH 188/282] python: coveralls: 1.3.0 -> 1.4.0

---
 pkgs/development/python-modules/coveralls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index f57e0fe8609..d0e26e2e07a 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -16,12 +16,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346";
+    sha256 = "7ddb2e3114db9604a7cb1fcc68a7dcca32dce346f5ba568c99979b38e166f5a6";
   };
 
   checkInputs = [

From c9be5d27d6c6df7f66110b063449ca777a722ea4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:28 +0200
Subject: [PATCH 189/282] python: cryptography: 2.3 -> 2.3.1

---
 pkgs/development/python-modules/cryptography/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 52244ae4d96..2771e74e134 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -23,11 +23,11 @@
 buildPythonPackage rec {
   # also bump cryptography_vectors
   pname = "cryptography";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6";
+    sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6";
   };
 
   outputs = [ "out" "dev" ];

From 473adfa1e9312422b901d7bf0d5de2b43bbdd1a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:36 +0200
Subject: [PATCH 190/282] python: cryptography_vectors: 2.3 -> 2.3.1

---
 .../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 ba896d29fc5..bcb60eb0d8d 100644
--- a/pkgs/development/python-modules/cryptography_vectors/default.nix
+++ b/pkgs/development/python-modules/cryptography_vectors/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   # also bump cryptography
   pname = "cryptography_vectors";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15";
+    sha256 = "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46";
   };
 
   # No tests included

From f086479e5f38daabcc395a9abd78ae8ee4bbfb6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:44 +0200
Subject: [PATCH 191/282] python: cupy: 4.3.0 -> 4.4.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 5d9ae10b09a..9a836e88752 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5";
+    sha256 = "fca0e3d3fdad4c825197ea421bed0d253224b44daf738d82af5cba856c1c0b3e";
   };
 
   checkInputs = [

From b576eb9eb548560dfc8f8bb590daaaf1d6c1806c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:44:52 +0200
Subject: [PATCH 192/282] python: python-debian: 0.1.32 -> 0.1.33

---
 pkgs/development/python-modules/debian/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix
index e4cd21bce4a..f09195b6dc5 100644
--- a/pkgs/development/python-modules/debian/default.nix
+++ b/pkgs/development/python-modules/debian/default.nix
@@ -1,14 +1,22 @@
-{ buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , chardet, six}:
 
 buildPythonPackage rec {
   pname = "python-debian";
-  version = "0.1.32";
+  version = "0.1.33";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "143887ac647ad30819f289f5a4ca13b77e56df27b686b84c34669447f7591280";
+    sha256 = "06e91d45019fe5f2e111ba827ea77730d6ce2fea698ada4e5b0b70b5fdbc18c5";
   };
 
   propagatedBuildInputs = [ chardet six ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "Debian package related modules";
+    license = lib.licenses.gpl2;
+  };
 }

From 90b64be3bed67982b984a4168a43b111e9789033 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:45:00 +0200
Subject: [PATCH 193/282] python: detox: 0.12 -> 0.13

---
 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 7c3aa87e9b8..3e2c814292b 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.12";
+  version = "0.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06svvkszg6xlg0fr471smn4rmpfga960d6qqsyhyiwa48k59n4gk";
+    sha256 = "f0c2af9c29f8e200a50b561ccc531df3087c80e7d3de6cfa9828f5fea3c8f56c";
   };
 
   buildInputs = [ pytest ];

From 9a482bef6f721fe8973619220d4f50cada0220d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:45:16 +0200
Subject: [PATCH 194/282] python: easydict: 1.7 -> 1.8

---
 pkgs/development/python-modules/easydict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index eb98cd18ef2..aed91033e97 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "easydict";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xpnwjdw4x5kficjgcajqcal6bxcb0ax8l6hdkww9fp6lrh28x8v";
+    sha256 = "f1ec91110737a62fe28d14970ffa7a7c7b441a32e35a6f3da6a6082ffb7f9432";
   };
 
   docheck = false; # No tests in archive

From adf9bf2cb7776db455c794212bb16757e67d6cb2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:45:32 +0200
Subject: [PATCH 195/282] python: fastrlock: 0.3 -> 0.4

---
 pkgs/development/python-modules/fastrlock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix
index 848f01d6e16..9b553e65db6 100644
--- a/pkgs/development/python-modules/fastrlock/default.nix
+++ b/pkgs/development/python-modules/fastrlock/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fastrlock";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00mr9b15d539z89ng5nf89s2ryhk90xwx95jal77ma0wslixrk5d";
+    sha256 = "6abdbb35205792e2d2a8c441aaa41a613d43ee2d88b3af4fd9735ae7a5f7db6b";
   };
 
   meta = with stdenv.lib; {

From a329fcb1bd93ca5db5a717ed3c3635b0960fa1bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:45:40 +0200
Subject: [PATCH 196/282] python: filelock: 3.0.4 -> 3.0.6

---
 pkgs/development/python-modules/filelock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 46d26e80d56..cfa0e1be74f 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.0.4";
+  version = "3.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71";
+    sha256 = "59ccab92fe118da7e5ce5a9fcd95506ade58d9d5f606db4922192524edfac820";
   };
 
   meta = with stdenv.lib; {

From 7475ec08368a6349519df793f2af93b41ce4c918 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:45:55 +0200
Subject: [PATCH 197/282] python: gevent: 1.3.5 -> 1.3.6

---
 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 cd28a4976a9..50953fd7d3f 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.5";
+  version = "1.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0";
+    sha256 = "7b413c391e8ad6607b7f7540d698a94349abd64e4935184c595f7cdcc69904c6";
   };
 
   buildInputs = [ libev ];

From b37bbdac3cd850229186060beb22c10d389a9427 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:02 +0200
Subject: [PATCH 198/282] python: IBMQuantumExperience: 2.0.1 -> 2.0.2

---
 .../python-modules/ibmquantumexperience/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
index 9ded458312f..82f6cb144ac 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "IBMQuantumExperience";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed164685ab743a4b216275f147227568ce27077068af33d0bd9a301ab1639e6e";
+    sha256 = "f2a5662d7457c297af0751985979e64a88569beb07cfedad0ce1dfa5a7237842";
   };
 
   propagatedBuildInputs = [

From 67a9cf5aed6ed998fed260ef1ae9ec4f5b41cb3c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:09 +0200
Subject: [PATCH 199/282] python: jsonrpc-async: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/jsonrpc-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 758fc0f1dd5..5b7ce3c12bf 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpc-async";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6241a221b52e18265fe6bb59c60633acebb6fb5ef8c04de9a076b757aa133b86";
+    sha256 = "adda3ff6e122b1932b6e20cf583666ea65db4248bc19b04811a4ccc0f0b03d95";
   };
 
   propagatedBuildInputs = [ aiohttp jsonrpc-base ];

From af3a68efbc5d188b7687ba79bc000d1d3b660cca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:16 +0200
Subject: [PATCH 200/282] python: jsonrpc-base: 1.0.1 -> 1.0.2

---
 pkgs/development/python-modules/jsonrpc-base/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index d68b031d517..35244e092da 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpc-base";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21f860c915617f6475aa1ac5a1ec11de03cce6b279741f25ad97d8a4c5b76c3c";
+    sha256 = "f9baac32aa51c3052d03b86ff30a9856900b8b4a4eb175f7bf2c8722520b8637";
   };
 
   propagatedBuildInputs = [ ];

From a2eb8a7998ef1bf8626779169cbe8953528c24c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:23 +0200
Subject: [PATCH 201/282] python: jsonrpc-websocket: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/jsonrpc-websocket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index c753058b093..eff4f41979a 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpc-websocket";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "40949836996c0a8104e7878997d3f68bda4561e9d3af64e5cd178127ec3c2778";
+    sha256 = "e74e490fefa3b8f33620fca98f7cd9a53fb765b9ed6f78360482a3f364230885";
   };
 
   propagatedBuildInputs = [ aiohttp jsonrpc-base ];

From 4b858b284741c6ff7fad141c2396347cc674ddaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:30 +0200
Subject: [PATCH 202/282] python: jupyterlab: 0.33.10 -> 0.34.2

---
 pkgs/development/python-modules/jupyterlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 1ac5e85c404..f6cbea2c36e 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "0.33.10";
+  version = "0.34.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f9147a2085541118923a71700733ecd1067630b4bc7d8be0ae8d0f9d8131bd9";
+    sha256 = "37f66118b35c11fd51f0680e665139d62f86fe54f1e30d2517a1eabb30616ce4";
   };
 
   propagatedBuildInputs = [

From 0c0a7b319c072819168f1e6a08f811809e33d5e7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:37 +0200
Subject: [PATCH 203/282] python: Keras_Applications: 1.0.4 -> 1.0.5

---
 .../development/python-modules/keras-applications/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix
index e06a0b75b50..f9617f03d8e 100644
--- a/pkgs/development/python-modules/keras-applications/default.nix
+++ b/pkgs/development/python-modules/keras-applications/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Keras_Applications";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8c95300328630ae74fb0828b6fa38269a25c0228a02f1e5181753bfd48961f49";
+    sha256 = "26a7318b9d8d5be80d75ab08a1284aaf4b94125dd8271b18ca89791e16eb2cfc";
   };
 
   # Cyclic dependency: keras-applications requires keras, which requires keras-applications

From 6f25b9b49073275a471194ddcc90ff8e8d9b881e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:44 +0200
Subject: [PATCH 204/282] python: Keras_Preprocessing: 1.0.2 -> 1.0.3

---
 .../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 043e43eb184..45ce1d7f61d 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.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f5306554d2b454d825b36f35e327744f5477bd2ae21017f1a93b2097bed6757e";
+    sha256 = "02ba0a3b31ed89c4b0c21d55ba7d87529097d56f394e3850b6d3c9e6c63ce7ae";
   };
 
   # Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing

From bee808d45d474d38326c8591855e16d0bb213ec7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:51 +0200
Subject: [PATCH 205/282] python: kubernetes: 6.0.0 -> 7.0.0

---
 pkgs/development/python-modules/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 9d91fdc9679..030766eb698 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "6.0.0";
+  version = "7.0.0";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b370ab4abd925309db69a14a4723487948e9a83de60ca92782ec14992b741c89";
+    sha256 = "84dfb4319afac189e8327b71b9332b5329d2a78074f58958c5f06a870edf32ba";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

From eacb2ef6916fb0f504d144041cb9163c17dd97cb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:46:58 +0200
Subject: [PATCH 206/282] python: libusb1: 1.6.5 -> 1.6.6

---
 pkgs/development/python-modules/libusb1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index f11930a3a18..245ea90038e 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "libusb1";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4707f81e933a97fed1c5bf7d4957f07bae1139cb8084bdee1f50201a40e3fd7c";
+    sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271";
   };
 
   postPatch = lib.optionalString stdenv.isLinux ''

From f2d0ed0b24240f53667233d291921e2dc7581bb9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:04 +0200
Subject: [PATCH 207/282] python: mozdevice: 1.0.0 -> 1.0.1

---
 .../python-modules/marionette-harness/mozdevice.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 491069cd87f..02da75bfd96 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "mozdevice";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3c50219127e36c171f84b2427e8fcf3a85457f336559aead9770b2a27fbc4b6";
+    sha256 = "0026241bff3ad10a73fe24eb4f59c1313c94e5950f397b2f6b8cc4e4dfbfdd73";
   };
 
   propagatedBuildInputs = [ moznetwork mozprocess ];

From 916bdbbf814c931148fdde75b59b1c0f92a525f2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:11 +0200
Subject: [PATCH 208/282] python: marshmallow-sqlalchemy: 0.14.0 -> 0.14.1

---
 .../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 f7efeb72592..b2b0e7d4efa 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.14.0";
+  version = "0.14.1";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32ff19350a8892b3e8dc954eeeac796576bb89356512f9e1ccd33da63f856930";
+    sha256 = "a42cdbd6b623059fca601e1b572cab28f00d4acf36e2cef38094c88424b3dcf1";
   };
 
   propagatedBuildInputs = [ marshmallow sqlalchemy ];

From f46bfd940b7e573077ad88ced7d583b7a9ecaba3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:18 +0200
Subject: [PATCH 209/282] python: ncclient: 0.6.0 -> 0.6.2

---
 pkgs/development/python-modules/ncclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index d8a6499d136..9dc7710ff28 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "ncclient";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da7f7dfb8a60711610139e894b41ebcab3cd7103b78439ad5e9e91c2d3cfa423";
+    sha256 = "6616828f9c5d318906dae22378a78342bbfa5983f1775c1af8bfecc779434c38";
   };
 
   checkInputs = [ nose rednose ];

From 27c844e6c9e89d73dcf9d5585d6ad05d5fd3175a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:32 +0200
Subject: [PATCH 210/282] python: numpy: 1.15.0 -> 1.15.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 96a3a524298..88fe33a6c35 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "f28e73cf18d37a413f7d5de35d024e6b98f14566a10d82100f9dc491a7d449f9";
+    sha256 = "7b9e37f194f8bcdca8e9e6af92e2cbad79e360542effc2dd6b98d63955d8d8a3";
   };
 
   disabled = isPyPy;

From b4424658b6171ce8d1d7f71ea74dcfc6cf79d518 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:45 +0200
Subject: [PATCH 211/282] python: pathspec: 0.5.6 -> 0.5.7

---
 pkgs/development/python-modules/pathspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 4d812ec3b4f..15ff1b32241 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname   = "pathspec";
-  version = "0.5.6";
+  version = "0.5.7";
   name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be664567cf96a718a68b33329862d1e6f6803ef9c48a6e2636265806cfceb29d";
+    sha256 = "69ac7869c9ce308cfe631e29c09f9da60fae02baf31418885bbbb0c75adcd8c5";
   };
 
   meta = {

From 58996be580bdb424498b1d11a0c8c8e56581b77c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:52 +0200
Subject: [PATCH 212/282] python: persistent: 4.3.0 -> 4.4.1

---
 pkgs/development/python-modules/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index b3c6bd755d8..903be34ed0f 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "persistent";
-  version = "4.3.0";
+  version = "4.4.1";
 
   propagatedBuildInputs = [ zope_interface ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8e2253a35f46ae318e65f0e3b51cdce16d4646e284a26f88a2d84b4d2507f81";
+    sha256 = "2aedeaaf09fed52f63324b178d0addfe1c558340d68d04aafe85abafaafd8699";
   };
 
   meta = {

From d4e198ee1a82509300713ab0f977aee326b06ce6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:47:59 +0200
Subject: [PATCH 213/282] python: phonenumbers: 8.9.10 -> 8.9.11

---
 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 79a5a646ead..42a12f72158 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.9.10";
+  version = "8.9.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbb8194814cc026f476132c38c507adbd459bc8ee99be39f421650ab1b986ed7";
+    sha256 = "1c31db3859aada0568e7afe7231c4e795f34bfcf5749e31c9d1da3c72ba7059b";
   };
 
   meta = {

From 31ee6d82dcb3625b0e1ccee77d7f9c6444fdcfaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:48:06 +0200
Subject: [PATCH 214/282] python: pkgconfig: 1.3.1 -> 1.4.0

---
 pkgs/development/python-modules/pkgconfig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix
index b810213cce9..96c0ea56682 100644
--- a/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/pkgs/development/python-modules/pkgconfig/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pkgconfig";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "107x2wmchlch8saixb488cgjz9n6inl38wi7nxkb942rbaapxiqb";
+    sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52";
   };
 
   checkInputs = [ nose ];

From ecb7d5c7b33ddd44a641719746e9a902eca183ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:48:20 +0200
Subject: [PATCH 215/282] python: psutil: 5.4.6 -> 5.4.7

---
 pkgs/development/python-modules/psutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 84fe2f69554..6e048467313 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.4.6";
+  version = "5.4.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "686e5a35fe4c0acc25f3466c32e716f2d498aaae7b7edc03e2305b682226bcf6";
+    sha256 = "5b6322b167a5ba0c5463b4d30dfd379cd4ce245a1162ebf8fc7ab5c5ffae4f3b";
   };
 
   # No tests in archive

From 45c173e487b1fc849e9dd39343dc83fc732e4961 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:48:27 +0200
Subject: [PATCH 216/282] python: pycryptodome: 3.6.5 -> 3.6.6

---
 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 b4f044cf038..5b729182ca8 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "3.6.5";
+  version = "3.6.6";
   pname = "pycryptodome";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99d653f3a92f35e3c768a142aa83c8c7b104a787655c51e25dca89ed778960b8";
+    sha256 = "b3cb4af317d9b84f6df50f0cfa6840ba69556af637a83fd971537823e13d601a";
   };
 
   meta = {

From 5544e3bfc12726af2624a44c95317a44ac24c365 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:48:34 +0200
Subject: [PATCH 217/282] python: pycryptodomex: 3.6.5 -> 3.6.6

---
 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 c9741a46438..f3f439bc4a5 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycryptodomex";
-  version = "3.6.5";
+  version = "3.6.6";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff7d28474ef2134fe3027b53fa3cf13ed5f776ce15d6209b0e48fbc7592f9396";
+    sha256 = "d0d448484e161786922b41e112b5d7cf76ef5f0c725ea5107ef866bb14a38b12";
   };
 }

From 04bf203b9ac9599818b1a7fae0b57964211d0943 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:48:48 +0200
Subject: [PATCH 218/282] python: pyhomematic: 0.1.46 -> 0.1.47

---
 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 4ec77ed96c1..cd10edd2b64 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.46";
+  version = "0.1.47";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a0ba8de05fc6d60bbb0beec7e808fb231abcb566c3bc17de532f72b18fe2837";
+    sha256 = "bdac91dc6810b3d9f53d26daf6e6f26480c556fc3b43890e376aa23c17afd60b";
   };
 
   # PyPI tarball does not include tests/ directory

From 467df25af55c1f1f9425d8b63fbc36860917176e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:02 +0200
Subject: [PATCH 219/282] python: pyodbc: 4.0.23 -> 4.0.24

---
 pkgs/development/python-modules/pyodbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index ae1133fc0be..b28c1a87647 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.23";
+  version = "4.0.24";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb33d032c1f25781db64e2e4fecf77047fab2ddde42a6cd9496e3c66fb8e9f66";
+    sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
   };
 
   buildInputs = [ libiodbc ];

From 6a2f30ab54e076be79c40694e017c8156fe456e2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:09 +0200
Subject: [PATCH 220/282] python: Pyphen: 0.9.4 -> 0.9.5

---
 pkgs/development/python-modules/pyphen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index 4cc7f1493f8..7a182b6be4a 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Pyphen";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mqb5jrigxipxzp1d8nbwkq0cfjw77pnn6hc4mp1yd2mn059mymb";
+    sha256 = "3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921";
   };
 
   meta = with stdenv.lib; {

From 617c8ee925704551fcded9d9319b1ebdddb18afb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:17 +0200
Subject: [PATCH 221/282] python: pytest: 3.7.1 -> 3.7.2

---
 pkgs/development/python-modules/pytest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 9c158a55b81..3fae0442a66 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.7.1";
+  version = "3.7.2";
   pname = "pytest";
 
   preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "86a8dbf407e437351cef4dba46736e9c5a6e3c3ac71b2e942209748e76ff2086";
+    sha256 = "3459a123ad5532852d36f6f4501dfe1acf4af1dd9541834a164666aa40395b02";
   };
 
   checkInputs = [ hypothesis mock ];

From 2f9a3664a4ed5aaf9e5fd0db6b441c9ec9456a29 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:23 +0200
Subject: [PATCH 222/282] python: pytest-xdist: 1.22.5 -> 1.23.0

---
 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 34c94d6aacd..46d505b3801 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.22.5";
+  version = "1.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3308c4f6221670432d01e0b393b333d77c1fd805532e1d64450e8140855eb51b";
+    sha256 = "28e25e79698b2662b648319d3971c0f9ae0e6500f88258ccb9b153c31110ba9b";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 319d15e044034b5a536dd7fbd3a23c5872c941c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:30 +0200
Subject: [PATCH 223/282] python: python-daemon: 2.1.2 -> 2.2.0

---
 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 c44af185a10..76544adaf0b 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.1.2";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "261c859be5c12ae7d4286dc6951e87e9e1a70a882a8b41fd926efc1ec4214f73";
+    sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c";
   };
 
   # A test fail within chroot builds.

From db3c5b485ad07a0269c597383b893284b6f06214 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:37 +0200
Subject: [PATCH 224/282] python: python-docx: 0.8.6 -> 0.8.7

---
 pkgs/development/python-modules/python-docx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix
index 11ade481df5..1a85c5256d7 100644
--- a/pkgs/development/python-modules/python-docx/default.nix
+++ b/pkgs/development/python-modules/python-docx/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "python-docx";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "117i84s6fcdsrfckbvznnqgqwhnf1x0523ps16cki8sg9byydv2m";
+    sha256 = "ba9f2a7ca391b78ab385d796b38af3f21bab23c727fc8e0c5e630448d1a11fe3";
   };
 
   checkInputs = [ behave mock pyparsing pytest ];

From 8ae4298972997cc4d2dff5ba5ca88ad06a134540 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:45 +0200
Subject: [PATCH 225/282] python: qtconsole: 4.3.1 -> 4.4.1

---
 pkgs/development/python-modules/qtconsole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 5b35acc0404..67b9a07a36d 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.3.1";
+  version = "4.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c";
+    sha256 = "7870b19e6a6b0ab3acc09ee65463c0ca7568b3a01a6902d7c4e1ed2c4fc4e176";
   };
 
   buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];

From b834f91ce50fb6b3172c5a719368fa1311a5a4fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:52 +0200
Subject: [PATCH 226/282] python: regex: 2018.07.11 -> 2018.08.17

---
 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 f3e6d1f5e0a..2394858e13e 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.07.11";
+  version = "2018.08.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9308dbce8e5ff4ee06b172a777f6c7f650a5835a5ad41a6080eb501639c27a2f";
+    sha256 = "56494baf1ed525deea426d3676b1ae3fdcc906b55eccfcb4ea928453e11f2a43";
   };
 
   postCheck = ''

From 9fd849c3b9ecb3e8116dd296f4a9af5e064e65e4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:49:59 +0200
Subject: [PATCH 227/282] python: reikna: 0.7.0 -> 0.7.1

---
 pkgs/development/python-modules/reikna/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 14e8f9f74ce..760ca0056ff 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "reikna";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e27af9a202b8cdedd07793abbd3282806ec724aba091a27c76d7ba8284cfd8ba";
+    sha256 = "0afc5d502cc9ba0dadd88c15d72e2fdaa09fee31faaae5064889732de7940953";
   };
 
   checkInputs = [ sphinx pytestcov pytest ];

From 5c0ebe6446a17e037dba7ec29c8c8ba8051ce6c0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:06 +0200
Subject: [PATCH 228/282] python: reportlab: 3.5.2 -> 3.5.6

---
 pkgs/development/python-modules/reportlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 298c3c79e38..e2f2a7814aa 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.5.2";
+  version = "3.5.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08986267eaf25d62c3802512f0a97dc3426d0c82f52c8beb576689582eb85b7f";
+    sha256 = "3836a49e7ea7bce458f437cbc094633c7fd4ac027180565875c18ecc726f261e";
   };
 
   checkInputs = [ glibcLocales ];

From c65f6a473eeb48769b1f918bc6f70bb51de4a3bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:13 +0200
Subject: [PATCH 229/282] python: s3fs: 0.1.5 -> 0.1.6

---
 pkgs/development/python-modules/s3fs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 0053b125bcb..7a9454734d9 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4fbab74d72ceeb1a6f249165bde7b1d1c4dd758390339f52c84f0832bc5117a7";
+    sha256 = "38a3dda6800a5dc6ed697bff8e9a47d84f5c28d186dc25d2ff2f91b445f0dae5";
   };
 
   buildInputs = [ docutils ];

From d9cb046ac85c8090757af80f5e9e0331957fa6b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:20 +0200
Subject: [PATCH 230/282] python: setuptools: 40.0.0 -> 40.2.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 b10cdfae5c7..b61af72909f 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.0.0";
+  version = "40.2.0";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f";
+    sha256 = "47881d54ede4da9c15273bac65f9340f8929d4f0213193fa7894be384f2dcfa6";
   };
 
   nativeBuildInputs = [ unzip wrapPython ];

From 594d2c7ee9d8732b1354e6aa4b3e5ef669777e98 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:27 +0200
Subject: [PATCH 231/282] python: soco: 0.15 -> 0.16

---
 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 152a61bbf1d..d039756eb81 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18bxpbd7l9gns0jpvx09z023kbbz7b6i4f99i8silsb1jv682kg0";
+    sha256 = "7bed4475e3f134283af1f520a9b2e6ce2a8e69bdc1b58ee68528b3d093972424";
   };
 
   propagatedBuildInputs = [ xmltodict requests ];

From c0b4ff39029d60750a4b1dfa762e3ff7ace9b61d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:34 +0200
Subject: [PATCH 232/282] python: Sphinx: 1.7.6 -> 1.7.7

---
 pkgs/development/python-modules/sphinx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 97f76be15cb..525ff4122d8 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -26,10 +26,10 @@
 
 buildPythonPackage rec {
   pname = "Sphinx";
-  version = "1.7.6";
+  version = "1.7.7";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc";
+    sha256 = "71531900af3f68625a29c4e00381bee8f85255219a3d500a3e255076a45b735e";
   };
   LC_ALL = "en_US.UTF-8";
 

From e5e1408c78355163dda6e8c7485b6a73e3695ee3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:41 +0200
Subject: [PATCH 233/282] python: SQLAlchemy: 1.2.10 -> 1.2.11

---
 pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 8c3c6fe2374..2f755869d79 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.2.10";
+  version = "1.2.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72325e67fb85f6e9ad304c603d83626d1df684fdf0c7ab1f0352e71feeab69d8";
+    sha256 = "ef6569ad403520ee13e180e1bfd6ed71a0254192a934ec1dbd3dbf48f4aa9524";
   };
 
   checkInputs = [

From b99101d9ccc012a6cadacb3b285b7766bf457618 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:48 +0200
Subject: [PATCH 234/282] python: stripe: 2.4.0 -> 2.6.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 6c3e340c461..c1ebdec90cc 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.4.0";
+  version = "2.6.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 = "02c63cec551bba9b4785d156b518699e8ff0e6e6f96d00a72daa075683487202";
+    sha256 = "ce8fc8af33e12d3d92b083b86952227e9af6854eaf6a044a7725ac543b0582f8";
   };
 
   checkInputs = [ unittest2 mock ];

From 587f70cbfe04cf1a4c50086ef108da5bc9a0d6e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:50:55 +0200
Subject: [PATCH 235/282] python: svg.path: 2.2 -> 3.0

---
 pkgs/development/python-modules/svg-path/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
index 04031fcbc10..3a11bf67e13 100644
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "svg.path";
-  version = "2.2";
+  version = "3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08kp03i4yiqdkz7a7l7d7kzszahmhigrml2502zi1ybndrh7ayxw";
+    sha256 = "7b568f90f67fd25413c8da9f8bc9f9f8ab089425c20fa03330e97e77d13880ee";
   };
 
   meta = with stdenv.lib; {

From e671f6bb6193dfbef2287e9ce1dc7d6dc98094b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:02 +0200
Subject: [PATCH 236/282] python: tqdm: 4.24.0 -> 4.25.0

---
 pkgs/development/python-modules/tqdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 23a7a9dac6e..5b65e156a42 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.24.0";
+  version = "4.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "60bbaa6700e87a250f6abcbbd7ddb33243ad592240ba46afce5305b15b406fad";
+    sha256 = "a3364bd83ce4777320b862e3c8a93d7da91e20a95f06ef79bed7dd71c654cafa";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

From de92954d5da64c0df5dd911e9a11656f6852bbd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:09 +0200
Subject: [PATCH 237/282] python: trio: 0.5.0 -> 0.6.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 c630668386e..4924fa527c6 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.5.0";
+  version = "0.6.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce0b4f59e2f41af0433247f92ce83116bf356a3c2ab5ca5942cf359a1105b4a8";
+    sha256 = "7a80c10b89068950aa649edd4b09a6f56236642c2c2e648b956289d2301fdb9e";
   };
 
   checkInputs = [ pytest pyopenssl trustme ];

From 793c455b98182f3cbd28020c4d2fbef9614765fa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:23 +0200
Subject: [PATCH 238/282] python: typeguard: 2.2.1 -> 2.2.2

---
 pkgs/development/python-modules/typeguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index de7a110a8f4..6ccde34f48a 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "typeguard";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "89159e9ab54a436db4759c32eeb0ae6e9b65cf7fe5b838daad4a658024ec3b43";
+    sha256 = "b8ddc6e2e60bd64b7003f9a685a09ba387b74adf2f6bea7534a76d61892f573e";
   };
 
   buildInputs = [ setuptools_scm ];

From 7f22dae41c22c8f3453acf656744154695cc741c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:30 +0200
Subject: [PATCH 239/282] python: vega: 1.3.0 -> 1.4.0

---
 pkgs/development/python-modules/vega/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 1813ae587c1..09106e3a6d4 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c5561238fbd4a0669aea457decb47c5155e9741b47a41f23cc030387f725edc";
+    sha256 = "cf9701dac0111c09ea009ab06cbb81f27b1d9c23ebf58ebdf08b6994a37f13ac";
   };
 
   buildInputs = [ pytest ];

From 0ae1f52282dc61975aebd47434477adcc1a552ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:37 +0200
Subject: [PATCH 240/282] python: websocket_client: 0.48.0 -> 0.51.0

---
 pkgs/development/python-modules/websockets_client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix
index 846e9a2a0f5..194f3f126a3 100644
--- a/pkgs/development/python-modules/websockets_client/default.nix
+++ b/pkgs/development/python-modules/websockets_client/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, six }:
 buildPythonPackage rec {
   pname = "websocket_client";
-  version = "0.48.0";
+  version = "0.51.0";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "18f1170e6a1b5463986739d9fd45c4308b0d025c1b2f9b88788d8f69e8a5eb4a";
+    sha256 = "030bbfbf29ac9e315ffb207ed5ed42b6981b5038ea00d1e13b02b872cc95e8f6";
   };
 
   prePatch = ''

From 167c0d347bb8512e63374611af3e3c9848fee6ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:51:44 +0200
Subject: [PATCH 241/282] python: XlsxWriter: 1.0.5 -> 1.0.7

---
 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 be5ad2a5c1c..a72fabb35cd 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.0.5";
+  version = "1.0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bd4661c04a68621cb2ebc07c38b8b2e98e30bf213a16e1cf3675b61e26ca9bf2";
+    sha256 = "1224b971c174f33b954f9a1906679d0049399bd6a5a8c78bbae2d6c2c4facebd";
   };
 
   meta = {

From c8d0c5fdec7c65ffc4e143e9e754a244a1bada55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:52:04 +0200
Subject: [PATCH 242/282] pythonPackages.pytest-asyncio: fix build

---
 pkgs/development/python-modules/pytest-asyncio/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 6d90521900f..6b4ce6f6123 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -15,6 +15,11 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
+  # LICENSE file is not distributed. https://github.com/pytest-dev/pytest-asyncio/issues/92
+  postPatch = ''
+    substituteInPlace setup.cfg --replace "license_file = LICENSE" ""
+  '';
+
   meta = with stdenv.lib; {
     description = "library for testing asyncio code with pytest";
     license = licenses.asl20;

From f68a5ec9b52b930327e93137127905dffe99811f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 07:56:07 +0200
Subject: [PATCH 243/282] pythonPackages.bootstrapped-pip: setuptools: 40.0.0
 -> 40.2.0

---
 pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index b320db51e3c..613be1f7d6b 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,9 +9,9 @@ let
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "40.0.0";
+    version = "40.2.0";
     format = "wheel";
-    sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49";
+    sha256 = "ea3796a48a207b46ea36a9d26de4d0cc87c953a683a7b314ea65d666930ea8e6";
   };
 
 in stdenv.mkDerivation rec {

From 5c3e607fb2c083190462fac6b0270e619788d4c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 08:01:19 +0200
Subject: [PATCH 244/282] mypy: use toPythonApplication

Top-level Python packages are applications, not libraries.
---
 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 4cfca87f304..b174af66dce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8786,7 +8786,7 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy = python3Packages.mypy;
+  mypy = with python3Packages; toPythonApplication mypy;
 
   ### DEVELOPMENT / LIBRARIES
 

From 6923bc8d23e2735708492da627a378de5a53c218 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 18:16:34 +0200
Subject: [PATCH 245/282] awscli: 1.15.66 -> 1.16.1

---
 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 c454cca0ed6..92e5459df49 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.15.66";
+  version = "1.16.1";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
+    sha256 = "5068efde694e24462646d271335fdef3dde8a0fbbfb986fab0ce7e5368a7df8d";
   };
 
   # No tests included

From ff3665f584e7ef1ee9bf32e5e21b51f4c3f535ee Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 25 Aug 2018 18:34:41 +0200
Subject: [PATCH 246/282] mesa: enable texture floats

---
 pkgs/development/libraries/mesa/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e1a9477dcd6..f05824f19bb 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -100,6 +100,7 @@ let self = stdenv.mkDerivation {
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
     "--with-platforms=x11,wayland,drm"
+    "--enable-texture-float"
   ]
   ++ (optional (galliumDrivers != [])
       ("--with-gallium-drivers=" +

From 99696fb9a0b497506cfbabec0049988ad12216f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Aug 2018 18:41:12 +0200
Subject: [PATCH 247/282] python: numexpr: 2.6.7 -> 2.6.8

---
 pkgs/development/python-modules/numexpr/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 0d9e0d2a6d0..6e237b2bd9e 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3d007946b6c042fc9feb1db52dd0847d2f9b7f3175ae0591476ea80dcd664771";
+    sha256 = "ee8bc7201aa2f1962c67d27c326a11eef9df887d7b87b1278a1d4e722bf44375";
   };
 
   propagatedBuildInputs = [ numpy ];
@@ -19,20 +19,15 @@ buildPythonPackage rec {
   # Run the test suite.
   # It requires the build path to be in the python search path.
   checkPhase = ''
+    pushd $out
     ${python}/bin/${python.executable} <<EOF
-    import sysconfig
     import sys
-    import os
-    f = "lib.{platform}-{version[0]}.{version[1]}"
-    lib = f.format(platform=sysconfig.get_platform(),
-                   version=sys.version_info)
-    build = os.path.join(os.getcwd(), 'build', lib)
-    sys.path.insert(0, build)
     import numexpr
     r = numexpr.test()
     if not r.wasSuccessful():
         sys.exit(1)
     EOF
+    popd
   '';
 
   meta = {

From e2414dcbaac057509d7a29feefceb3bc0bd678c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 9 Aug 2018 23:27:15 +0200
Subject: [PATCH 248/282] pan: clean up

---
 pkgs/applications/networking/newsreaders/pan/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 4a1940ae654..9d51a76f536 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -2,7 +2,7 @@
 , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
 , perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
-, gnomeSupport ? true, libgnome-keyring3
+, gnomeSupport ? true, gnome3, libsecret
 }:
 
 assert spellChecking -> gtkspell3 != null;
@@ -17,10 +17,10 @@ stdenv.mkDerivation {
     sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
+  nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
+  buildInputs = [ gtk3 gmime2 libnotify gnutls ]
     ++ stdenv.lib.optional spellChecking gtkspell3
-    ++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
+    ++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ];
 
   configureFlags = [
     "--with-dbus"

From 1bd430e3d444aa566d55a668f424033e2dcc782f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 10 Aug 2018 01:04:52 +0200
Subject: [PATCH 249/282] gnome3.gnome-keyring: clean up

---
 .../gnome-3/core/gnome-keyring/default.nix    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index acb32bc174c..cce192c9f29 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook
-, docbook_xsl, docbook_xml_dtd_42, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt
+, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
+, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
@@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; };
-  };
-
   outputs = [ "out" "dev" ];
 
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam gtk3 libgnome-keyring openssh
-    pango gcr gdk_pixbuf atk p11-kit
+  buildInputs = [
+    glib libgcrypt pam openssh libcap_ng libselinux
+    gcr p11-kit
   ];
 
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
   nativeBuildInputs = [
-    pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
+    pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook
   ];
 
   configureFlags = [
@@ -48,6 +42,13 @@ stdenv.mkDerivation rec {
       make check
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-keyring";
+      attrPath = "gnome3.gnome-keyring";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications";
     homepage = https://wiki.gnome.org/Projects/GnomeKeyring;

From 64ddf1de6d029183beda7a7e7409ded4676a5725 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 11 Aug 2018 14:09:29 +0200
Subject: [PATCH 250/282] xfce.xfce4-settings: remove unneeded dependency

https://bluesabre.org/2018/06/20/xfce-settings-4-12-4-and-4-13-4-released/
---
 pkgs/desktops/xfce4-13/xfce4-settings/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
index d08c1f96fdd..6eb917fd76f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3
+{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3
 , libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
 , upower ? null, xfconf, xf86inputlibinput ? null }:
 
@@ -19,7 +19,6 @@ mkXfceDerivation rec {
   nativeBuildInputs = [ automakeAddFlags ];
 
   buildInputs = [
-    dbus-glib
     exo
     garcon
     gtk3

From b47e4e76445e22b6d0d575242ab09c243b2de012 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 12 Aug 2018 01:42:24 +0200
Subject: [PATCH 251/282] modemmanager: remove unneeded dependency

---
 pkgs/tools/networking/modem-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 8612808687e..6ca8c892562 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
+{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig
 , libmbim, libqmi, systemd, fetchpatch }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext pkgconfig ];
 
-  buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
+  buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
 
   patches = [
     # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)

From 6e2c1152350a1080e84da36941651e59c64f568d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 12 Aug 2018 14:28:18 +0200
Subject: [PATCH 252/282] gnome3.gnome-desktop: use substituteAll for patch

---
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index e909a356866..d6402a3b5b6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
 , intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland
 , libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }:
 
@@ -30,18 +30,16 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ];
 
   patches = [
-    ./bubblewrap-paths.patch
+    (substituteAll {
+      src = ./bubblewrap-paths.patch;
+      BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap";
+    })
   ];
 
   configureFlags = [
     "--enable-gtk-doc"
   ];
 
-  postPatch = ''
-    substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \
-      BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-desktop";

From 2258383b827ca50308838cab3c11869982764bc0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 12 Aug 2018 14:08:00 +0200
Subject: [PATCH 253/282] umockdev: split package

---
 pkgs/development/libraries/umockdev/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 1ff71fa1811..b89450b810b 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool
+{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection
 , pkgconfig, glib, systemd, libgudev, vala }:
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
   version = "0.11.3";
 
+  outputs = [ "bin" "out" "dev" "doc" ];
+
   src = fetchFromGitHub {
     owner  = "martinpitt";
     repo   = "umockdev";
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib systemd libgudev ];
 
-  nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ];
 
   enableParallelBuilding = true;
 

From 0905ed85189e22c01a9f047e434fb962da106f37 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 26 Aug 2018 10:51:10 +0300
Subject: [PATCH 254/282] tokei: 7.0.3 -> 8.0.0

---
 pkgs/development/tools/misc/tokei/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 0059c10afe0..831a9ec6278 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "7.0.3";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "Aaronepower";
     repo = "tokei";
     rev = "v${version}";
-    sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza";
+    sha256 = "1sfwmjlvjrd8r0ynnayw7g3514mfiky2j30byphaagdw4jkxbd7c";
   };
 
-  cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv";
+  cargoSha256 = "0v29gych757h7vv5jsg7rpl705gpqn0ya8ai53582qd2cc6yz4c3";
 
   meta = with stdenv.lib; {
     description = "Count code, quickly";

From f02bfc74c94e3bbd604ed5e92e991f001a985ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Aug 2018 10:49:12 +0200
Subject: [PATCH 255/282] mesa: 18.1.5 -> 18.1.7 (maintenance)

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f05824f19bb..50fb2daad70 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -63,7 +63,7 @@ let
 in
 
 let
-  version = "18.1.5";
+  version = "18.1.7";
   branch  = head (splitString "." version);
 in
 
@@ -77,7 +77,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea";
+    sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306";
   };
 
   prePatch = "patchShebangs .";

From a04cf8fdb7f0cfe8876c7a4d9a63c312ce2a407a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Aug 2018 12:18:28 +0200
Subject: [PATCH 256/282] konversation: 1.7.4 -> 1.7.5

---
 .../networking/irc/konversation/default.nix           | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index c41b6116b29..ccee78a64da 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -30,13 +30,13 @@
 
 let
   pname = "konversation";
-  version = "1.7.4";
+  version = "1.7.5";
 in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
+    sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
   };
 
   buildInputs = [
@@ -70,13 +70,6 @@ in mkDerivation rec {
     kdoctools
   ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
-      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
-    })
-  ];
-
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];

From cd8bcb5f9f02557a04781679fc450c8e6cf08a68 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 13:07:32 +0200
Subject: [PATCH 257/282] ceph: fix build, 12.2.2 -> 12.2.7

Since 772eef91686974b7710081a9a77e5c0e287c25e8, Boost
doesn't support by python by default, which broke ceph.

Also bump to 12.2.7, the latest release of ceph 12.
---
 pkgs/tools/filesystems/ceph/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 0f712853f24..ef3e36ff627 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "12.2.2";
+  version = "12.2.7";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00";
+    sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl";
   };
 
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a25ec7c561..410c1a3fe7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1706,7 +1706,9 @@ with pkgs;
   nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
 
   libceph = ceph.lib;
-  ceph = callPackage ../tools/filesystems/ceph { boost = boost165; };
+  ceph = callPackage ../tools/filesystems/ceph {
+    boost = boost166.override { enablePython = true; };
+  };
   ceph-dev = ceph;
 
   certmgr = callPackage ../tools/security/certmgr { };

From d41409cd8f381d55b690a71c4a250cec4b9e0176 Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sun, 26 Aug 2018 13:13:18 +0200
Subject: [PATCH 258/282] mixxx: 2.0.0 -> 2.1.3

---
 pkgs/applications/audio/mixxx/default.nix | 30 ++++++++---------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 60a0695ffec..746e306d377 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,34 +1,24 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
+{ stdenv, fetchFromGitHub, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
-, taglib, vampSDK
+, taglib, upower, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
-  version = "2.0.0";
+  version = "2.1.3";
 
-  src = fetchurl {
-    url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz";
-    sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
+  src = fetchFromGitHub {
+    owner = "mixxxdj";
+    repo = "mixxx";
+    rev = "release-${version}";
+    sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
-      sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
-    })
-    (fetchpatch {
-      url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
-      name = "sqlite.patch";
-      sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
-    })
- ];
-
   buildInputs = [
     chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
-    rubberband scons sqlite taglib vampSDK
+    rubberband scons sqlite taglib upower vampSDK
   ];
 
   sconsFlags = [
@@ -56,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.aszlig maintainers.goibhniu ];
+    maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ];
     platforms = platforms.linux;
   };
 }

From a44469d7b66815fcadd628e07ae86e6b7bc7f26b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 13:38:58 +0200
Subject: [PATCH 259/282] nixos/tests/netdata: fix non-deterministic failure

The test sporadically failed on hydra when a request was made
before the service was actually listening on its port.
Explicitly wait for the port to open.
---
 nixos/tests/netdata.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index eb45db6f04c..9bd147968e4 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -20,6 +20,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     $netdata->waitForUnit("netdata.service");
 
+    # wait for the service to listen before sending a request
+    $netdata->waitForOpenPort(19999);
+
     # check if the netdata main page loads.
     $netdata->succeed("curl --fail http://localhost:19999/");
 

From ec334d38d258f677c249e4f757a9a159ba6cb569 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sun, 26 Aug 2018 12:04:05 +0100
Subject: [PATCH 260/282] qtwebengine: Fix inputs on aarch64

A mistake in the previous commit meant that ffmpeg wasn't added to the
propagatedBuildInputs on aarch64.
---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 622c0554967..aae15c62d73 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -134,7 +134,7 @@ EOF
     harfbuzz icu
 
     libevent
-  ] ++ optionals stdenv.hostPlatform.isArm [
+  ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
     ffmpeg
   ] ++ optionals (!stdenv.isDarwin) [
     dbus zlib minizip snappy nss protobuf jsoncpp

From f021702d212c6f78225fd2ed3a08d7ce669731f1 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 14:15:15 +0200
Subject: [PATCH 261/282] nixos/tests/networking: fix routes tests

The output format of `ip route` changed, it now explicitly
shows "proto static" for static routes.
---
 nixos/tests/networking.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index cd5d537a3be..76ece1ea3e6 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -552,15 +552,15 @@ let
 
       testScript = ''
         my $targetIPv4Table = <<'END';
-        10.0.0.0/16 scope link mtu 1500 
+        10.0.0.0/16 proto static scope link mtu 1500 
         192.168.1.0/24 proto kernel scope link src 192.168.1.2 
-        192.168.2.0/24 via 192.168.1.1 
+        192.168.2.0/24 via 192.168.1.1 proto static 
         END
 
         my $targetIPv6Table = <<'END';
         2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium
-        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium
-        fdfd:b3f0::/48 metric 1024 pref medium
+        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium
+        fdfd:b3f0::/48 proto static metric 1024 pref medium
         END
 
         $machine->start;

From 3f8756ce10d7a3d2cc61b7b2f44e0890a2561e40 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 14:24:07 +0200
Subject: [PATCH 262/282] nixos/tests/networking: fix "virtual" tests

`ip route` now displays extended tun attributes, so the expected
output of this test changed.

Upstream change: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818
---
 nixos/tests/networking.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 76ece1ea3e6..ff088ad2621 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -448,8 +448,8 @@ let
 
       testScript = ''
         my $targetList = <<'END';
-        tap0: tap UNKNOWN_FLAGS:800 user 0
-        tun0: tun UNKNOWN_FLAGS:800 user 0
+        tap0: tap persist user 0
+        tun0: tun persist user 0
         END
 
         # Wait for networking to come up

From a3099c9d35c255603c5ee4b450ac00ffc347f2cf Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 26 Aug 2018 14:45:06 +0200
Subject: [PATCH 263/282] subsurface: 4.7.5 -> 4.8.1 (#45640)

Currently build is broken due to some invalid use of incomplete type 'class QHeaderView':
https://hydra.nixos.org/build/76951177/nixlog/2

CC: @bkchr
---
 pkgs/applications/misc/subsurface/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 5e1e7bf3225..1b998c48580 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "4.7.5";
+  version = "4.8.1";
 
   libdc = stdenv.mkDerivation rec {
     name = "libdivecomputer-ssrf-${version}";
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
-      sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x";
+      sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy";
     };
 
     nativeBuildInputs = [ autoreconfHook ];
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
-    sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82";
+    sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2";
   };
 
   buildInputs = [

From 63257c88c3e5867a0a79d82408db5b442b060048 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sat, 25 Aug 2018 14:39:58 +0200
Subject: [PATCH 264/282] xkbd: init at 0.8.18

---
 pkgs/applications/misc/xkbd/default.nix | 30 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/xkbd/default.nix

diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
new file mode 100644
index 00000000000..ccbb88bd1a8
--- /dev/null
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto
+, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "xkbd-${version}";
+  version = "0.8.18";
+
+  src = fetchFromGitHub {
+    owner = "mahatma-kaganovich";
+    repo = "xkbd";
+    rev = name;
+    sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
+  };
+
+  buildInputs = [
+    freetype libXrender libXft libXext libXtst libXpm libX11
+    libXi xextproto xinput xproto
+  ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mahatma-kaganovich/xkbd;
+    description = "onscreen soft keyboard for X11";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82c68a7bcb3..b4373ce191b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1456,6 +1456,8 @@ with pkgs;
 
   onboard = callPackage ../applications/misc/onboard { };
 
+  xkbd = callPackage ../applications/misc/xkbd { };
+
   optar = callPackage ../tools/graphics/optar {};
 
   patdiff = callPackage ../tools/misc/patdiff { };

From d4c25d4953e4914a10d3ccd78d1d8e6dd69fadd1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 17:25:51 +0300
Subject: [PATCH 265/282] nano-wallet: 14.2 -> 15.2

---
 pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 76ee914bd3d..7491e830628 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "14.2";
+  version = "15.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0jbv5a8sz403a1pqcgl32idk6y0z510h7ikjg1dcxla0rsch6ipl";
+    sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3";
     fetchSubmodules = true;
   };
 

From c93c160cbbd93c2b0ebf73012a43bf19c75c637a Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 26 Aug 2018 16:51:59 +0000
Subject: [PATCH 266/282] perlPackages.AlienWxWidgets: fix build

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7761e42f544..62075351342 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -133,7 +133,7 @@ let
       url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
       sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk";
     };
-    propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
+    propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ];
     buildInputs = [ LWPProtocolHttps ];
   };
 

From e76c0cdbd199f6516be5e298c4802bef39a41544 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 26 Aug 2018 16:53:12 +0000
Subject: [PATCH 267/282] perlPackages.ArchiveZip: fix build

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7761e42f544..837c44d162c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -531,6 +531,7 @@ let
       url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.62.tar.gz;
       sha256 = "1jax173w7nm5r6k7ymfcskvs1rw590lyscbqrnfbkjj4cxc65wrb";
     };
+    buildInputs = [ TestMockModule ];
     meta = {
       description = "Provide an interface to ZIP archive files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From ff583d81146f8f7b3c988204fb2237faa5b0976f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Sun, 26 Aug 2018 19:38:52 +0200
Subject: [PATCH 268/282] endgame-singularity: init at 0.30c (#45057)

---
 pkgs/games/endgame-singularity/default.nix | 56 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/games/endgame-singularity/default.nix

diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix
new file mode 100644
index 00000000000..8b259bad88d
--- /dev/null
+++ b/pkgs/games/endgame-singularity/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, unzip, python2 }:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "endgame-singularity";
+  version = "0.30c";
+  format = "other";
+
+  srcs = [
+    (fetchurl {
+      url = "http://www.emhsoft.com/singularity/singularity-${version}-src.tar.gz";
+      sha256 = "13zjhf67gmla67nkfpxb01rxs8j9n4hs0s4n9lnnq4zgb709yxgl";
+    })
+    (fetchurl {
+      url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip";
+      sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb";
+    })
+  ];
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ]; # The music is zipped
+  propagatedBuildInputs = with python2.pkgs; [ pygame numpy ];
+
+  # This is not an error: it needs both compilation rounds
+  buildPhase = ''
+    ${python2.interpreter} -m compileall "singularity-${version}"
+    ${python2.interpreter} -O -m compileall "singularity-${version}"
+  '';
+
+  installPhase = ''
+    install -Dm755 "singularity-${version}/singularity.py"  "$out/share/singularity.py"
+    install -Dm644 "singularity-${version}/singularity.pyo" "$out/share/singularity.pyo"
+    install -Dm644 "singularity-${version}/singularity.pyc" "$out/share/singularity.pyc"
+    cp -R "singularity-${version}/code" "singularity-${version}/data" "$out/share/"
+    cp -R "endgame-singularity-music-007" "$out/share/music"
+  '';
+
+  # Tell it where to find python libraries
+  # Also cd to the same directory as the code, since it uses relative paths
+  postFixup = ''
+    makeWrapper "${python2.interpreter}" "$out/bin/endgame-singularity" \
+          --set PYTHONPATH "$PYTHONPATH" \
+          --run "cd \"$out/share\"" \
+          --add-flags "$out/share/singularity.py"
+  '';
+
+  meta = {
+    homepage = http://www.emhsoft.com/singularity/;
+    description = "A simulation game about strong AI";
+    longDescription = ''
+      A simulation of a true AI. Go from computer to computer, pursued by the
+      entire world. Keep hidden, and you might have a chance
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 132549fe483..679b46ee702 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19748,6 +19748,8 @@ with pkgs;
 
   EmptyEpsilon = callPackage ../games/empty-epsilon { };
 
+  endgame-singularity = callPackage ../games/endgame-singularity { };
+
   endless-sky = callPackage ../games/endless-sky { };
 
   enyo-doom = libsForQt5.callPackage ../games/enyo-doom { };

From 0e4160a3a11d67a66ba9bc556a6d6d4ee3af9c0e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 26 Aug 2018 19:56:08 +0200
Subject: [PATCH 269/282] pythonPackages.sympy: 1.1.1 -> 1.2

---
 .../science/math/sage/sage-src.nix            |  7 ++++
 .../python-modules/sympy/default.nix          | 32 +++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 096f2212cc4..7fd49fe205c 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -136,6 +136,13 @@ stdenv.mkDerivation rec {
       url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e";
       sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk";
     })
+
+    # https://trac.sagemath.org/ticket/26117
+    (fetchpatch {
+      name = "sympy-1.2.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36";
+      sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi";
+    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches ++ [
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index f41f2e7b4fa..fb702e046a4 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,44 +8,36 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.1.1";
+  version = "1.2"; # Upgrades may break sage. Please test.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4";
+    sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18";
   };
 
   checkInputs = [ glibcLocales ];
 
   propagatedBuildInputs = [ mpmath ];
 
-  # Bunch of failures including transients.
+  # some tests fail: https://github.com/sympy/sympy/issues/15149
   doCheck = false;
 
+  patches = [
+    # to be fixed by https://github.com/sympy/sympy/pull/13476
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
+    })
+  ];
+
   preCheck = ''
     export LANG="en_US.UTF-8"
   '';
 
-  patches = [
-    # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825
-    # There is also an upstream patch for this, included in the next release (PR #128826).
-    # However that doesn't quite fix the issue yet. Apparently some changes by sage are required.
-    # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about
-    # it).
-    (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
-    })
-    (fetchpatch {
-      url = "https://github.com/sympy/sympy/pull/13276.patch";
-      sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh";
-    })
-  ];
-
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lovek323 ];
+    maintainers = with lib.maintainers; [ lovek323 timokau ];
   };
 }

From 5d91e0f57df0b871b61c42c004607b2df98e7a1f Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Sat, 25 Aug 2018 20:56:21 +0200
Subject: [PATCH 270/282] hunspell-hs: fix build

Using pkgconfig like jtojnar suggested.

Disables tests as some necessary data files
aren't included on hackage.
---
 .../haskell-modules/configuration-common.nix  |  3 ++
 .../haskell-modules/patches/hunspell.patch    | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/hunspell.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 61c2da2b419..ef55272d6e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -672,6 +672,9 @@ self: super: {
   # https://github.com/bos/bloomfilter/issues/7
   bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
 
+  # https://github.com/ashutoshrishi/hunspell-hs/pull/3
+  hunspell-hs = addPkgconfigDepend (dontCheck (appendPatch super.hunspell-hs ./patches/hunspell.patch)) pkgs.hunspell;
+
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch
new file mode 100644
index 00000000000..cc115029a7a
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hunspell.patch
@@ -0,0 +1,30 @@
+diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal
+--- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal	2018-08-26 20:23:33.053763300 +0200
++++ hunspell-hs-0.1.0.0/hunspell-hs.cabal	2018-08-26 20:42:05.886074510 +0200
+@@ -37,7 +37,7 @@
+       base >=4.7 && <5
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -63,7 +63,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -88,7 +88,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:

From 9dedda16e9dbbd415222db1a8ee3736aabb2b4a0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 26 Aug 2018 22:05:13 +0200
Subject: [PATCH 271/282] calibre: 3.29.0 -> 3.30.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 15d894b0413..d66a778c1cd 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.29.0";
+  version = "3.30.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh";
+    sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz";
   };
 
   patches = [

From e668ec5665fde338bad04b52c67fdf47bff1f83f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 26 Aug 2018 20:10:26 +0000
Subject: [PATCH 272/282] perlPackages.SVNSimple: fix build with non-default
 perl

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 00f012c767e..be5bf77e93e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14260,7 +14260,7 @@ let
       url = "mirror://cpan/authors/id/C/CL/CLKAO/${name}.tar.gz";
       sha256 = "1ysgi38zx236cxz539k6d6rw5z0vc70rrglsaf5fk6rnwilw2g6n";
     };
-    propagatedBuildInputs = [ pkgs.subversionClient ];
+    propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ];
   };
 
   Swim = buildPerlPackage rec {

From 9e44b46bab02ae739a50d5edc38d0d338f402f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
Date: Sun, 26 Aug 2018 22:14:17 +0200
Subject: [PATCH 273/282] dex: 0.7 -> 0.8.0 (#45639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 pkgs/tools/X11/dex/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
index d147ef4a70c..2a3a406135b 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/pkgs/tools/X11/dex/default.nix
@@ -3,16 +3,17 @@
 stdenv.mkDerivation rec {
   program = "dex";
   name = "${program}-${version}";
-  version = "0.7";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "jceb";
     repo = program;
     rev = "v${version}";
-    sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5";
+    sha256 = "13dkjd1373mbvskrdrp0865llr3zvdr90sc6a6jqswh3crmgmz4k";
   };
 
   propagatedBuildInputs = [ python3 ];
+  nativeBuildInputs = [ python3.pkgs.sphinx ];
   makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
 
   meta = {

From db11c832fb95128b58f0156dd9eb64726d2473b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Aug 2018 22:51:59 +0100
Subject: [PATCH 274/282] WIP Elm 0.19

---
 pkgs/development/compilers/elm/default.nix    | 57 +++----------------
 .../compilers/elm/packages/elm-compiler.nix   | 41 -------------
 .../compilers/elm/packages/elm-make.nix       | 26 ---------
 .../compilers/elm/packages/elm-package.nix    | 39 -------------
 .../compilers/elm/packages/elm-repl.nix       | 30 ----------
 .../compilers/elm/packages/elm.nix            | 30 ++++++++++
 pkgs/development/compilers/elm/update-elm.rb  | 28 ---------
 7 files changed, 38 insertions(+), 213 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-compiler.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-make.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-package.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-repl.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm.nix
 delete mode 100755 pkgs/development/compilers/elm/update-elm.rb

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 6a8d5f11b75..b7482efe7f5 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -40,28 +40,13 @@ let
       EOF
     '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc802.override {
+  hsPkgs = haskell.packages.ghc822.override {
     overrides = self: super:
       let hlib = haskell.lib;
-          elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
-          elmPkgs' = elmRelease.packages;
-          elmPkgs = elmPkgs' // {
-
-            elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
-              buildTools = drv.buildTools or [] ++ [ self.elm-make ];
-              preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
-            });
-
-            elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
-              doCheck = false;
-              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
-              postInstall =
-                let bins = lib.makeBinPath [ nodejs self.elm-make ];
-                in ''
-                  wrapProgram $out/bin/elm-repl \
-                    --prefix PATH ':' ${bins}
-                '';
-            });
+          elmPkgs = {
+            elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
+              preConfigure = "export HOME=`pwd`";
+            };
 
             /*
             This is not a core Elm package, and it's hosted on GitHub.
@@ -72,37 +57,11 @@ let
             where foo is a tag for a new version, for example "0.3.1-alpha".
             */
             elm-format = self.callPackage ./packages/elm-format.nix { };
-            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {
-              aeson-pretty = self.aeson-pretty_0_7_2;
-              either = hlib.overrideCabal self.either (drv :{
-                jailbreak = true;
-                version = "4.4.1.1";
-                sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
-                libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
-                  self.exceptions self.free self.mmorph self.monad-control
-                  self.MonadRandom self.profunctors self.transformers
-                  self.transformers-base
-                ];
-              });
-            };
+            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {};
           };
       in elmPkgs // {
         inherit elmPkgs;
-        elmVersion = elmRelease.version;
-        # https://github.com/elm-lang/elm-compiler/issues/1566
-        indents = hlib.overrideCabal super.indents (drv: {
-          version = "0.3.3";
-          #test dep tasty has a version mismatch
-          doCheck = false;
-          sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-          libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
-        });
+        elmVersion = elmPkgs.elm.version;
       };
   };
-in hsPkgs.elmPkgs // {
-  elm = lib.hiPrio (buildEnv {
-    name = "elm-${hsPkgs.elmVersion}";
-    paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
-    pathsToLink = [ "/bin" ];
-  });
-}
+in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
deleted file mode 100644
index 1242f556838..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint
-, base, binary, bytestring, containers, directory, edit-distance
-, fetchgit, filemanip, filepath, HUnit, indents
-, language-ecmascript, language-glsl, mtl, parsec, pretty, process
-, QuickCheck, stdenv, test-framework, test-framework-hunit
-, test-framework-quickcheck2, text, union-find
-}:
-mkDerivation {
-  pname = "elm-compiler";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh";
-    rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filepath indents
-    language-ecmascript language-glsl mtl parsec pretty process text
-    union-find
-  ];
-  executableHaskellDepends = [
-    aeson base binary directory filepath process text
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filemanip filepath
-    HUnit indents language-ecmascript language-glsl mtl parsec pretty
-    process QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2 text union-find
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
-  license = stdenv.lib.licenses.bsd3;
-  # added manually since tests are not passing
-  # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852
-  doCheck = false;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
deleted file mode 100644
index 98e57ac9b7c..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
-, blaze-html, blaze-markup, bytestring, containers, directory
-, elm-compiler, elm-package, fetchgit, filepath, mtl
-, optparse-applicative, raw-strings-qq, stdenv, text, time
-}:
-mkDerivation {
-  pname = "elm-make";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-make";
-    sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2";
-    rev = "1a554833a70694ab142b9179bfac996143f68d9e";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base binary blaze-html
-    blaze-markup bytestring containers directory elm-compiler
-    elm-package filepath mtl optparse-applicative raw-strings-qq text
-    time
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "A build tool for Elm projects";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
deleted file mode 100644
index 49eddb58a14..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary
-, bytestring, containers, directory, edit-distance, elm-compiler
-, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls
-, http-types, mtl, network, optparse-applicative, parallel-io
-, pretty, stdenv, text, time, unordered-containers, vector
-, zip-archive
-}:
-mkDerivation {
-  pname = "elm-package";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-package";
-    sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
-    rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
-  };
-  patches = fetchurl {
-    url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch;
-    sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network parallel-io text time
-    unordered-containers vector zip-archive
-  ];
-  executableHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network optparse-applicative
-    parallel-io pretty text time unordered-containers vector
-    zip-archive
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-package;
-  description = "Package manager for Elm libraries";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
deleted file mode 100644
index 8c168dedc75..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
-, containers, directory, elm-compiler, elm-package, fetchgit
-, filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text
-}:
-mkDerivation {
-  pname = "elm-repl";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-repl";
-    sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5";
-    rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    base binary bytestring bytestring-trie cmdargs containers directory
-    elm-compiler elm-package filepath haskeline mtl parsec text
-  ];
-  testHaskellDepends = [
-    base bytestring bytestring-trie cmdargs directory elm-compiler
-    elm-package filepath haskeline HUnit mtl parsec QuickCheck
-    test-framework test-framework-hunit test-framework-quickcheck2
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-repl;
-  description = "a REPL for Elm";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
new file mode 100644
index 00000000000..1097c8a1e19
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, containers, directory, edit-distance, fetchgit
+, file-embed, filepath, ghc-prim, haskeline, HTTP, http-client
+, http-client-tls, http-types, language-glsl, logict, mtl, network
+, parsec, process, raw-strings-qq, scientific, SHA, snap-core
+, snap-server, stdenv, template-haskell, text, time
+, unordered-containers, utf8-string, vector, zip-archive
+}:
+mkDerivation {
+  pname = "elm";
+  version = "0.19.0";
+  src = fetchgit {
+    url = "https://github.com/elm/compiler";
+    sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
+    rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    ansi-terminal ansi-wl-pprint base binary bytestring containers
+    directory edit-distance file-embed filepath ghc-prim haskeline HTTP
+    http-client http-client-tls http-types language-glsl logict mtl
+    network parsec process raw-strings-qq scientific SHA snap-core
+    snap-server template-haskell text time unordered-containers
+    utf8-string vector zip-archive
+  ];
+  homepage = "http://elm-lang.org";
+  description = "The `elm` command line interface";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
deleted file mode 100755
index 5169ff3fd29..00000000000
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.18.0"
-$elm_packages = { "elm-compiler" => "0.18.0",
-                  "elm-package" => "0.18.0",
-                  "elm-make" => "0.18.0",
-                  "elm-reactor" => "0.18.0",
-                  "elm-repl" => "0.18.0"
-                }
-
-for pkg, ver in $elm_packages
-  system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix"
-end
-
-File.open("packages/release.nix", 'w') do |file|
-  file.puts "# This file is auto-generated by ./update-elm.rb."
-  file.puts "# Please, do not modify it by hand!"
-  file.puts "{ callPackage }:"
-  file.puts "{"
-  file.puts "  version = \"#{$elm_version}\";"
-  file.puts "  packages = {"
-  for pkg, ver in $elm_packages
-    file.puts "    #{pkg} = callPackage ./#{pkg}.nix { };"
-  end
-  file.puts "  };"
-  file.puts "}"
-end

From 9f9e9d6433519a3fe2ca0b08942a8ee025e720d4 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 22 Aug 2018 22:09:23 -0400
Subject: [PATCH 275/282] elm: 0.18 -> 0.19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update makeElmStuff to makeDotElm, create elm-elm.nix listing the elm
code that elm itself embeds, and pre-fetch it so that the elm build
can function offline.  also include a versions.dat file, as created
during an impure build of elm.  set ELM_HOME so that the elm build can
find these things.

continues #45448

(cherry picked from commit e7d0df84676d51fb0cbfbeb10dd32153489c3565)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/compilers/elm/default.nix    |  37 +++++++++----
 .../compilers/elm/packages/elm-elm.nix        |  50 ++++++++++++++++++
 pkgs/development/compilers/elm/versions.dat   | Bin 0 -> 83377 bytes
 3 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/compilers/elm/packages/elm-elm.nix
 create mode 100644 pkgs/development/compilers/elm/versions.dat

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index b7482efe7f5..51f76f1108a 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -6,9 +6,26 @@
 # 3) Run ./elm2nix.rb in elm-reactor's directory.
 # 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
 
+# the elm binary embeds a piece of pre-compiled elm code, used by 'elm
+# reactor'. this means that the build process for 'elm' effectively
+# executes 'elm make'. that in turn expects to retrieve the elm
+# dependencies of that code (elm/core, etc.) from
+# package.elm-lang.org, as well as a cached bit of metadata
+# (versions.dat).
+
+# the makeDotElm function lets us retrieve these dependencies in the
+# standard nix way. we have to copy them in (rather than symlink) and
+# make them writable because the elm compiler writes other .dat files
+# alongside the source code. versions.dat was produced during an
+# impure build of this same code; the build complains that it can't
+# update this cache, but continues past that warning.
+
+# finally, we set ELM_HOME to point to these pre-fetched artifacts so
+# that the default of ~/.elm isn't used.
+
 let
-  makeElmStuff = deps:
-    let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
+  makeDotElm = ver: deps:
+    let versionsDat = ./versions.dat;
         cmds = lib.mapAttrsToList (name: info: let
                  pkg = stdenv.mkDerivation {
 
@@ -29,15 +46,13 @@ let
 
                  };
                in ''
-                 mkdir -p elm-stuff/packages/${name}
-                 ln -s ${pkg} elm-stuff/packages/${name}/${info.version}
+                 mkdir -p .elm/${ver}/package/${name}
+                 cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
+                 chmod -R +w .elm/${ver}/package/${name}/${info.version}
                '') deps;
     in ''
-      export HOME=/tmp
-      mkdir elm-stuff
-      cat > elm-stuff/exact-dependencies.json <<EOF
-      ${json}
-      EOF
+      mkdir -p .elm/${ver}/package;
+      ln -s ${versionsDat} .elm/${ver}/package/versions.dat;
     '' + lib.concatStrings cmds;
 
   hsPkgs = haskell.packages.ghc822.override {
@@ -45,7 +60,9 @@ let
       let hlib = haskell.lib;
           elmPkgs = {
             elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
-              preConfigure = "export HOME=`pwd`";
+              preConfigure = ''
+                export ELM_HOME=`pwd`/.elm
+              '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
             };
 
             /*
diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix
new file mode 100644
index 00000000000..1537dbf6781
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-elm.nix
@@ -0,0 +1,50 @@
+{
+  "elm/time" = {
+    version = "1.0.0";
+    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+  };
+  "elm/url" = {
+    version = "1.0.0";
+    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+  };
+  "elm/json" = {
+    version = "1.0.0";
+    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
+  };
+  "elm/html" = {
+    version = "1.0.0";
+    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+  };
+  "elm/parser" = {
+    version = "1.0.0";
+    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+  };
+  "elm/http" = {
+    version = "1.0.0";
+    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+  };
+  "elm/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+  };
+  "elm/browser" = {
+    version = "1.0.0";
+    sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
+  };
+  "elm/core" = {
+    version = "1.0.0";
+    sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
+  };
+  "elm/svg" = {
+    version = "1.0.0";
+    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+  };
+  "elm/project-metadata-utils" = {
+    version = "1.0.0";
+    sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
+  };
+  "elm-explorations/markdown" = {
+    version = "1.0.0";
+    sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
+  };
+}
diff --git a/pkgs/development/compilers/elm/versions.dat b/pkgs/development/compilers/elm/versions.dat
new file mode 100644
index 0000000000000000000000000000000000000000..824ab383057f2138d4dcd431b52851a2e6b8b127
GIT binary patch
literal 83377
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

literal 0
HcmV?d00001


From 7c542d0c86ad5958d2772026cf48939c3aee2aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 11:52:48 +0100
Subject: [PATCH 276/282] Elm: 0.19 builds with elm-format

---
 pkgs/development/compilers/elm/default.nix    | 53 +++++++++++++------
 .../compilers/elm/packages/elm-format.nix     | 19 +++----
 .../elm/packages/elm-interface-to-json.nix    | 24 ---------
 .../elm/packages/elm-reactor-elm.nix          | 22 --------
 .../compilers/elm/packages/elm-reactor.nix    | 28 ----------
 .../compilers/elm/packages/indents.nix        | 11 ++++
 .../compilers/elm/packages/release.nix        | 13 -----
 pkgs/development/compilers/elm/update.sh      |  3 ++
 8 files changed, 56 insertions(+), 117 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-reactor.nix
 create mode 100644 pkgs/development/compilers/elm/packages/indents.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/release.nix
 create mode 100755 pkgs/development/compilers/elm/update.sh

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 51f76f1108a..70be5a95105 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,10 +1,12 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }:
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
 
 # To update:
-# 1) Update versions in ./update-elm.rb and run it.
-# 2) Checkout elm-reactor and run `elm-package install -y` inside.
-# 3) Run ./elm2nix.rb in elm-reactor's directory.
-# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
+
+# 1) Modify ./update.sh and run it
+# 2) XXX: generate packages/elm-elm.nix
+# 3) XXX: versions.dat
+
+# Notes:
 
 # the elm binary embeds a piece of pre-compiled elm code, used by 'elm
 # reactor'. this means that the build process for 'elm' effectively
@@ -48,22 +50,25 @@ let
                in ''
                  mkdir -p .elm/${ver}/package/${name}
                  cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
-                 chmod -R +w .elm/${ver}/package/${name}/${info.version}
                '') deps;
-    in ''
+    in (lib.concatStrings cmds) + ''
       mkdir -p .elm/${ver}/package;
-      ln -s ${versionsDat} .elm/${ver}/package/versions.dat;
-    '' + lib.concatStrings cmds;
+      cp ${versionsDat} .elm/${ver}/package/versions.dat;
+      chmod -R +w .elm
+    '';
 
   hsPkgs = haskell.packages.ghc822.override {
-    overrides = self: super:
-      let hlib = haskell.lib;
-          elmPkgs = {
-            elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
+    overrides = self: super: with haskell.lib;
+      let elmPkgs = {
+            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (attrs: {
+              # sadly with parallelism most of the time breaks compilation
+              enableParallelBuilding = false;
               preConfigure = ''
                 export ELM_HOME=`pwd`/.elm
               '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
-            };
+            });
+
+
 
             /*
             This is not a core Elm package, and it's hosted on GitHub.
@@ -71,14 +76,28 @@ let
 
                 cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
 
-            where foo is a tag for a new version, for example "0.3.1-alpha".
+            where foo is a tag for a new version, for example "0.8.0".
             */
-            elm-format = self.callPackage ./packages/elm-format.nix { };
-            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {};
+            elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix {  }) (drv: {
+              # https://github.com/avh4/elm-format/issues/529
+              patchPhase = ''
+                cat >Setup.hs <<EOF
+                import Distribution.Simple
+                main = defaultMain
+                EOF
+
+                sed -i '/Build_elm_format/d' elm-format.cabal
+                sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs
+                sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs
+              '';
+            });
           };
       in elmPkgs // {
         inherit elmPkgs;
         elmVersion = elmPkgs.elm.version;
+
+        # Needed for elm-format
+        indents = self.callPackage ./packages/indents.nix {};
       };
   };
 in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 56db835ac10..86d99abab5a 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -6,14 +6,12 @@
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.7.0";
+  version = "0.8.0";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf";
-    rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb";
+    sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6";
+    rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6";
   };
-
-  doHaddock = false;
   isLibrary = true;
   isExecutable = true;
   setupHaskellDepends = [ base Cabal directory filepath process ];
@@ -27,15 +25,10 @@ mkDerivation {
     base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
     split tasty tasty-golden tasty-hunit tasty-quickcheck text
   ];
+  doHaddock = false;
   jailbreak = true;
-  postInstall = ''
-    ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
-  '';
-  postPatch = ''
-    sed -i "s|desc <-.*||" ./Setup.hs
-    sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs
-  '';
-  homepage = http://elm-lang.org;
+  doCheck = false;
+  homepage = "http://elm-lang.org";
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
deleted file mode 100644
index 3f797b7a236..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-, concatenative, containers, directory, either, elm-compiler
-, filemanip, filepath, indents, optparse-applicative, parsec
-, stdenv, text, transformers, fetchgit
-}:
-mkDerivation {
-  pname = "elm-interface-to-json";
-  version = "0.1.0.0";
-  src = fetchgit {
-    url = "https://github.com/stoeffel/elm-interface-to-json";
-    sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k";
-    rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  jailbreak = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base binary bytestring concatenative containers
-    directory either elm-compiler filemanip filepath indents
-    optparse-applicative parsec text transformers
-  ];
-  homepage = "https://github.com/githubuser/elm-interface-to-json#readme";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
deleted file mode 100644
index 90c8956323b..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "elm-lang/virtual-dom" = {
-    version = "2.0.1";
-    sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3";
-  };
-  "evancz/elm-markdown" = {
-    version = "3.0.1";
-    sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj";
-  };
-  "elm-lang/html" = {
-    version = "2.0.0";
-    sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi";
-  };
-  "elm-lang/svg" = {
-    version = "2.0.0";
-    sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l";
-  };
-  "elm-lang/core" = {
-    version = "5.0.0";
-    sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn";
-  };
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
deleted file mode 100644
index 41611b3cdd0..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-, cmdargs, containers, directory, elm-compiler, elm-package
-, fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core
-, snap-server, stdenv, template-haskell, text, time, transformers
-, unordered-containers, utf8-string, websockets, websockets-snap
-}:
-mkDerivation {
-  pname = "elm-reactor";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65";
-    rev = "c519d4ec0aaf2f043a416fe858346b0181eca516";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson base blaze-html blaze-markup bytestring cmdargs containers
-    directory elm-compiler elm-package file-embed filepath fsnotify mtl
-    process snap-core snap-server template-haskell text time
-    transformers unordered-containers utf8-string websockets
-    websockets-snap
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Interactive development tool for Elm programs";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix
new file mode 100644
index 00000000000..6bf7fa7890e
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/indents.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, base, concatenative, mtl, parsec, stdenv }:
+mkDerivation {
+  pname = "indents";
+  version = "0.3.3";
+  sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
+  libraryHaskellDepends = [ base concatenative mtl parsec ];
+  doCheck = false;
+  homepage = "http://patch-tag.com/r/salazar/indents";
+  description = "indentation sensitive parser-combinators for parsec";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix
deleted file mode 100644
index fd4e08fff09..00000000000
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is auto-generated by ./update-elm.rb.
-# Please, do not modify it by hand!
-{ callPackage }:
-{
-  version = "0.18.0";
-  packages = {
-    elm-compiler = callPackage ./elm-compiler.nix { };
-    elm-package = callPackage ./elm-package.nix { };
-    elm-make = callPackage ./elm-make.nix { };
-    elm-reactor = callPackage ./elm-reactor.nix { };
-    elm-repl = callPackage ./elm-repl.nix { };
-  };
-}
diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh
new file mode 100755
index 00000000000..02e5bdc9b58
--- /dev/null
+++ b/pkgs/development/compilers/elm/update.sh
@@ -0,0 +1,3 @@
+cabal2nix https://github.com/elm/compiler --revision  32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix
+cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
+cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix

From 82f11ba01b97e1f3961b24187e96ad8db336a124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 11:53:04 +0100
Subject: [PATCH 277/282] haskell generic builder: expose
 enableParallelBuilding

---
 pkgs/development/haskell-modules/generic-builder.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 37916c0bba2..0786238040b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -46,6 +46,10 @@ in
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
 , license
+# We cannot enable -j<n> parallelism for libraries because GHC is far more
+# likely to generate a non-determistic library ID in that case. Further
+# details are at <https://github.com/peti/ghc-library-id-bug>.
+, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
 , maintainers ? []
 , doCoverage ? false
 , doHaddock ? !(ghc.isHaLVM or false)
@@ -112,11 +116,6 @@ let
                      main = defaultMain
                    '';
 
-  # We cannot enable -j<n> parallelism for libraries because GHC is far more
-  # likely to generate a non-determistic library ID in that case. Further
-  # details are at <https://github.com/peti/ghc-library-id-bug>.
-  enableParallelBuilding = (versionOlder "7.8" ghc.version && !isLibrary) || versionOlder "8.0.1" ghc.version;
-
   crossCabalFlags = [
     "--with-ghc=${ghc.targetPrefix}ghc"
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"

From fc11905b6e44ca7a803fec6986950608625a16d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 12:01:52 +0100
Subject: [PATCH 278/282] elm: depend on nodejs due to repl

---
 pkgs/development/compilers/elm/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 70be5a95105..f338fc23835 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -60,12 +60,17 @@ let
   hsPkgs = haskell.packages.ghc822.override {
     overrides = self: super: with haskell.lib;
       let elmPkgs = {
-            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (attrs: {
+            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
               # sadly with parallelism most of the time breaks compilation
               enableParallelBuilding = false;
               preConfigure = ''
                 export ELM_HOME=`pwd`/.elm
               '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
+              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+              postInstall = ''
+                wrapProgram $out/bin/elm \
+                  --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
+              '';
             });
 
 

From aa8bdaf0c4ed67acfab6a1977b70c356bbf0543a Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 26 Aug 2018 16:53:04 -0400
Subject: [PATCH 279/282] elm: add instructions for versions.dat and
 elm-elm.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit fcabcb2e41a89b2249d24e68355866979e961f8a)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/compilers/elm/default.nix    | 27 ++++++++-
 .../compilers/elm/packages/elm-elm.nix        | 60 +++++++++----------
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index f338fc23835..93deb4a90af 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -3,8 +3,31 @@
 # To update:
 
 # 1) Modify ./update.sh and run it
-# 2) XXX: generate packages/elm-elm.nix
-# 3) XXX: versions.dat
+
+# 2) to generate versions.dat:
+# 2.1) git clone https://github.com/elm/compiler.git
+# 2.2) cd compiler
+# 2.3) cabal2nix --shell . | sed 's/"default",/"ghc822",/' > shell.nix
+# 2.4) nix-shell
+# 2.5) mkdir .elm
+# 2.6) export ELM_HOME=$(pwd)/.elm
+# 2.7) cabal build
+# 2.8) cp .elm/0.19.0/package/versions.dat ...
+
+# 3) generate a template for elm-elm.nix with:
+# (
+#   echo "{";
+#   jq '.dependencies | .direct, .indirect | to_entries | .[] | { (.key) : { version : .value, sha256:  "" } } ' \
+#   < ui/browser/elm.json \
+#   | sed 's/:/ =/' \
+#   | sed 's/^[{}]//' \
+#   | sed -E 's/(["}]),?$/\1;/' \
+#   | sed -E 's/"(version|sha256)"/\1/' \
+#   | grep -v '^$';
+#   echo "}"
+# )
+#
+# ... then fill in the sha256s
 
 # Notes:
 
diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix
index 1537dbf6781..a38e21daa06 100644
--- a/pkgs/development/compilers/elm/packages/elm-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-elm.nix
@@ -1,32 +1,4 @@
 {
-  "elm/time" = {
-    version = "1.0.0";
-    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
-  };
-  "elm/url" = {
-    version = "1.0.0";
-    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
-  };
-  "elm/json" = {
-    version = "1.0.0";
-    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
-  };
-  "elm/html" = {
-    version = "1.0.0";
-    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
-  };
-  "elm/parser" = {
-    version = "1.0.0";
-    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
-  };
-  "elm/http" = {
-    version = "1.0.0";
-    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
-  };
-  "elm/virtual-dom" = {
-    version = "1.0.0";
-    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
-  };
   "elm/browser" = {
     version = "1.0.0";
     sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
@@ -35,16 +7,44 @@
     version = "1.0.0";
     sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
   };
-  "elm/svg" = {
+  "elm/html" = {
     version = "1.0.0";
-    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+  };
+  "elm/http" = {
+    version = "1.0.0";
+    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+  };
+  "elm/json" = {
+    version = "1.0.0";
+    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
   };
   "elm/project-metadata-utils" = {
     version = "1.0.0";
     sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
   };
+  "elm/svg" = {
+    version = "1.0.0";
+    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+  };
   "elm-explorations/markdown" = {
     version = "1.0.0";
     sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
   };
+  "elm/parser" = {
+    version = "1.0.0";
+    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+  };
+  "elm/time" = {
+    version = "1.0.0";
+    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+  };
+  "elm/url" = {
+    version = "1.0.0";
+    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+  };
+  "elm/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+  };
 }

From c2c13157bb4339069874206fa9588e75d106c808 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 27 Aug 2018 00:26:07 +0200
Subject: [PATCH 280/282] udunits: 2.2.26 -> 2.2.27.6 (#45660)

---
 .../development/libraries/udunits/default.nix | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index b02ac885237..664bc29a72d 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl,
-  bison, flex, expat, file
+{ stdenv, fetchFromGitHub, autoreconfHook,
+  texinfo, bison, flex, expat, file
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.26";
-    src = fetchurl {
-        url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn";
-    };
+  name = "udunits-${version}";
+  version = "2.2.27.6";
+  
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "UDUNITS-2";
+    rev = "v${version}";
+    sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm";
+  };
 
-    nativeBuildInputs = [ bison flex file ];
-    buildInputs = [ expat ];
+  nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
+  buildInputs = [ expat ];
 
-    meta = with stdenv.lib; {
-      homepage = https://www.unidata.ucar.edu/software/udunits/;
-      description = "A C-based package for the programatic handling of units of physical quantities";
-      license = licenses.bsdOriginal;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ pSub ];
-    };
+  meta = with stdenv.lib; {
+    homepage = https://www.unidata.ucar.edu/software/udunits/;
+    description = "A C-based package for the programatic handling of units of physical quantities";
+    license = licenses.bsdOriginal;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
 }

From 0e530b037d50985107899c94104175df629e8544 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Aug 2018 17:09:44 -0700
Subject: [PATCH 281/282] e2fsprogs: 1.44.3 -> 1.44.4 (#45602)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/e2fsprogs/versions.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 0e983ca219b..d5f43e31702 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo, perl }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.44.3";
+  name = "e2fsprogs-1.44.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1gl34i2dy1n7aky9g0jgdybl3ar2zh8i8xnghrcbb5pvws66vbn2";
+    sha256 = "1cnwfmv9r7s73xhgghqspjq593pc4qghh80wjd0kjdgwy247cw6x";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];

From f412e19996f059faaa216fb52babe7efa2d5ff27 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Aug 2018 21:50:19 -0400
Subject: [PATCH 282/282] linux: 4.18-rc8 -> 4.19-rc1

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index dd3186bc876..68b5e7c21a8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -302,7 +302,7 @@ let
       CIFS_XATTR        = yes;
       CIFS_POSIX        = yes;
       CIFS_FSCACHE      = yes;
-      CIFS_STATS        = yes;
+      CIFS_STATS        = whenOlder "4.19" yes;
       CIFS_WEAK_PW_HASH = yes;
       CIFS_UPCALL       = yes;
       CIFS_ACL          = yes;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index ec3baaf1e0a..c2feeceb072 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18-rc8";
-  modDirVersion = "4.18.0-rc8";
-  extraMeta.branch = "4.18";
+  version = "4.19-rc1";
+  modDirVersion = "4.19.0-rc1";
+  extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0rqyqms63c15iwcwy40yqd9fvlvh3ah09gddv0wf45z9dqp7id1m";
+    sha256 = "14c9xg9sv0jrdri36das97vdbybi7vmcy59mj9wmgaz81cdk3wg5";
   };
 
   # Should the testing kernels ever be built on Hydra?