From d7007c2ea0b0d02bd0029667600f4fbe7bd402cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 3 Jul 2018 13:13:22 -0700
Subject: [PATCH 01/65] xapian: 1.4.5 -> 1.4.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xapian/versions.

These checks were done:

- built on NixOS
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-delve passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-check passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-compact passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-progsrv passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-replicate passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-replicate-server passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-tcpsrv passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/copydatabase passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/quest passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simpleexpand passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simpleindex passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/simplesearch passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-metadata passed the binary check.
- /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6/bin/xapian-config passed the binary check.
- 14 of 14 passed binary check by having a zero exit code.
- 11 of 14 passed binary check by having the new version present in output.
- found 1.4.6 with grep in /nix/store/aj2mvy243pd40qm07xain7psfz2ql9jp-xapian-1.4.6
- directory tree listing: https://gist.github.com/1a9a8d6ec7eaf0fcf99b2fd3ac78bdde
- du listing: https://gist.github.com/a62b29d85790d5e9d07055163c257283
---
 pkgs/development/libraries/xapian/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 5dd81af2b1a..5bc347cbadd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -36,5 +36,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5";
+  xapian_1_4 = generic "1.4.6" "166qpfq7pvyrj2w2x07v31ypvqg6c2xyvds5sms9h4g2sg0z23hy";
 }

From 852dca659b06834919535c59679469f222dec86f Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:18:36 +0100
Subject: [PATCH 02/65] pythonPackages.easygui: init at 0.98.1

---
 .../python-modules/easygui/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/easygui/default.nix

diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix
new file mode 100644
index 00000000000..3a7046c50b3
--- /dev/null
+++ b/pkgs/development/python-modules/easygui/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "easygui";
+  version = "0.98.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zmvmwgxyzvm83818skhn8b4wrci4kmnixaax8q3ia5cn7xrmj6v";
+  };
+
+  doCheck = false; # No tests available
+
+  meta = with stdenv.lib; {
+    description = "Very simple, very easy GUI programming in Python";
+    homepage = https://github.com/robertlugg/easygui;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ac09121fac..71875d9963e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2272,6 +2272,8 @@ in {
 
   easydict = callPackage ../development/python-modules/easydict { };
 
+  easygui = callPackage ../development/python-modules/easygui { };
+
   EasyProcess = callPackage ../development/python-modules/easyprocess { };
 
   easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };

From 2137f5b7c086e1eb0dba9d318bb9b44dbe043aba Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:19:33 +0100
Subject: [PATCH 03/65] pythonPackages.pymediainfo: init at 2.3.0

---
 .../python-modules/pymediainfo/default.nix    | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymediainfo/default.nix

diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
new file mode 100644
index 00000000000..3245c3d3c48
--- /dev/null
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, libmediainfo
+, setuptools_scm
+, pytest, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "pymediainfo";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x";
+  };
+
+  postPatch = ''
+    substituteInPlace pymediainfo/__init__.py \
+      --replace 'CDLL(library_file)' \
+                'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
+      --replace 'CDLL("libmediainfo.0.dylib")' \
+                'CDLL("${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}")' \
+      --replace 'CDLL("libmediainfo.dylib")' \
+                'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
+      --replace 'CDLL("libmediainfo.so.0")' \
+                'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")'
+  '';
+
+  nativeBuildInputs = [ setuptools_scm ];
+
+  checkInputs = [ glibcLocales pytest ];
+
+  checkPhase = ''
+    export LC_ALL=en_US.UTF-8
+    py.test -k 'not test_parse_url' tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python wrapper for the mediainfo library";
+    homepage = https://github.com/sbraz/pymediainfo;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71875d9963e..8acd4e83961 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4025,6 +4025,8 @@ in {
 
   pylama = callPackage ../development/python-modules/pylama { };
 
+  pymediainfo = callPackage ../development/python-modules/pymediainfo { };
+
   pyphen = callPackage ../development/python-modules/pyphen {};
 
   pypoppler = buildPythonPackage rec {

From 8ce4aa2e4254742a13720c0cf8d0a6a2a0ed20c6 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:20:32 +0100
Subject: [PATCH 04/65] pythonPackages.pyprind: init at 2.11.2

---
 .../python-modules/pyprind/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyprind/default.nix

diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix
new file mode 100644
index 00000000000..de1b17be739
--- /dev/null
+++ b/pkgs/development/python-modules/pyprind/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, psutil
+, pytest }:
+
+buildPythonPackage rec {
+  pname = "PyPrind";
+  version = "2.11.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xg6m5hr33h9bdlrr42kc58jm2m87a9zsagy7n2m4n407d2snv64";
+  };
+
+  buildInputs = [ psutil ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python Progress Bar and Percent Indicator Utility";
+    homepage = https://github.com/rasbt/pyprind;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8acd4e83961..c6c55deb5d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4091,6 +4091,8 @@ in {
     };
   };
 
+  pyprind = callPackage ../development/python-modules/pyprind { };
+
   python-axolotl = callPackage ../development/python-modules/python-axolotl { };
 
   python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };

From e78a7579f79d451b599553b675f1ed3b535e4146 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:21:03 +0100
Subject: [PATCH 05/65] pythonPackages.rawkit: init at 0.6.0

---
 .../python-modules/rawkit/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/rawkit/default.nix

diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix
new file mode 100644
index 00000000000..e8be12b2669
--- /dev/null
+++ b/pkgs/development/python-modules/rawkit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, libraw
+, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "rawkit";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s";
+  };
+
+  buildInputs = [ libraw ];
+
+  checkInputs = [ pytest mock ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CTypes based LibRaw bindings for Python";
+    homepage = https://rawkit.readthedocs.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6c55deb5d3..2bd19dc8ce3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4280,6 +4280,8 @@ in {
 
   raven = callPackage ../development/python-modules/raven { };
 
+  rawkit = callPackage ../development/python-modules/rawkit { };
+
   rethinkdb = buildPythonPackage rec {
     name = "rethinkdb-${version}";
     version = "2.3.0.post6";

From 93f4bd878fb3b4d83d660652f7a8ac62ee6166df Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:21:44 +0100
Subject: [PATCH 06/65] pythonPackages.gphoto2: init at 1.8.2

---
 .../python-modules/gphoto2/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/gphoto2/default.nix

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
new file mode 100644
index 00000000000..29aa0400ec5
--- /dev/null
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, pkgconfig
+, libgphoto2 }:
+
+buildPythonPackage rec {
+  pname = "gphoto2";
+  version = "1.8.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1806bdjc18qh0wyayxymgjnqqqlxs2iwvgk594anxw9y69hrxqni";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libgphoto2 ];
+
+  doCheck = false; # No tests available
+
+  meta = with stdenv.lib; {
+    description = "Python interface to libgphoto2";
+    homepage = https://github.com/jim-easterbrook/python-gphoto2;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2bd19dc8ce3..72266fbb651 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6263,6 +6263,10 @@ in {
 
   gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
 
+  gphoto2 = callPackage ../development/python-modules/gphoto2 {
+    inherit (pkgs) pkgconfig;
+  };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = callPackage ../development/python-modules/greenlet { };

From e6f61bb933429dffff4048bc893afdaa61e0e839 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 9 Mar 2018 10:22:37 +0100
Subject: [PATCH 07/65] rapid-photo-downloader: init at 0.9.9

---
 .../rapid-photo-downloader/default.nix        | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/graphics/rapid-photo-downloader/default.nix

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
new file mode 100644
index 00000000000..4f31a10c2d1
--- /dev/null
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, python3Packages
+, file, intltool, gobjectIntrospection, libgudev
+, udisks, glib, gnome3, gst_all_1, libnotify
+, exiv2, exiftool, qt5, gdk_pixbuf
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "rapid-photo-downloader";
+  version = "0.9.9";
+
+  src = fetchurl {
+    url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
+    sha256 = "193l55wdxwxmammyxwzp90sg0qw5r316443la3m9611sdpcmy8w3";
+  };
+
+  # Disable version check and fix install tests
+  postPatch = ''
+    substituteInPlace raphodo/constants.py \
+      --replace "disable_version_check = False" "disable_version_check = True"
+    substituteInPlace raphodo/rescan.py \
+      --replace "from preferences" "from raphodo.preferences"
+    substituteInPlace raphodo/copyfiles.py \
+      --replace "import problemnotification" "import raphodo.problemnotification"
+  '';
+
+  nativeBuildInputs = [ file intltool gobjectIntrospection ];
+
+  buildInputs = [
+    libgudev
+    udisks
+    glib
+    gnome3.gexiv2
+    gst_all_1.gstreamer
+    libnotify
+    exiv2
+    exiftool
+    qt5.qtimageformats
+    gdk_pixbuf
+  ] ++ (with python3Packages; [
+    pyqt5
+    pygobject3
+    gphoto2
+    pyzmq
+    tornado
+    psutil
+    pyxdg
+    arrow
+    dateutil
+    easygui
+    colour
+    pymediainfo
+    sortedcontainers
+    rawkit
+    requests
+    colorlog
+    pyprind
+  ]);
+
+  makeWrapperArgs = [
+    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+    "--set PYTHONPATH \"$PYTHONPATH\""
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Photo and video importer for cameras, phones, and memory cards";
+    homepage = http://www.damonlynch.net/rapid/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4399955ee6..b986f4528ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17996,6 +17996,8 @@ with pkgs;
 
   rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
+  rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
+
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 
   ratmen = callPackage ../tools/X11/ratmen {};

From 03d49258f67041c58f7941c50542dd2550730fa0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 15:10:56 -0700
Subject: [PATCH 08/65] mercurialFull: 4.5.2 -> 4.6.2

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

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a00393abf27..2a1ff8680ba 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "4.5.2";
+  version = "4.6.2";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
 in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4";
+    sha256 = "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From e0d5f644ac0b63570f5aa989072e71312cadbb5b Mon Sep 17 00:00:00 2001
From: snaar <snaar@snaar.net>
Date: Sun, 22 Jul 2018 17:03:38 -0400
Subject: [PATCH 09/65] lesspipe: add missing dependency on 'file'

---
 pkgs/tools/misc/lesspipe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix
index 46324f912c5..25c5e826648 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/pkgs/tools/misc/lesspipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ stdenv, fetchFromGitHub, perl, file }:
 
 stdenv.mkDerivation rec {
   name = "lesspipe-${version}";

From c6bc77d30e39cc345f36d0c33979819dcb305d2a Mon Sep 17 00:00:00 2001
From: snaar <snaar@snaar.net>
Date: Mon, 23 Jul 2018 14:32:39 -0400
Subject: [PATCH 10/65] lesspipe: add dependency on ncurses; actually pull in
 deps and put them on path

---
 pkgs/tools/misc/lesspipe/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix
index 25c5e826648..b3433be5829 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/pkgs/tools/misc/lesspipe/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchFromGitHub, perl, file }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, perl, file, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "lesspipe-${version}";
   version = "1.82";
 
-  buildInputs = [ perl ];
+  buildInputs = [ makeWrapper perl ];
   preConfigure = "patchShebangs .";
+  preFixupPhases = ["wrapWithDepsPhase"];
 
   src = fetchFromGitHub {
     owner = "wofr06";
@@ -14,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq";
   };
 
+  wrapWithDepsPhase = ''
+    wrapProgram $out/bin/lesspipe.sh --prefix PATH ":" ${lib.makeBinPath [ file ncurses ]}
+  '';
+
   meta = with stdenv.lib; {
     description = "A preprocessor for less";
     longDescription = ''

From 3a14eb0e12a3e160166a80560ddc1ec9addf7bc2 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sat, 21 Jul 2018 15:14:46 +0200
Subject: [PATCH 11/65] exim: add optional support for MySQL and the Dovecot
 authenticator

---
 pkgs/servers/mail/exim/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 87d9e504299..3acf777999f 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,5 +1,7 @@
-{ coreutils, db, fetchurl, openldap, openssl, pcre, perl, pkgconfig, stdenv
-, enableLDAP ? false
+{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
+, enableLDAP ? false, openldap
+, enableMySQL ? false, mysql, zlib
+, enableAuthDovecot ? false, dovecot
 }:
 
 stdenv.mkDerivation rec {
@@ -11,10 +13,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ coreutils db openssl pcre perl ]
-    ++ stdenv.lib.optional enableLDAP openldap;
+  buildInputs = [ coreutils db openssl perl pcre ]
+    ++ stdenv.lib.optional enableLDAP openldap
+    ++ stdenv.lib.optionals enableMySQL [ mysql zlib ]
+    ++ stdenv.lib.optional enableAuthDovecot dovecot;
 
   preBuild = ''
+    ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"}
     sed '
       s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin:
       s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf:
@@ -39,8 +44,19 @@ stdenv.mkDerivation rec {
       ${stdenv.lib.optionalString enableLDAP ''
         s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
         s:^# \(LOOKUP_LDAP=yes\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap:
         s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap:
       ''}
+      ${stdenv.lib.optionalString enableMySQL ''
+        s:^# \(LOOKUP_MYSQL=yes\)$:\1:
+        s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient:
+        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/:
+      ''}
+      ${stdenv.lib.optionalString enableAuthDovecot ''
+        s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
+      ''}
       #/^\s*#.*/d
       #/^\s*$/d
     ' < src/EDITME > Local/Makefile

From 93207805b8e1332f45d49e94010a4d5803166c6e Mon Sep 17 00:00:00 2001
From: snaar <snaar@snaar.net>
Date: Tue, 24 Jul 2018 01:23:17 -0400
Subject: [PATCH 12/65] lesspipe: fix paths via patch and substitution

---
 pkgs/tools/misc/lesspipe/default.nix     | 15 +++++++++------
 pkgs/tools/misc/lesspipe/fix-paths.patch | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/misc/lesspipe/fix-paths.patch

diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix
index b3433be5829..d5352ec26dc 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/pkgs/tools/misc/lesspipe/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, perl, file, ncurses }:
+{ stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "lesspipe-${version}";
   version = "1.82";
 
-  buildInputs = [ makeWrapper perl ];
+  buildInputs = [ perl ];
   preConfigure = "patchShebangs .";
-  preFixupPhases = ["wrapWithDepsPhase"];
 
   src = fetchFromGitHub {
     owner = "wofr06";
@@ -15,9 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq";
   };
 
-  wrapWithDepsPhase = ''
-    wrapProgram $out/bin/lesspipe.sh --prefix PATH ":" ${lib.makeBinPath [ file ncurses ]}
-  '';
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      file = "${file}/bin/file";
+      tput = "${ncurses}/bin/tput";
+    })
+  ];
 
   meta = with stdenv.lib; {
     description = "A preprocessor for less";
diff --git a/pkgs/tools/misc/lesspipe/fix-paths.patch b/pkgs/tools/misc/lesspipe/fix-paths.patch
new file mode 100644
index 00000000000..1bffcf53c82
--- /dev/null
+++ b/pkgs/tools/misc/lesspipe/fix-paths.patch
@@ -0,0 +1,22 @@
+--- a/lesspipe.sh.in
++++ b/lesspipe.sh.in
+@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then
+ fi
+ 
+ filecmd() {
+-  file -L -s "$@"
+-  file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
++  @file@ -L -s "$@"
++  @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
+ }
+ 
+ sep=:						# file name separator
+@@ -546,7 +546,7 @@ isfinal() {
+ 
+   # color requires -r or -R when calling less
+   typeset COLOR
+-  if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
++  if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
+     COLOR="--color=always"
+   fi
+ 

From 662f3020a4d66d75c3db6f0944f277879df0e921 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 25 Jul 2018 14:07:58 +0200
Subject: [PATCH 13/65] nixos/release: use real paths of netboot files

---
 nixos/release.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index dfa4ee9e127..3865b8a3fc5 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -117,9 +117,9 @@ let
         ];
         postBuild = ''
           mkdir -p $out/nix-support
-          echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
-          echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
-          echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
+          echo "file ${kernelTarget} ${build.kernel}/${kernelTarget}" >> $out/nix-support/hydra-build-products
+          echo "file initrd ${build.netbootRamdisk}/initrd" >> $out/nix-support/hydra-build-products
+          echo "file ipxe ${build.netbootIpxeScript}/netboot.ipxe" >> $out/nix-support/hydra-build-products
         '';
         preferLocalBuild = true;
       };

From 6b8a2a79cfd9442f98e03e2274c3ab35611469ca Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 26 Jul 2018 03:08:24 +0200
Subject: [PATCH 14/65] nextcloud: 13.04 -> 13.05

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3d6a1aa9c6f..3245666d8ec 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.4";
+  version = "13.0.5";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "18d514145fcddc86f48d0a5fa4a0d4b07617135a1b23107137a6ea3ed519bd54";
+    sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451";
   };
 
   installPhase = ''

From aa68f56c0a6a288529bd1075b83756b4ec911532 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 27 Jul 2018 20:05:20 +0300
Subject: [PATCH 15/65] nginxModules.vts: init at v0.1.18

---
 pkgs/servers/http/nginx/modules.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 0910a6d0584..816d9c5c3da 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -214,4 +214,13 @@
       sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y";
     };
   };
+
+  vts = {
+    src = fetchFromGitHub {
+      owner = "vozlt";
+      repo = "nginx-module-vts";
+      rev = "v0.1.18";
+      sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
+    };
+  };
 }

From ca37481d251288902004baf230a2b091fbd3d78c Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 27 Jul 2018 20:27:31 +0300
Subject: [PATCH 16/65] nginxModules.push-stream: init at v0.5.4

---
 pkgs/servers/http/nginx/modules.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 816d9c5c3da..0b8d4f62225 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -161,6 +161,15 @@
     inputs = [ pkgs.pam ];
   };
 
+  push-stream ={
+    src = fetchFromGitHub {
+      owner = "wandenberg";
+      repo = "nginx-push-stream-module";
+      rev = "0.5.4";
+      sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr";
+    };
+  };
+
   rtmp ={
     src = fetchFromGitHub {
       owner = "arut";

From a7a7033e45d1d90ac33dca0cfe73981d2972fe2b Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 27 Jul 2018 21:27:48 +0300
Subject: [PATCH 17/65] msgpuck: init at v2.0

---
 .../development/libraries/msgpuck/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/msgpuck/default.nix

diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
new file mode 100644
index 00000000000..e177694e894
--- /dev/null
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "msgpuck-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "rtsisyk";
+    repo = "msgpuck";
+    rev = "${version}";
+    sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+     description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
+     homepage = https://github.com/rtsisyk/msgpuck;
+     license = licenses.bsd2;
+     platforms = platforms.linux;
+     maintainers = with maintainers; [ izorkin ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9f6c16e992..6c0ad38c226 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8341,6 +8341,8 @@ with pkgs;
 
   msgpack-tools = callPackage ../development/tools/msgpack-tools { };
 
+  msgpuck = callPackage ../development/libraries/msgpuck { };
+
   msitools = callPackage ../development/tools/misc/msitools { };
 
   multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis;

From 07e7966d3b889d4c95a26491735ecfadb27b49ab Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 27 Jul 2018 21:33:14 +0300
Subject: [PATCH 18/65] nginxModules.upstream-tarantool: init at v2.7

---
 pkgs/servers/http/nginx/modules.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 0b8d4f62225..9f2cd319f0e 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -224,6 +224,16 @@
     };
   };
 
+  upstream-tarantool = {
+    src = fetchFromGitHub {
+      owner = "tarantool";
+      repo = "nginx_upstream_module";
+      rev = "v2.7";
+      sha256 = "05dwj0caj910p7kan2qjvm6x2x601igryhny2xzr47hhsk5q1cnx";
+    };
+    inputs = [ pkgs.msgpuck.dev pkgs.yajl ];
+  };
+
   vts = {
     src = fetchFromGitHub {
       owner = "vozlt";

From a3c1ddda84536ece79810cc75b02da6fe123787b Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 25 Jul 2018 20:01:58 -0400
Subject: [PATCH 19/65] journald: set rateLimitInterval and rateLimitBurst to
 upstream defaults

---
 nixos/modules/system/boot/systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d2fe33488a7..35ab805dab9 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -548,7 +548,7 @@ in
     };
 
     services.journald.rateLimitInterval = mkOption {
-      default = "10s";
+      default = "30s";
       type = types.str;
       description = ''
         Configures the rate limiting interval that is applied to all
@@ -561,7 +561,7 @@ in
     };
 
     services.journald.rateLimitBurst = mkOption {
-      default = 100;
+      default = 1000;
       type = types.int;
       description = ''
         Configures the rate limiting burst limit (number of messages per

From 92eedad50b79f639eb42f8b97a68951b1a14cd09 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 29 Jul 2018 15:57:38 -0400
Subject: [PATCH 20/65] nix-top: init at 0.1.0

---
 .../package-management/nix-top/default.nix    | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-top/default.nix

diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
new file mode 100644
index 00000000000..b334b1270cf
--- /dev/null
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, ruby
+, makeWrapper
+, procps               # ps
+, ncurses              # tput
+, binutils-unwrapped   # strings
+, findutils
+}:
+
+# No gems used, so mkDerivation is fine.
+let
+  additionalPath = lib.makeBinPath [ncurses procps binutils-unwrapped findutils];
+in
+stdenv.mkDerivation rec {
+  name = "nix-top-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "samueldr";
+    repo = "nix-top";
+    rev = "v${version}";
+    sha256 = "0l50w90hs3kmdk5kb3cwjzkx38104j6n4ssqs6jpnqfc2znagpni";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    ruby
+  ];
+  
+  installPhase = ''
+    mkdir -p $out/bin/
+    cp ./nix-top $out/bin/nix-top
+    wrapProgram $out/bin/nix-top \
+      --prefix PATH : "${additionalPath}"
+  '';
+
+  meta = with lib; {
+    description = "Tracks what nix is building";
+    homepage = https://github.com/samueldr/nix-top;
+    license = licenses.mit;
+    maintainers = with maintainers; [ samueldr ];
+    platforms = platforms.linux;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644f5d821e6..3447004cdda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21301,6 +21301,8 @@ with pkgs;
 
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
 
+  nix-top = callPackage ../tools/package-management/nix-top { };
+
   nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; };
 
   nix-review = callPackage ../tools/package-management/nix-review { };

From e1dc63b41b09988ca5b53a53e570b9f48b5b8394 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 29 Jul 2018 22:09:02 -0400
Subject: [PATCH 21/65] nix-top: 0.1.0 -> 0.2.0

---
 .../package-management/nix-top/default.nix    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
index b334b1270cf..561c5a63777 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -3,25 +3,27 @@
 , fetchFromGitHub
 , ruby
 , makeWrapper
-, procps               # ps
+, getent               # /etc/passwd
 , ncurses              # tput
+, procps               # ps
 , binutils-unwrapped   # strings
+, coreutils
 , findutils
 }:
 
 # No gems used, so mkDerivation is fine.
 let
-  additionalPath = lib.makeBinPath [ncurses procps binutils-unwrapped findutils];
+  additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
 in
 stdenv.mkDerivation rec {
   name = "nix-top-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "samueldr";
     repo = "nix-top";
     rev = "v${version}";
-    sha256 = "0l50w90hs3kmdk5kb3cwjzkx38104j6n4ssqs6jpnqfc2znagpni";
+    sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";
   };
 
   nativeBuildInputs = [
@@ -33,10 +35,13 @@ stdenv.mkDerivation rec {
   ];
   
   installPhase = ''
-    mkdir -p $out/bin/
+    mkdir -p $out/bin $out/libexec/nix-top
     cp ./nix-top $out/bin/nix-top
+    chmod +x $out/bin/nix-top
     wrapProgram $out/bin/nix-top \
-      --prefix PATH : "${additionalPath}"
+      --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s /bin/stty $out/libexec/nix-top
   '';
 
   meta = with lib; {
@@ -44,7 +49,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/samueldr/nix-top;
     license = licenses.mit;
     maintainers = with maintainers; [ samueldr ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     inherit version;
   };
 }

From 3e1cb3ef61fd4c9455c7e055698086c1876846b9 Mon Sep 17 00:00:00 2001
From: Andrea Bedini <andrea@kzn.io>
Date: Mon, 30 Jul 2018 14:23:44 +0800
Subject: [PATCH 22/65] aws-sam-cli: 0.4.0 -> 0.5.0

---
 pkgs/development/tools/aws-sam-cli/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index e33d6b26b12..8778084163e 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -6,11 +6,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4740bfa23f39880d807aa75a2143259f7f15eec34c5fa5dde8fc04d8563ef521";
+    sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc";
   };
 
   # Tests are not included in the PyPI package
@@ -21,13 +21,20 @@ buildPythonApplication rec {
     boto3
     click
     cookiecutter
+    dateparser
     docker
     enum34
     flask
+    python-dateutil
     pyyaml
     six
   ];
 
+  postPatch = ''
+    substituteInPlace ./requirements/base.txt \
+      --replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0';
+  '';
+
   meta = with lib; {
     homepage = https://github.com/awslabs/aws-sam-cli;
     description = "CLI tool for local development and testing of Serverless applications";

From 35e0ca9b242dee9692ffcb6b3ca1d836850e1a52 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Mon, 30 Jul 2018 10:50:55 +0300
Subject: [PATCH 23/65] Use the default for NIX_CXXSTDLIB_COMPILE even if
 defined (but empty).

---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 1b43d7cc211..8003fe1d8f3 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -126,7 +126,7 @@ fi
 
 if [[ "$isCpp" = 1 ]]; then
     if [[ "$cppInclude" = 1 ]]; then
-        NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
+        NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}"
     fi
     NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
 fi

From 34a10d65a17c323e5dc0fba73b6e4263c8a4a309 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 30 Jul 2018 10:10:26 +0200
Subject: [PATCH 24/65] skopeo: 0.1.30 -> 0.1.31

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

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index dc157b67253..85c4f39b87a 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.30";
+  version = "0.1.31";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "10lpiiki7mlhrp4bid40wys3lch7fars1whxsa5gy0frfgp89ghn";
+    sha256 = "02z46wxhms8yph03ksl7i4hbqy15v3y1r43js9dxn0a45vxkm7lb";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";

From 06eb270c8ffe1922a54ea3ffee3678f9bf267588 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sun, 29 Jul 2018 19:16:53 +0200
Subject: [PATCH 25/65] golangci-lint: init at 1.9.2

---
 .../tools/golangci-lint/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/golangci-lint/default.nix

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
new file mode 100644
index 00000000000..d2db1f1a2a6
--- /dev/null
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -0,0 +1,24 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  name = "golangci-lint-${version}";
+  version = "1.9.2";
+  goPackagePath = "github.com/golangci/golangci-lint";
+
+  subPackages = [ "cmd/golangci-lint" ];
+
+  src = fetchFromGitHub {
+    owner = "golangci";
+    repo = "golangci-lint";
+    rev = "v${version}";
+    sha256 = "0r05j6ayk5778fkd5r1sgcwq675ra0vq82lqs125g70291ryha08";
+  };
+
+  meta = with lib; {
+    description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
+    homepage = https://golangci.com/;
+    license = licenses.agpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae91a45d715..ddd701d3cd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14205,6 +14205,8 @@ with pkgs;
 
   golint = callPackage ../development/tools/golint { };
 
+  golangci-lint = callPackage ../development/tools/golangci-lint { };
+
   godef = callPackage ../development/tools/godef { };
 
   goimports = callPackage ../development/tools/goimports { };

From 14b5d5e93e85291ed07308e2274ba0d5c487472f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Jul 2018 10:45:35 +0200
Subject: [PATCH 26/65] Revert "release/metrics: drop requiredSystemFeatures"

This reverts commit 1d0caa7b035875cee70bf8072b46b19e4965c65b. Thanks
to @vcunat we have a 'benchmark' machine again!
---
 pkgs/top-level/metrics.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index f4e778aed12..77f620da724 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -4,7 +4,7 @@ with pkgs;
 
 runCommand "nixpkgs-metrics"
   { buildInputs = [ nix time ];
-    # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra?
+    requiredSystemFeatures = [ "benchmark" ];
   }
   ''
     export NIX_DB_DIR=$TMPDIR

From 8717de96a9d0441c28ce15063adb6f4821cdb3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 30 Jul 2018 10:04:15 +0100
Subject: [PATCH 27/65] nix-top: simplify installPhase

---
 pkgs/tools/package-management/nix-top/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
index 561c5a63777..a2cd0242839 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -33,11 +33,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ruby
   ];
-  
+
   installPhase = ''
-    mkdir -p $out/bin $out/libexec/nix-top
-    cp ./nix-top $out/bin/nix-top
-    chmod +x $out/bin/nix-top
+    mkdir -p $out/libexec/nix-top
+    install -D -m755 ./nix-top $out/bin/nix-top
     wrapProgram $out/bin/nix-top \
       --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

From a8febbc4ebcf272fbaef16ce036f82615239670c Mon Sep 17 00:00:00 2001
From: Isaac Shapira <fresheyeball@gmail.com>
Date: Mon, 30 Jul 2018 04:27:07 -0600
Subject: [PATCH 28/65] nixos/hoogle: add home option (#44103)

---
 nixos/modules/services/development/hoogle.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
index 90aa04d2762..1a98f005602 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixos/modules/services/development/hoogle.nix
@@ -43,6 +43,12 @@ in {
       defaultText = "pkgs.haskellPackages";
     };
 
+    home = mkOption {
+      type = types.str;
+      description = "Url for hoogle logo";
+      default = "https://hoogle.haskell.org";
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -53,7 +59,7 @@ in {
 
       serviceConfig = {
         Restart = "always";
-        ExecStart = ''${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}'';
+        ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}'';
 
         User = "nobody";
         Group = "nogroup";

From 7679891e2b41f13cfcb3692e9e26d5f9cfa4edb2 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 30 Jul 2018 12:29:58 +0200
Subject: [PATCH 29/65] chromium: Increase build timout to two days

---
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index cca26b54124..f31ff05a42b 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -51,6 +51,6 @@ mkChromiumDerivation (base: rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
-    timeout = 86400; # 24 hours
+    timeout = 172800; # 48 hours
   };
 })

From b59a13e9b42291f234d70881ceab58b586d73492 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Mon, 30 Jul 2018 12:42:59 +0200
Subject: [PATCH 30/65] beegfs: 6.18 -> 7.0 (#44210)

---
 .../services/network-filesystems/beegfs.nix   |  11 ++
 pkgs/os-specific/linux/beegfs/default.nix     | 105 ++++++++++--------
 .../linux/beegfs/kernel-module.nix            |   8 +-
 3 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index e06a80e443d..d9dde3f6bb6 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -195,6 +195,17 @@ in
           };
 
           helperd = {
+            enable = mkOption {
+              type = types.bool;
+              default = true;
+              description = ''
+                Enable the BeeGFS helperd.
+                The helpered is need for logging purposes on the client.
+                Disabling <literal>helperd</literal> allows for runing the client
+                with <literal>allowUnfree = false</literal>.
+              '';
+            };
+
             extraConfig = mkOption {
               type = types.lines;
               default = "";
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index f17bc9492c1..076c19cf400 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -1,36 +1,37 @@
 { stdenv, fetchurl, pkgconfig, unzip, which
 , libuuid, attr, xfsprogs, cppunit, rdma-core
 , zlib, openssl, sqlite, jre, openjdk, ant
-, openssh, perl, gfortran
+, openssh, perl, gfortran, influxdb, curl
 } :
 
 let
-  version = "6.18";
+  version = "7.0";
 
   subdirs = [
     "beeond_thirdparty/build"
     "beeond_thirdparty_gpl/build"
-    "beegfs_thirdparty/build"
-    "beegfs_opentk_lib/build"
-    "beegfs_common/build"
-    "beegfs_admon/build"
-    "beegfs_java_lib/build"
-    "beegfs_ctl/build"
-    "beegfs_fsck/build"
-    "beegfs_helperd/build"
-    "beegfs_meta/build"
-    "beegfs_mgmtd/build"
-    "beegfs_online_cfg/build"
-    "beegfs_storage/build"
-    "beegfs_utils/build"
+    "thirdparty/build"
+    "opentk_lib/build"
+    "common/build"
+    "admon/build"
+    "java_lib/build"
+    "ctl/build"
+    "fsck/build"
+    "helperd/build"
+    "meta/build"
+    "mgmtd/build"
+    "storage/build"
+    "utils/build"
+    "mon/build"
+    "upgrade/beegfs_mirror_md/build"
   ];
 
 in stdenv.mkDerivation rec {
   name = "beegfs-${version}";
 
   src = fetchurl {
-    url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
+    url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
+    sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
   };
 
   nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
@@ -45,7 +46,10 @@ in stdenv.mkDerivation rec {
     jre
     rdma-core
     openssh
-    gfortran ];
+    gfortran
+    influxdb
+    curl
+  ];
 
   hardeningDisable = [ "format" ]; # required for building beeond
 
@@ -65,11 +69,13 @@ in stdenv.mkDerivation rec {
 
   buildPhase = ''
     for i in ${toString subdirs}; do
-      make -C $i BEEGFS_OPENTK_IBVERBS=1
+      make -C $i BEEGFS_OPENTK_IBVERBS=1 ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
     done
-    make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
+    make -C admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
   '';
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     binDir=$out/bin
     docDir=$out/share/doc/beegfs
@@ -79,43 +85,45 @@ in stdenv.mkDerivation rec {
 
     mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir
 
-    cp beegfs_admon/build/beegfs-admon $binDir
-    cp beegfs_admon/build/dist/usr/bin/beegfs-admon-gui $binDir
-    cp beegfs_admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
-    cp beegfs_admon/build/dist/etc/beegfs-admon.conf $docDir
+    cp admon/build/beegfs-admon $binDir
+    cp admon/build/dist/usr/bin/beegfs-admon-gui $binDir
+    cp admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
+    cp admon/build/dist/etc/beegfs-admon.conf $docDir
 
-    cp beegfs_java_lib/build/jbeegfs.jar $libDirPkg
-    cp beegfs_java_lib/build/libjbeegfs.so $libDir
+    cp java_lib/build/jbeegfs.jar $libDirPkg
+    cp java_lib/build/libjbeegfs.so $libDir
 
-    cp beegfs_ctl/build/beegfs-ctl $binDir
-    cp beegfs_fsck/build/beegfs-fsck $binDir
+    cp ctl/build/beegfs-ctl $binDir
+    cp fsck/build/beegfs-fsck $binDir
 
-    cp beegfs_utils/scripts/beegfs-check-servers $binDir
-    cp beegfs_utils/scripts/beegfs-df $binDir
-    cp beegfs_utils/scripts/beegfs-net $binDir
+    cp utils/scripts/beegfs-check-servers $binDir
+    cp utils/scripts/beegfs-df $binDir
+    cp utils/scripts/beegfs-net $binDir
 
-    cp beegfs_helperd/build/beegfs-helperd $binDir
-    cp beegfs_helperd/build/dist/etc/beegfs-helperd.conf $docDir
+    cp helperd/build/beegfs-helperd $binDir
+    cp helperd/build/dist/etc/beegfs-helperd.conf $docDir
 
-    cp beegfs_client_module/build/dist/sbin/beegfs-setup-client $binDir
-    cp beegfs_client_module/build/dist/etc/beegfs-client.conf $docDir
+    cp client_module/build/dist/sbin/beegfs-setup-client $binDir
+    cp client_module/build/dist/etc/beegfs-client.conf $docDir
 
-    cp beegfs_meta/build/beegfs-meta $binDir
-    cp beegfs_meta/build/dist/sbin/beegfs-setup-meta $binDir
-    cp beegfs_meta/build/dist/etc/beegfs-meta.conf $docDir
+    cp meta/build/beegfs-meta $binDir
+    cp meta/build/dist/sbin/beegfs-setup-meta $binDir
+    cp meta/build/dist/etc/beegfs-meta.conf $docDir
 
-    cp beegfs_mgmtd/build/beegfs-mgmtd $binDir
-    cp beegfs_mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
-    cp beegfs_mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
+    cp mgmtd/build/beegfs-mgmtd $binDir
+    cp mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
+    cp mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
 
-    cp beegfs_storage/build/beegfs-storage $binDir
-    cp beegfs_storage/build/dist/sbin/beegfs-setup-storage $binDir
-    cp beegfs_storage/build/dist/etc/beegfs-storage.conf $docDir
+    cp storage/build/beegfs-storage $binDir
+    cp storage/build/dist/sbin/beegfs-setup-storage $binDir
+    cp storage/build/dist/etc/beegfs-storage.conf $docDir
 
-    cp beegfs_opentk_lib/build/libbeegfs-opentk.so $libDir
+    cp opentk_lib/build/libbeegfs-opentk.so $libDir
 
-    cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
-    cp -r beegfs_client_devel/include/* $includeDir
+    cp upgrade/beegfs_mirror_md/build/beegfs-mirror-md $binDir
+
+    cp client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
+    cp -r client_devel/include/* $includeDir
 
     cp beeond_thirdparty_gpl/build/parallel $out/bin
     cp beeond_thirdparty/build/pcopy/p* $out/bin
@@ -137,7 +145,8 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   checkPhase = ''
-    beegfs_common/build/test-runner --text
+    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/opentk_lib/build/ \
+      common/build/test-runner --text
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix
index 63e45928f21..eff0e741e61 100644
--- a/pkgs/os-specific/linux/beegfs/kernel-module.nix
+++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix
@@ -3,13 +3,13 @@
 } :
 
 let
-  version = "6.18";
+  version = "7.0";
 in stdenv.mkDerivation {
   name = "beegfs-module-${version}-${kernel.version}";
 
   src = fetchurl {
-    url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
+    url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
+    sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
   };
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
     find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
   '';
 
-  preBuild = "cd beegfs_client_module/build";
+  preBuild = "cd client_module/build";
 
   installPhase = ''
     instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs

From 8f12a9a283f945712ed928cd804ff2b4da656d20 Mon Sep 17 00:00:00 2001
From: ua74e3dqka <40042054+ua74e3dqka@users.noreply.github.com>
Date: Mon, 30 Jul 2018 12:43:24 +0200
Subject: [PATCH 31/65] yed:  3.17.2 -> 3.18.1 (#44088)

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

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index aa2435c43de..a7cc7229d5b 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.17.2";
+  version = "3.18.1";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
+    sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From dba10d2d49c183ad1d23bc12a7ee211005c08ed6 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Mon, 30 Jul 2018 13:50:51 +0300
Subject: [PATCH 32/65] rdedup: 2.0.0 -> 3.0.1

---
 pkgs/tools/backup/rdedup/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 2da94354019..10cb1edb62a 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libsodium, lzma }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
+, llvmPackages, clang_39, lzma }:
 
 rustPlatform.buildRustPackage rec {
   name = "rdedup-${version}";
-  version = "2.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "dpc";
     repo = "rdedup";
-    rev = "v${version}";
-    sha256 = "14r6x1wi5mwadarm0vp6qnr5mykv4g0kxz9msq76fhwghwb9k1d9";
+    rev = "e0f26f379a434f76d238c7a5fa6ddd8ae8b32f19";
+    sha256 = "1nhf8ap0w99aa1h0l599cx90lcvfvjaj67nw9flq9bmmzpn53kp9";
   };
 
-  buildInputs = [ pkgconfig libsodium lzma ];
+  cargoSha256 = "1x6wchlcxb1frww6y04gfx4idxv9h0g9qfxrhgb6g5qy3bqhqq3p";
 
-  cargoSha256 = "0wyswc4b4hkiw20gz0w94vv1qgcb2zq0cdaj9zxvyr5l0abxip9w";
+  nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ];
+  buildInputs = [ openssl libsodium lzma ];
+
+  configurePhase = ''
+    export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
+  '';
 
   meta = with stdenv.lib; {
     description = "Data deduplication with compression and public key encryption";

From f5811cadc58afa71846b1ae6eab3dcc636a3abfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Mon, 30 Jul 2018 13:05:55 +0200
Subject: [PATCH 33/65] python.pkgs.pytest-flake8: 1.0.1 -> 1.0.2 (#44215)

---
 .../development/python-modules/pytest-flake8/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 2ad44c4e806..558fe32b909 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-flake8";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # although pytest is a runtime dependency, do not add it as
   # propagatedBuildInputs in order to allow packages depend on another version
@@ -12,16 +12,13 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5";
+    sha256 = "c740ad6aa19e3958947d2118f70bed218caf1d2097039fb7318573a2a72f89a1";
   };
 
   checkPhase = ''
-    pytest . -k "not test_mtime_caching"
+    pytest .
   '';
 
-  # https://github.com/tholo/pytest-flake8/issues/49
-  doCheck = false;
-
   meta = {
     description = "py.test plugin for efficiently checking PEP8 compliance";
     homepage = https://github.com/tholo/pytest-flake8;

From 541d30a3a932ce7aee4e7affa43089d1796b3aba Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Jul 2018 07:27:25 -0500
Subject: [PATCH 34/65] rr: enable on 32bit x86

Lack of 32bit support led to the creation
of an overlay to add it back again,
but since it at least builds and seems to work
don't see why we'd disallow it here :).
---
 pkgs/development/tools/analysis/rr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index d0d20362236..9c2419b5358 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
 
     license = "custom";
     maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
-    platforms = ["x86_64-linux"];
+    platforms = stdenv.lib.platforms.x86;
   };
 }

From 81511557c8aa59de767b6dc06070ee3b2f3e9631 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 30 Jul 2018 08:38:05 -0400
Subject: [PATCH 35/65] dbeaver: 5.1.3 -> 5.1.4

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index d23b789780b..fd14bba282c 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.1.3";
+  version = "5.1.4";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1znkr28pfpclq2gl2prllb3hwq9v9rj5xl7xarq0hsggzfg9n071";
+    sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5";
   };
 
   installPhase = ''

From b2c565eee5fae658e53f12792141507e063de748 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 31 Dec 2017 15:47:36 +0100
Subject: [PATCH 36/65] template-glib: init at 3.28.0

---
 .../libraries/template-glib/default.nix       | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/template-glib/default.nix

diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
new file mode 100644
index 00000000000..6ce02d588a9
--- /dev/null
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+let
+  version = "3.28.0";
+  pname = "template-glib";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "18bic41f9cx8h6n5bz80z4ridb8c1h1yscicln8zsn23zmp44x3c";
+  };
+
+  buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ glib gobjectIntrospection ];
+
+  mesonFlags = [
+    "-Denable_gtk_doc=true"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A library for template expansion which supports calling into GObject Introspection from templates";
+    homepage = https://gitlab.gnome.org/GNOME/template-glib;
+    license = licenses.lgpl21Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8472f96fac3..be0de7358d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15021,6 +15021,8 @@ with pkgs;
 
   theano = callPackage ../data/fonts/theano { };
 
+  template-glib = callPackage ../development/libraries/template-glib { };
+
   tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
 
   terminus_font = callPackage ../data/fonts/terminus-font { };

From 80b5f5227e4a801bc9da70ba68d59aad54618e7c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 31 Dec 2017 15:47:59 +0100
Subject: [PATCH 37/65] jsonrpc-glib: init at 3.28.1

---
 .../libraries/jsonrpc-glib/default.nix        | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/libraries/jsonrpc-glib/default.nix

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
new file mode 100644
index 00000000000..a73122d8253
--- /dev/null
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+let
+  version = "3.28.1";
+  pname = "jsonrpc-glib";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  buildInputs = [ glib json-glib ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0avff2ldjvwrb8rnzlgslagdjf6x7bmdx69rsq20k6f38icw4ang";
+  };
+
+  mesonFlags = [
+    "-Denable_gtk_doc=true"
+  ];
+
+  # Tests fail non-deterministically
+  # https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2
+  doCheck = false;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A library to communicate using the JSON-RPC 2.0 specification";
+    homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib;
+    license = licenses.lgpl21Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be0de7358d5..42d38772772 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9827,6 +9827,8 @@ with pkgs;
     emscripten = emscripten.override {python=python2;};
   };
 
+  jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
+
   libjson = callPackage ../development/libraries/libjson { };
 
   libb64 = callPackage ../development/libraries/libb64 { };

From 25fd46d10263db7a90fe0c5b4a000fdbfc916d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 30 Jul 2018 18:14:10 +0200
Subject: [PATCH 38/65] home-assistant: 0.74.0 -> 0.74.2

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 26a0cf426a1..5f41dbbdfa1 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.74.0";
+  version = "0.74.2";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 6b771bcce7a..700f8ed7862 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -74,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.74.0";
+  hassVersion = "0.74.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "05njkzh4hwz3vbxq2j98znnk8yzs9zkzcd4d99qwcw2hn9kdc385";
+    sha256 = "02wdvkcl4zjw009a5ylblk5blpf5rhlvch8vsg4cx07sj9xgjzmw";
   };
 
   propagatedBuildInputs = [

From 21e5d59f9cf54e3d779c267b4e67a69b2d2e28db Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 24 Jul 2018 21:31:16 -0500
Subject: [PATCH 39/65] dolphinEmuMaster: 2018-07-02 -> 2018-07-22

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index bc872bb5faa..5533fd699bb 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "dolphin-emu-${version}";
-  version = "2018-07-02";
+  version = "2018-07-22";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "87c5d00e2085090e51c1d44e4fd271437123c722";
-    sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk";
+    rev = "7c2d2548a88abf9a5fa0bff52e00c57d093a9e19";
+    sha256 = "0x9h8s6fa04vcdwaqgrd5jpbgadgpkj3m4g2w1mp97libvr7hpy4";
   };
 
   enableParallelBuilding = true;

From 03b77a3910ff2191dcd046fd91593c74ef42e448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 30 Jul 2018 18:28:58 +0200
Subject: [PATCH 40/65] python.pkgs.libusb1: fix tests

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

diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index 8d74a4d3c46..f11930a3a18 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, libusb1 }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }:
 
 buildPythonPackage rec {
   pname = "libusb1";
@@ -17,6 +17,10 @@ buildPythonPackage rec {
 
   buildInputs = [ libusb1 ];
 
+  checkPhase = ''
+    ${python.interpreter} -m usb1.testUSB1
+  '';
+
   meta = with stdenv.lib; {
     homepage    = https://github.com/vpelletier/python-libusb1;
     description = "Python ctype-based wrapper around libusb1";

From de311d9ab3600fc5faa556905f99388aa4ab99d6 Mon Sep 17 00:00:00 2001
From: catern <catern@catern.com>
Date: Mon, 30 Jul 2018 13:16:37 -0400
Subject: [PATCH 41/65] pythonPackages.contextvars: 2.2 -> 2.3 (#44234)

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

diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix
index d8ee3b1ca9e..12914617b8f 100644
--- a/pkgs/development/python-modules/contextvars/default.nix
+++ b/pkgs/development/python-modules/contextvars/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "contextvars";
-  version = "2.2";
+  version = "2.3";
   disabled = !isPy36;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "046b385nfzkjh0wqmd268p2jkgn9fg6hz40npq7j1w3c8aqzhwvx";
+    sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
   };
 
   propagatedBuildInputs = [ immutables ];

From a52b6b19324f5c3603f99765cd03498f22b1da04 Mon Sep 17 00:00:00 2001
From: catern <catern@catern.com>
Date: Mon, 30 Jul 2018 13:18:55 -0400
Subject: [PATCH 42/65] pythonPackages.contextvars: 2.2 -> 2.3 (#44234)


From 3250b89987c4920c0c48381023ce5465b484aaed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= <teo@nullable.se>
Date: Tue, 5 Jun 2018 21:22:41 +0200
Subject: [PATCH 43/65] nixos/gitlab: don't delete ${statePath}/lib if it
 doesn't exist

The old behaviour caused new instances to be unable to start
---
 nixos/modules/services/misc/gitlab.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index b09f0408e10..38b17239f70 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -584,7 +584,9 @@ in {
           ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
         ''}
         ln -sf ${cfg.statePath}/config /run/gitlab/config
-        rm ${cfg.statePath}/lib
+        if [ -e ${cfg.statePath}/lib ]; then
+          rm ${cfg.statePath}/lib
+        fi
         ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
         cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
 

From e0983f3eece3b57b4dfa3caede9001a35f4fb782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= <teo@nullable.se>
Date: Tue, 5 Jun 2018 21:24:32 +0200
Subject: [PATCH 44/65] nixos/gitlab: create uploads folder

It seems like Gitlab doesn't pick up GITLAB_UPLOADS_PATH. The internal uploads
folder is already symlinked to /run/gitlab/uploads by the gitlab package. Here
we symlink this further to ${statePath}/uploads, since /run is (usually) a tmpfs.
---
 nixos/modules/services/misc/gitlab.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 38b17239f70..9eeb1fe01c5 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -560,6 +560,7 @@ in {
         mkdir -p ${cfg.statePath}/tmp/sockets
         mkdir -p ${cfg.statePath}/shell
         mkdir -p ${cfg.statePath}/db
+        mkdir -p ${cfg.statePath}/uploads
 
         rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
         mkdir -p ${cfg.statePath}/config
@@ -570,6 +571,7 @@ in {
         mkdir -p ${cfg.statePath}/log
         ln -sf ${cfg.statePath}/log /run/gitlab/log
         ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+        ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
         ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
         chown -R ${cfg.user}:${cfg.group} /run/gitlab
 

From 6c54cfb280fe4f4090f622dc247b76b62fa345dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= <teo@nullable.se>
Date: Tue, 5 Jun 2018 21:27:42 +0200
Subject: [PATCH 45/65] nixos/gitlab: don't install pg_trgm for remote hosts

Fixes #41476
---
 nixos/modules/services/misc/gitlab.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 9eeb1fe01c5..5bf66354f48 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -612,10 +612,11 @@ in {
             ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
             touch "${cfg.statePath}/db-created"
           fi
+
+          # enable required pg_trgm extension for gitlab
+          ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
         fi
 
-        # enable required pg_trgm extension for gitlab
-        ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
         # Always do the db migrations just to be sure the database is up-to-date
         ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
 

From 5c4b20303207f3c808bdefaa3ff16f3165f748ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Jul 2018 19:36:14 +0200
Subject: [PATCH 46/65] hledger-lib: patch code to work around a regression in
 version 0.10

https://github.com/simonmichael/hledger/issues/852
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3c8f94860b4..8c1c2fac250 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -972,6 +972,13 @@ self: super: {
     sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l";
   });
 
+  # https://github.com/simonmichael/hledger/issues/852
+  hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
+    url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
+    sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
+    stripLen = 1;
+  });
+
   # Copy hledger man pages from data directory into the proper place. This code
   # should be moved into the cabal2nix generator.
   hledger = overrideCabal super.hledger (drv: {

From 7c585235ff66634137c61991c9b05f9de2b48e44 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 30 Jul 2018 20:16:26 +0200
Subject: [PATCH 47/65] php71: 7.1.19 -> 7.1.20 (#44211)

Changelog: https://secure.php.net/ChangeLog-7.php#7.1.20
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a77ee425617..cc50edecf60 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -231,8 +231,8 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.19";
-    sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k";
+    version = "7.1.20";
+    sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
   };
 
   php72 = generic {

From 77eab67b76b995db6e1ca544af589c5449fc2377 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 30 Jul 2018 20:36:56 +0200
Subject: [PATCH 48/65] xapian: 1.4.6 -> 1.4.7

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

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 5bc347cbadd..e07e3b2e704 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -36,5 +36,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.6" "166qpfq7pvyrj2w2x07v31ypvqg6c2xyvds5sms9h4g2sg0z23hy";
+  xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
 }

From 85d23b0b55f530b120e6345f4d90e67a8796ec6b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Jul 2018 14:38:44 -0400
Subject: [PATCH 49/65] sbt: 1.1.6 -> 1.2.0

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 8db0cc0d54f..9c23b85e227 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "1hb8gcf3shcp4a65pnlqdlp8j5as7prqvw3d0b5bnfjfi0qbaigm";
+    sha256 = "1rrn0v4bhgar3mrgs931ifggb8kfg23fv5cgvskrdd7iyvg0z9wc";
   };
 
   patchPhase = ''

From ca4ed1c3d24bed5a936d02001ca7ec030015fa52 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 11:44:10 -0700
Subject: [PATCH 50/65] mate.mate-control-center: 1.20.3 -> 1.21.0 (#43748)

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

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index bc7538b6306..36bfa596e19 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
-  version = "1.20.3";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd";
+    sha256 = "0m40jr1midh5fzk3k97sydihlqfqjvzxlgmkx8w2j30a09h7230w";
   };
 
   nativeBuildInputs = [

From aeab0ec63beaa374b271f94335592ac5dd9f7f5c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 29 Jul 2018 17:55:07 +0200
Subject: [PATCH 51/65] jq: fix tests on darwin

The tests depend on libjq which isn't installed in the correct location
yet when the checkPhase runs.
---
 pkgs/development/tools/jq/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 6ee8c4074b7..93c465ce844 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -34,12 +34,15 @@ stdenv.mkDerivation rec {
     "--datadir=\${doc}/share"
     "--mandir=\${man}/share/man"
     ]
-  # jq is linked to libjq:
+    # jq is linked to libjq:
     ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
-  installCheckPhase = "$bin/bin/jq --help >/dev/null";
   doInstallCheck = true;
-  doCheck = true;
+  installCheckTarget = "check";
+
+  postInstallCheck = ''
+    $bin/bin/jq --help >/dev/null
+  '';
 
   meta = with stdenv.lib; {
     description = ''A lightweight and flexible command-line JSON processor'';

From 03e47c388aca8202ee72d2d546067cb5250bfe4b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 11:45:56 -0700
Subject: [PATCH 52/65] ptex: 2.1.33 -> 2.3.0 (#43739)

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

diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index f300a571b0c..aa17771ec9f 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   name = "ptex-${version}";
-  version = "2.1.33";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "wdas";
     repo = "ptex";
     rev = "v${version}";
-    sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn";
+    sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From 6ea7b48c2b20ab88334cea9b368fe0d0354b4926 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 30 Jul 2018 22:06:22 +0200
Subject: [PATCH 53/65] xapian: add patch to fix notmuch tagging

Patch is from xapian master and can be removed on next update.
---
 pkgs/development/libraries/xapian/default.nix |  7 +++++
 .../xapian/fix-notmuch-tagging.patch          | 31 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/xapian/fix-notmuch-tagging.patch

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index e07e3b2e704..8c0d065247b 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,6 +11,13 @@ let
       inherit sha256;
     };
 
+    patches = [
+      # fix notmuch build, see https://notmuchmail.org/faq/#index12h2
+      # cannot fetchpatch this because base directory differs
+      # TODO: remove on next xapian update
+      ./fix-notmuch-tagging.patch
+    ];
+
     outputs = [ "out" "man" "doc" ];
 
     buildInputs = [ libuuid zlib ];
diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
new file mode 100644
index 00000000000..6deae76d2aa
--- /dev/null
+++ b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
@@ -0,0 +1,31 @@
+From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
+From: Olly Betts <olly@survex.com>
+Date: Thu, 26 Jul 2018 17:26:52 +1200
+Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
+ databases"
+
+The amended check isn't conservative enough as there may be postlist
+changes in the inverter while the table is unmodified.  This breaks
+testcase T150-tagging.sh in notmuch's testsuite, reported by David
+Bremner.
+
+This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
+---
+ xapian-core/backends/glass/glass_postlist.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
+index 80e578b85..a47f14a68 100644
+--- a/backends/glass/glass_postlist.cc
++++ b/backends/glass/glass_postlist.cc
+@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
+     (void)need_pos;
+     if (term_.empty())
+ 	RETURN(NULL);
+-    if (!this_db.get() || this_db->postlist_table.is_modified())
++    if (!this_db.get() || this_db->postlist_table.is_writable())
+ 	RETURN(NULL);
+     RETURN(new GlassPostList(this_db, term_, cursor->clone()));
+ }
+-- 
+2.11.0

From aedf479ae5645fe1c2e50483075bfb8836f16ae8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 13:32:30 -0700
Subject: [PATCH 54/65] proselint: 0.8.0 -> 0.9.0 (#43917)

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

diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index 6b499f3db18..6f81d881c5c 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   name = "proselint-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   doCheck = false; # fails to pass because it tries to run in home directory
 
   src = fetchurl {
     url = "mirror://pypi/p/proselint/${name}.tar.gz";
-    sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
+    sha256 = "1fibk24fx00bfn0z4iikcv519cz2nkcil9k187sf3adb2ldzg4ab";
   };
 
   propagatedBuildInputs = [ click future six ];

From d7c3926352ff7ca2962fcb40bfebd42106c7bc8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 13:36:27 -0700
Subject: [PATCH 55/65] bcftools: 1.8 -> 1.9 (#43950)

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

diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 1ad1647c70e..539d7c22446 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bcftools";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa";
+    sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
   };
 
   buildInputs = [ htslib zlib bzip2 lzma curl perl python ];

From 742627f27185944ccea50806699b042c2a77e076 Mon Sep 17 00:00:00 2001
From: Ihor Antonov <ngortheone@users.noreply.github.com>
Date: Mon, 30 Jul 2018 16:46:03 -0400
Subject: [PATCH 56/65] pythonPackages.fluent-logger: init at 0.9.3 (#44236)

---
 .../python-modules/fluent-logger/default.nix  | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/fluent-logger/default.nix

diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix
new file mode 100644
index 00000000000..8af0bce82f3
--- /dev/null
+++ b/pkgs/development/python-modules/fluent-logger/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, msgpack }:
+
+buildPythonPackage rec {
+  pname = "fluent-logger";
+  version = "0.9.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09vii0iclfq6vhz37xyybksq9m3538hkr7z40sz2dlpf2rkg98mg";
+  };
+
+  propagatedBuildInputs = [ msgpack ];
+  
+  # Tests fail because absent in package
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A structured logger for Fluentd (Python)";
+    homepage = https://github.com/fluent/fluent-logger-python;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76af703b8f9..e806f33f3c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2546,6 +2546,8 @@ in {
     };
   };
 
+  fluent-logger = callPackage ../development/python-modules/fluent-logger {};
+
   python-forecastio = callPackage ../development/python-modules/python-forecastio { };
 
   fpdf = callPackage ../development/python-modules/fpdf { };

From 77b501b902e587cb9df1e2b1f85de13c17d8665d Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 30 Jul 2018 23:24:55 +0200
Subject: [PATCH 57/65] tortoisehg: 4.5.2 -> 4.6.1

---
 pkgs/applications/version-management/tortoisehg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 3f33410f1b1..5a37857fa47 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.5.2";
+    version = "4.6.1";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9";
+      sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From 78b089016e5879b730bc76917bd88cbf8a37d2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 30 Jul 2018 23:49:22 +0200
Subject: [PATCH 58/65] seafile-shared: 6.2.2 -> 6.2.3

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

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 0425fb430c5..90aac977643 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec {
-  version = "6.2.2";
+  version = "6.2.3";
   name = "seafile-shared-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "05swp7sjp7pzgp8hjjr2prg0wq213l04iyqdfwwasdczdx6j6g59";
+    sha256 = "019q5xsrhl6x8ngy0mzjdakm7m63gxyw8v7a223zwpw0i86l8hms";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

From ad5638227dfbc73f61d96fe9ab1d9d81dbce8d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 30 Jul 2018 23:50:23 +0200
Subject: [PATCH 59/65] seafile-client: 6.2.2 -> 6.2.3

---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index a1f1d50e5be..d28e241e746 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.2.2";
+  version = "6.2.3";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4";
+    sha256 = "1wdpz7vxhn9mcc7kxhrz9c5dwd492akirz351wfi4xxy5np6p6kp";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From 138d3be11aac7abe23501ac74c77357e0b59efa1 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Mon, 30 Jul 2018 15:14:41 -0700
Subject: [PATCH 60/65] pythonPackages.reportlab: remove test files that
 require network for the tests to pass (#44244)

closes #44204
---
 pkgs/development/python-modules/reportlab/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 6ede1b8937b..298c3c79e38 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -23,12 +23,17 @@ in buildPythonPackage rec {
   buildInputs = [ ft pillow ];
 
   postPatch = ''
-    rm tests/test_graphics_barcode.py
+    # Remove all the test files that require access to the internet to pass.
+    rm tests/test_lib_utils.py
+    rm tests/test_platypus_general.py
+
+    # Remove the tests that require Vera fonts installed
     rm tests/test_graphics_render.py
   '';
 
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" ${python.interpreter} tests/runAll.py
+    cd tests
+    LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py
   '';
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -38,4 +43,4 @@ in buildPythonPackage rec {
     description = "An Open Source Python library for generating PDFs and graphics";
     homepage = http://www.reportlab.com/;
   };
-}
\ No newline at end of file
+}

From 38c8be372662cc89b683c9258b2bb03726c580b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 15:30:21 -0700
Subject: [PATCH 61/65] gp2c: 0.0.10pl1 -> 0.0.11 (#43941)

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

diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 10b0d0cba36..42f35edb256 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "gp2c-${version}";
-  version = "0.0.10pl1";
+  version = "0.0.11";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
-    sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
+    sha256 = "1z69xj2dpd8yyi8108rz26c50xpv0k2j8qnk0bzy1c5lw3pd1adm";
   };
 
   buildInputs = [ pari perl ];

From a55bbee9978fa2f2d01aae8e6b9c1b2a79ee95dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 15:53:28 -0700
Subject: [PATCH 62/65] rdkafka: 0.11.4 -> 0.11.5 (#43932)

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

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index a1af4374843..11ae3a52adc 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rdkafka-${version}";
-  version = "0.11.4";
+  version = "0.11.5";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
     rev = "v${version}";
-    sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs";
+    sha256 = "1b0zp7k0775g5pzvkmpmsha63wx8wcwcas6w6wb09y0gymxz0xss";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From c227febef6d5923d3ee01e6926848e016e51d96f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 16:07:05 -0700
Subject: [PATCH 63/65] mopidy-gmusic: 2.0.0 -> 3.0.0 (#43928)

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

diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix
index e9c5198092d..5566c4b07b2 100644
--- a/pkgs/applications/audio/mopidy/gmusic.nix
+++ b/pkgs/applications/audio/mopidy/gmusic.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-gmusic";
-  version = "2.0.0";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";
-    sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";
+    sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz";
   };
 
   propagatedBuildInputs = [

From 1fdfa1ca13ad8fcc2c6c67fc7fcc969cb10c469b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 30 Jul 2018 06:25:21 -0500
Subject: [PATCH 64/65] nixos/manual: fix inclusion of FoundationDB
 documentation

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/databases/foundationdb.nix | 6 +++---
 nixos/modules/services/databases/foundationdb.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 91337cf791d..ad24f9f4b0f 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -320,9 +320,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    meta.doc         = ./foundationdb.xml;
-    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
-
     environment.systemPackages = [ pkg ];
 
     users.users = optionalAttrs (cfg.user == "foundationdb") (singleton
@@ -413,4 +410,7 @@ in
       '';
     };
   };
+
+  meta.doc         = ./foundationdb.xml;
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 }
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index def9cc43669..51fe9ae3f91 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -2,7 +2,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="module-foundationdb">
+         xml:id="module-services-foundationdb">
 
 <title>FoundationDB</title>
 

From 7ae2ba173f3938170778d1a913e415e2ff78c9e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jul 2018 17:04:19 -0700
Subject: [PATCH 65/65] talloc: 2.1.13 -> 2.1.14 (#43453)

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

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 30d9a38a35d..77c3c6458ad 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.13";
+  name = "talloc-2.1.14";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "0iv09iv385x69gfzvassq6m3y0rd8ncylls95dm015xdy3drkww4";
+    sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
   };
 
   nativeBuildInputs = [ pkgconfig ];