From 38798eefc713c7bcb714793141439707ad276ede Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 2 Jan 2019 21:35:38 +0800
Subject: [PATCH 001/377] libvirtd: pass proper paths to qemu helpers

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9f183365aae..c3d1f0c90cd 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -73,6 +73,8 @@ in stdenv.mkDerivation rec {
     "--with-esx"
     "--with-remote"
   ] ++ optionals stdenv.isLinux [
+    "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
+    "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
     "--with-attr"
     "--with-apparmor"
     "--with-secdriver-apparmor"

From 8da1da9d740bf9d9b0d301890aeb2c3f523fd79b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 5 May 2019 21:58:11 +0000
Subject: [PATCH 002/377] libvirt: 4.10.0 -> 5.3.0

---
 pkgs/development/libraries/libvirt/default.nix      | 7 +++----
 pkgs/development/python-modules/libvirt/default.nix | 4 ++--
 pkgs/top-level/perl-packages.nix                    | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 85b8b128d20..d9c551f9bda 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -17,19 +17,19 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "4.10.0";
+  version = "5.3.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz";
+        sha256 = "00f1blazv589cbfc85p4347x68kr45mz1r37z9bkjyw10vavsr45";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9";
+        sha256 = "10amj2aibc1cywiwn989n09sdngiw8ghp5jvdr7lwh9wdb0a3r57";
         fetchSubmodules = true;
       };
 
@@ -82,7 +82,6 @@ in stdenv.mkDerivation rec {
     "--with-numad"
     "--with-macvtap"
     "--with-virtualport"
-    "--with-init-script=systemd+redhat"
     "--with-storage-disk"
   ] ++ optionals (stdenv.isLinux && zfs != null) [
     "--with-storage-zfs"
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index d6924d9d65c..c1386085f36 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "4.10.0";
+  version = "5.3.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";
+    sha256 = "1l2a0gxmf071rd198c1z0ls3idr30i0aarf04bi9v705zdv90sxa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1c216dfaa45..107f6661aef 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14562,12 +14562,12 @@ let
   };
 
   SysVirt = buildPerlModule rec {
-    version = "4.10.0";
+    version = "5.3.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
-      rev = "v${version}";
-      sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v";
+      rev = "a1e85f96e3897f56e8686e9312c69de764f5a48c"; # there is no "v5.3.0" tag
+      sha256 = "1w80bhsdpcrk99cv355jyhl510a0nawnn9adffwj50a59ka77ihw";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From dd61fdf45ca8f0d01e5b7e0aa3f05f56bf44499a Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 20 May 2019 23:53:29 +0000
Subject: [PATCH 003/377] xfce4-13: 4.13.x -> 4.14pre1

---
 pkgs/desktops/xfce4-13/exo/default.nix        |  9 ++-
 pkgs/desktops/xfce4-13/garcon/12700.patch     | 37 ---------
 pkgs/desktops/xfce4-13/garcon/13785.patch     | 75 -------------------
 pkgs/desktops/xfce4-13/garcon/default.nix     | 10 +--
 pkgs/desktops/xfce4-13/gigolo/default.nix     |  9 ++-
 pkgs/desktops/xfce4-13/libxfce4ui/default.nix |  5 +-
 .../xfce4-13/libxfce4util/default.nix         |  5 +-
 pkgs/desktops/xfce4-13/parole/default.nix     |  4 +-
 pkgs/desktops/xfce4-13/ristretto/default.nix  |  4 +-
 .../xfce4-13/thunar-volman/default.nix        |  5 +-
 pkgs/desktops/xfce4-13/thunar/default.nix     |  5 +-
 pkgs/desktops/xfce4-13/tumbler/default.nix    |  5 +-
 .../xfce4-13/xfce4-appfinder/default.nix      |  5 +-
 .../xfce4-13/xfce4-battery-plugin/default.nix |  4 +-
 .../xfce4-13/xfce4-clipman-plugin/default.nix |  4 +-
 .../xfce4-13/xfce4-cpufreq-plugin/default.nix |  4 +-
 pkgs/desktops/xfce4-13/xfce4-dict/default.nix |  4 +-
 .../xfce4-13/xfce4-notifyd/default.nix        |  4 +-
 .../desktops/xfce4-13/xfce4-panel/default.nix |  5 +-
 .../xfce4-13/xfce4-power-manager/default.nix  |  5 +-
 .../xfce4-13/xfce4-screenshooter/default.nix  |  4 +-
 .../xfce4-13/xfce4-session/default.nix        |  5 +-
 .../xfce4-13/xfce4-settings/default.nix       |  5 +-
 .../xfce4-13/xfce4-taskmanager/default.nix    | 16 ++--
 .../xfce4-whiskermenu-plugin/default.nix      |  4 +-
 pkgs/desktops/xfce4-13/xfconf/default.nix     |  5 +-
 pkgs/desktops/xfce4-13/xfdesktop/default.nix  |  5 +-
 pkgs/desktops/xfce4-13/xfwm4/default.nix      | 15 ++--
 28 files changed, 82 insertions(+), 185 deletions(-)
 delete mode 100644 pkgs/desktops/xfce4-13/garcon/12700.patch
 delete mode 100644 pkgs/desktops/xfce4-13/garcon/13785.patch

diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix
index 1096996ee6d..fa66b5c08e7 100644
--- a/pkgs/desktops/xfce4-13/exo/default.nix
+++ b/pkgs/desktops/xfce4-13/exo/default.nix
@@ -1,15 +1,16 @@
-{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3
+{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3
 , libxfce4ui, libxfce4util }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "exo";
-  version = "0.12.2";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh";
+  sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw";
 
   nativeBuildInputs = [ libxslt perlPackages.URI ];
-  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+  buildInputs = [ gtk3 libxfce4ui libxfce4util ];
 
   postPatch = ''
     substituteInPlace docs/reference/Makefile.am \
diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch
deleted file mode 100644
index fda36d69651..00000000000
--- a/pkgs/desktops/xfce4-13/garcon/12700.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Yegor Timoshenko <yegortimoshenko@gmail.com>
-Date: Thu, 14 Dec 2017 21:13:02 +0000
-Subject: [PATCH] Decrement allocation counter on item unref (#12700)
-
-diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
-index 2017180..355e520 100644
---- a/garcon/garcon-menu-item-pool.c
-+++ b/garcon/garcon-menu-item-pool.c
-@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar    *desktop_id,
-   g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
-   g_return_val_if_fail (node != NULL, FALSE);
-
--  return garcon_menu_node_tree_rule_matches (node, item);
-+  gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
-+
-+  if (matches)
-+    garcon_menu_item_increment_allocated (item);
-+
-+  return matches;
- }
-
-
-diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
-index ca8cb63..b44acfe 100644
---- a/garcon/garcon-menu-item.c
-+++ b/garcon/garcon-menu-item.c
-@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
- {
-   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
-
-+  garcon_menu_item_decrement_allocated (item);
-+
-   /* Decrement the reference counter */
-   g_object_unref (G_OBJECT (item));
- }
---
-2.15.1
diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch
deleted file mode 100644
index 1b723d21d60..00000000000
--- a/pkgs/desktops/xfce4-13/garcon/13785.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001
-From: Stefan Berzl <stefanberzl@gmail.com>
-Date: Mon, 21 Aug 2017 18:39:07 +0300
-Subject: [PATCH] fix: some menu icons are too big (Bug #13785)
-
-Some packages only provide icons in sizes much bigger than the standard
-GTK menu size of 16px.
-
-The clipboard manager qlipper for example provides the following icon:
-/usr/share/icons/hicolor/128x128/apps/qlipper.png
-
-In GTK 3.22.18 the function gtk_image_new_from_icon_name when given
-GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128.
-
-The patch I have supplied uses existing code to scale such an image.
-
-Signed-off-by: Eric Koegel <eric.koegel@gmail.com>
----
- garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
-index 41990f2..f31a1ed 100644
---- a/garcon-gtk/garcon-gtk-menu.c
-+++ b/garcon-gtk/garcon-gtk-menu.c
-@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
-   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-   size = MIN (w, h);
- 
--  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
-+  if (gtk_icon_theme_has_icon (icon_theme, icon_name))
-+    {
-+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;
-+    }
-+  else
-     {
-       if (g_path_is_absolute (icon_name))
-         {
-@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
-               g_free (name);
-             }
-         }
-+    }
- 
--      /* Turn the pixbuf into a gtk_image */
--      if (G_LIKELY (pixbuf))
--        {
--          /* scale the pixbuf down if it needs it */
--          GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
--          g_object_unref (pixbuf);
--          pixbuf = tmp;
-+  /* Turn the pixbuf into a gtk_image */
-+  if (G_LIKELY (pixbuf))
-+    {
-+      /* scale the pixbuf down if it needs it */
-+      GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
-+      g_object_unref (G_OBJECT (pixbuf));
- 
--          image = gtk_image_new_from_pixbuf (pixbuf);
--          g_object_unref (G_OBJECT (pixbuf));
--        }
-+      image = gtk_image_new_from_pixbuf (pixbuf_scaled);
-+      g_object_unref (G_OBJECT (pixbuf_scaled));
-+    }
-+  else
-+    {
-+	  /* display the placeholder at least */
-+	  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-     }
--
--  if (image == NULL)
--    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
- 
-   return image;
- }
diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix
index a88d64702a1..487e384358a 100644
--- a/pkgs/desktops/xfce4-13/garcon/default.nix
+++ b/pkgs/desktops/xfce4-13/garcon/default.nix
@@ -1,12 +1,12 @@
-{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:
+{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "garcon";
-  version = "0.6.1";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";
+  sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj";
 
-  patches = [ ./12700.patch ./13785.patch ];
-  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+  buildInputs = [ gtk3 libxfce4ui libxfce4util ];
 }
diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix
index 0d7b2210b12..46b659b11d0 100644
--- a/pkgs/desktops/xfce4-13/gigolo/default.nix
+++ b/pkgs/desktops/xfce4-13/gigolo/default.nix
@@ -1,11 +1,12 @@
-{ mkXfceDerivation, gtk2, libX11 }:
+{ mkXfceDerivation, exo, gtk3 }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "gigolo";
-  version = "0.4.2";
+  version = "0.4.91";
 
-  sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";
+  sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7";
 
-  buildInputs = [ gtk2 libX11 ];
+  nativeBuildInputs = [ exo ];
+  buildInputs = [ gtk3 ];
 }
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
index f6997551262..d760ed8bc71 100644
--- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
@@ -4,9 +4,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "libxfce4ui";
-  version = "4.13.4";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
+  sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y";
 
   buildInputs =  [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
   propagatedBuildInputs = [ libxfce4util libICE libSM ];
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
index 6a3b633cd09..1539b3f88d7 100644
--- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "libxfce4util";
-  version = "4.13.2";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";
+  sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf";
 
   buildInputs = [ gobject-introspection ];
 
diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix
index e720791f1c4..f3a4561826e 100644
--- a/pkgs/desktops/xfce4-13/parole/default.nix
+++ b/pkgs/desktops/xfce4-13/parole/default.nix
@@ -8,9 +8,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "parole";
-  version = "1.0.1";
+  version = "1.0.2";
 
-  sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb";
+  sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl";
 
   postPatch = ''
     substituteInPlace src/plugins/mpris2/Makefile.am \
diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix
index b4b0778e982..b2da8139930 100644
--- a/pkgs/desktops/xfce4-13/ristretto/default.nix
+++ b/pkgs/desktops/xfce4-13/ristretto/default.nix
@@ -4,7 +4,7 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "ristretto";
-  version = "0.8.3";
+  version = "0.8.4";
 
   postPatch = ''
     automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
@@ -14,5 +14,5 @@ mkXfceDerivation rec {
   nativeBuildInputs = [ automakeAddFlags exo ];
   buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
 
-  sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx";
+  sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf";
 }
diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
index 0055d0d8217..47900f344b3 100644
--- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "thunar-volman";
-  version = "0.9.0";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
   buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
 
-  sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";
+  sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv";
 }
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix
index dbeb80ac9bd..5dbea2146c5 100644
--- a/pkgs/desktops/xfce4-13/thunar/default.nix
+++ b/pkgs/desktops/xfce4-13/thunar/default.nix
@@ -4,9 +4,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "thunar";
-  version = "1.8.1";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha";
+  sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n";
 
   postPatch = ''
     substituteInPlace docs/Makefile.am \
diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix
index 05a4f4ecde3..27f76fbcaab 100644
--- a/pkgs/desktops/xfce4-13/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-13/tumbler/default.nix
@@ -6,9 +6,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "tumbler";
-  version = "0.2.3";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9";
+  sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z";
 
   buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
index 65941fee4c4..d511f76ec1b 100644
--- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-appfinder";
-  version = "4.13.0";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";
+  sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg";
 
   nativeBuildInputs = [ exo ];
   buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
index b4b5ff7b714..376551b09c0 100644
--- a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-battery-plugin";
-  version = "1.1.0";
+  version = "1.1.2";
   rev = version;
-  sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn";
+  sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
 
   buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
index 28f63a6769d..74628a325d4 100644
--- a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-clipman-plugin";
-  version = "1.4.2";
+  version = "1.4.3";
   rev = version;
-  sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na";
+  sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
 
   buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
index e17204c0cd5..84cb7427699 100644
--- a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix
@@ -3,8 +3,8 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-cpufreq-plugin";
-  version = "1.2.0";
-  sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g";
+  version = "1.2.1";
+  sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
 
   buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
index 1236b60175d..603863264ef 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-dict";
-  version = "0.8.1";
+  version = "0.8.2";
 
-  sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf";
+  sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7";
 
   patches = [ ./configure-gio.patch ];
 
diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
index bac25878507..98ed6882a02 100644
--- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
@@ -4,9 +4,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-notifyd";
-  version = "0.4.2";
+  version = "0.4.4";
 
-  sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9";
+  sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
 
   buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index 27c8e1e58c7..c7551a7e6da 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.13.4";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
+  sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
index 5389af66882..0307738aee2 100644
--- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
@@ -4,9 +4,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-power-manager";
-  version = "1.6.1";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3";
+  sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077";
 
   nativeBuildInputs = [ automakeAddFlags exo ];
   buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
index 0dfad21d07b..95af146903b 100644
--- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-screenshooter";
-  version = "1.9.2";
+  version = "1.9.5";
 
-  sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2";
+  sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
 
   nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
   buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-13/xfce4-session/default.nix
index ecf1f6ac505..6104f632439 100644
--- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-session/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-session";
-  version = "4.13.0";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y";
+  sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk";
 
   buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
 
diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
index 6eb917fd76f..7e885c526d1 100644
--- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
@@ -5,9 +5,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-settings";
-  version = "4.13.4";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy";
+  sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc";
 
   postPatch = ''
     automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
index d9a5991598b..776b3797f76 100644
--- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
@@ -1,18 +1,12 @@
-{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }:
+{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
 
-let
-  inherit (lib) enableFeature;
-in
-
-mkXfceDerivation rec {
+mkXfceDerivation {
   category = "apps";
   pname = "xfce4-taskmanager";
-  version = "1.2.1";
+  version = "1.2.2";
 
-  sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w";
+  sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc";
 
   nativeBuildInputs = [ exo ];
-  buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];
-
-  configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
+  buildInputs = [ gtk3 libwnck3 libXmu ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
index 41a1ef82932..41cd491a7dc 100644
--- a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-whiskermenu-plugin";
-  version = "2.2.0";
+  version = "2.3.2";
   rev = "v${version}";
-  sha256 = "1d35xxkdzw8pl3d5ps226mmrrjk0hqczsbvl5smh7l7jbwfambjm";
+  sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix
index def60bcfe21..691fc70644c 100644
--- a/pkgs/desktops/xfce4-13/xfconf/default.nix
+++ b/pkgs/desktops/xfce4-13/xfconf/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfconf";
-  version = "4.13.5";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a";
+  sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3";
 
   buildInputs = [ libxfce4util ];
 }
diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
index 0209b791360..2d87c6ac987 100644
--- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
@@ -3,9 +3,10 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfdesktop";
-  version = "4.13.2";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl";
+  sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl";
 
   buildInputs = [
     exo
diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix
index 97d414d6693..c8106c8ec17 100644
--- a/pkgs/desktops/xfce4-13/xfwm4/default.nix
+++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix
@@ -1,25 +1,26 @@
-{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage
-, libstartup_notification, libxfce4ui, libxfce4util, libwnck
+{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
+, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
 , libXpresent, xfconf }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfwm4";
-  version = "4.13.0";
+  version = "4.14pre1";
+  rev = "xfce-4.14pre1";
 
-  sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9";
+  sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468";
 
-  nativeBuildInputs = [ exo ];
+  nativeBuildInputs = [ exo librsvg ];
 
   buildInputs = [
     dbus-glib
     epoxy
-    gtk2
+    gtk3
     libXdamage
     libstartup_notification
     libxfce4ui
     libxfce4util
-    libwnck
+    libwnck3
     libXpresent
     xfconf
   ];

From 6e4d68650613e8a80e59d468ee549e5108eed4ed Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 23 May 2019 12:20:32 +0200
Subject: [PATCH 004/377] qbe: init at unstable-2019-05-15

---
 pkgs/development/compilers/qbe/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/compilers/qbe/default.nix

diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
new file mode 100644
index 00000000000..d7315b73c9b
--- /dev/null
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  pname = "qbe";
+  version = "unstable-2019-05-15";
+
+  src = fetchgit {
+    url = "git://c9x.me/qbe.git";
+    rev = "acc3af47330fd6610cf0fbdb28e9fbd05160888f";
+    sha256 = "1c8ynqbakgz3hfdcyhwdmz7i1hnyd9m25f9y47sc21bvxwfrbzpi";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  meta = with stdenv.lib; {
+    homepage = "https://c9x.me/compile/";
+    description = "A small compiler backend written in C";
+    maintainers = with maintainers; [ fgaz ];
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 168cd3fa79b..f344d3d5792 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7925,6 +7925,8 @@ in
 
   pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };
 
+  qbe = callPackage ../development/compilers/qbe { };
+
   rgbds = callPackage ../development/compilers/rgbds { };
 
   rtags = callPackage ../development/tools/rtags {

From 86fd8c910db9856ca0a2932c379e02bcc915bf57 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 16:05:53 -0500
Subject: [PATCH 005/377] nixos/charybdis: replace deprecated usage of
 PermissionsStartOnly

---
 nixos/modules/services/networking/charybdis.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index 3d02dc8d137..e3aba063f87 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -83,6 +83,10 @@ in
         gid = config.ids.gids.ircd;
       };
 
+      systemd.tmpfiles.rules = [
+        "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"
+      ];
+
       systemd.services.charybdis = {
         description = "Charybdis IRC daemon";
         wantedBy = [ "multi-user.target" ];
@@ -93,12 +97,7 @@ in
           ExecStart   = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";
           Group = cfg.group;
           User = cfg.user;
-          PermissionsStartOnly = true; # preStart needs to run with root permissions
         };
-        preStart = ''
-          ${coreutils}/bin/mkdir -p ${cfg.statedir}
-          ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
-        '';
       };
 
     }

From 9fc6955abc34f3454d4a991b8e729f4785ff2a96 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 16:11:22 -0500
Subject: [PATCH 006/377] nixos/couchpotato: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/misc/couchpotato.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix
index 70aa895f76d..528af486b41 100644
--- a/nixos/modules/services/misc/couchpotato.nix
+++ b/nixos/modules/services/misc/couchpotato.nix
@@ -19,16 +19,11 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        mkdir -p /var/lib/couchpotato
-        chown -R couchpotato:couchpotato /var/lib/couchpotato
-      '';
-
       serviceConfig = {
         Type = "simple";
         User = "couchpotato";
         Group = "couchpotato";
-        PermissionsStartOnly = "true";
+        StateDirectory = "couchpotato";
         ExecStart = "${pkgs.couchpotato}/bin/couchpotato";
         Restart = "on-failure";
       };

From a8defe81d1c7d0c078d4f531033ac7ebbd725878 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 16:15:58 -0500
Subject: [PATCH 007/377] nixos/mopidy: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/audio/mopidy.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index e2f4ec39f94..a534b692f17 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -70,25 +70,25 @@ in {
 
   config = mkIf cfg.enable {
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - mopidy mopidy - -"
+    ];
+
     systemd.services.mopidy = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "sound.target" ];
       description = "mopidy music player daemon";
-      preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy  ${cfg.dataDir}";
       serviceConfig = {
         ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
         User = "mopidy";
-        PermissionsStartOnly = true;
       };
     };
 
     systemd.services.mopidy-scan = {
       description = "mopidy local files scanner";
-      preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy  ${cfg.dataDir}";
       serviceConfig = {
         ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";
         User = "mopidy";
-        PermissionsStartOnly = true;
         Type = "oneshot";
       };
     };
@@ -98,7 +98,7 @@ in {
       group = "mopidy";
       extraGroups = [ "audio" ];
       description = "Mopidy daemon user";
-      home = "${cfg.dataDir}";
+      home = cfg.dataDir;
     };
 
     users.groups.mopidy.gid = gid;

From 73342be85bc28e8ab0e420554a3a5f0b83d164e5 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 17:23:28 -0500
Subject: [PATCH 008/377] nixos/riemann-dash: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/riemann-dash.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix
index 7eb4d888b0c..16eb8300850 100644
--- a/nixos/modules/services/monitoring/riemann-dash.nix
+++ b/nixos/modules/services/monitoring/riemann-dash.nix
@@ -59,18 +59,20 @@ in {
       group = "riemanndash";
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - riemanndash riemanndash - -"
+    ];
+
     systemd.services.riemann-dash = {
       wantedBy = [ "multi-user.target" ];
       wants = [ "riemann.service" ];
       after = [ "riemann.service" ];
       preStart = ''
-        mkdir -p ${cfg.dataDir}/config
-        chown -R riemanndash:riemanndash ${cfg.dataDir}
+        mkdir -p '${cfg.dataDir}/config'
       '';
       serviceConfig = {
         User = "riemanndash";
         ExecStart = "${launcher}/bin/riemann-dash";
-        PermissionsStartOnly = true;
       };
     };
 

From 191e4b075547c46449eaefd23b600d42e76d26e8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 17:45:28 -0500
Subject: [PATCH 009/377] nixos/heartbeat: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/logging/heartbeat.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix
index b595ac07bf5..56fb4deabda 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixos/modules/services/logging/heartbeat.nix
@@ -54,16 +54,18 @@ in
 
   config = mkIf cfg.enable {
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - nobody nogroup - -"
+    ];
+
     systemd.services.heartbeat = with pkgs; {
       description = "heartbeat log shipper";
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         mkdir -p "${cfg.stateDir}"/{data,logs}
-        chown nobody:nogroup "${cfg.stateDir}"/{data,logs}
       '';
       serviceConfig = {
         User = "nobody";
-        PermissionsStartOnly = true;
         AmbientCapabilities = "cap_net_raw";
         ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
       };

From 74b34535fc576d40b432549f97ff720751b672f4 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 23 Feb 2019 18:00:03 -0500
Subject: [PATCH 010/377] nixos/gollum: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/misc/gollum.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index d1823bc6d4d..7653b415bf0 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -75,27 +75,24 @@ in
 
     users.groups.gollum = { };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -"
+    ];
+
     systemd.services.gollum = {
       description = "Gollum wiki";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.git ];
 
-      preStart = let
-          userName = config.users.users.gollum.name;
-          groupName = config.users.groups.gollum.name;
-        in ''
-        # All of this is safe to be run on an existing repo
-        mkdir -p ${cfg.stateDir}
+      preStart = ''
+        # This is safe to be run on an existing repo
         git init ${cfg.stateDir}
-        chmod 755 ${cfg.stateDir}
-        chown -R ${userName}:${groupName} ${cfg.stateDir}
       '';
 
       serviceConfig = {
         User = config.users.users.gollum.name;
         Group = config.users.groups.gollum.name;
-        PermissionsStartOnly = true;
         ExecStart = ''
           ${pkgs.gollum}/bin/gollum \
             --port ${toString cfg.port} \

From 93235b8a858cd673822fcf310962857059caf6b5 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 07:17:37 -0500
Subject: [PATCH 011/377] nixos/minidlna: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/minidlna.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 1858f03cac1..ed0c1044a57 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -98,16 +98,10 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "local-fs.target" ];
 
-        preStart =
-          ''
-            mkdir -p /var/cache/minidlna
-            chown -R minidlna:minidlna /var/cache/minidlna
-          '';
-
         serviceConfig =
           { User = "minidlna";
             Group = "minidlna";
-            PermissionsStartOnly = true;
+            CacheDirectory = "minidlna";
             RuntimeDirectory = "minidlna";
             PIDFile = "/run/minidlna/pid";
             ExecStart =

From c7481e6340a4eb771d2cc0a057ef4676a377486e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 07:23:11 -0500
Subject: [PATCH 012/377] nixos/hbase: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/databases/hbase.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 52f2d95b4e0..589c8cf5ec8 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -94,6 +94,11 @@ in {
 
   config = mkIf config.services.hbase.enable {
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.logDir}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.hbase = {
       description = "HBase Server";
       wantedBy = [ "multi-user.target" ];
@@ -103,19 +108,7 @@ in {
         HBASE_LOG_DIR = cfg.logDir;
       };
 
-      preStart =
-        ''
-        mkdir -p ${cfg.dataDir};
-        mkdir -p ${cfg.logDir};
-
-        if [ "$(id -u)" = 0 ]; then
-          chown ${cfg.user}:${cfg.group} ${cfg.dataDir}
-          chown ${cfg.user}:${cfg.group} ${cfg.logDir}
-        fi
-        '';
-
       serviceConfig = {
-        PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
         ExecStart = "${cfg.package}/bin/hbase --config ${configDir} master start";

From 4a4d3a2e047ab744eb35c4440e42fa42ce6a3303 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 07:39:53 -0500
Subject: [PATCH 013/377] nixos/zeronet: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/zeronet.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index 611a51c74ce..f4988a90268 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -86,20 +86,17 @@ in with lib; {
       '';
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 750 zeronet zeronet - -"
+      "d '${cfg.logDir}' 750 zeronet zeronet - -"
+    ];
+
     systemd.services.zeronet = {
       description = "zeronet";
       after = [ "network.target" (optionalString cfg.tor "tor.service") ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        # Ensure folder exists or create it and permissions are correct
-        mkdir -p ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-        chmod 750 ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-        chown zeronet:zeronet ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-      '';
-
       serviceConfig = {
-        PermissionsStartOnly = true;
         PrivateTmp = "yes";
         User = "zeronet";
         Group = "zeronet";

From 0b7305e7830683300fdc9bd3e83000bc9fa2a27b Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 07:57:19 -0500
Subject: [PATCH 014/377] nixos/unifi: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/unifi.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index c82e0af2803..9057a1e12b3 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -146,6 +146,11 @@ in
         where = where;
       }) mountPoints;
 
+    systemd.tmpfiles.rules = [
+      "e '${stateDir}' 0700 unifi - - -"
+      "e '${stateDir}/data' 0700 unifi - - -"
+    ];
+
     systemd.services.unifi = {
       description = "UniFi controller daemon";
       wantedBy = [ "multi-user.target" ];
@@ -157,14 +162,9 @@ in
       environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib";
 
       preStart = ''
-        # Ensure privacy of state and data.
-        chown unifi "${stateDir}" "${stateDir}/data"
-        chmod 0700 "${stateDir}" "${stateDir}/data"
-
         # Create the volatile webapps
         rm -rf "${stateDir}/webapps"
         mkdir -p "${stateDir}/webapps"
-        chown unifi "${stateDir}/webapps"
         ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT"
       '';
 
@@ -177,7 +177,6 @@ in
         ExecStart = "${(removeSuffix "\n" cmd)} start";
         ExecStop = "${(removeSuffix "\n" cmd)} stop";
         User = "unifi";
-        PermissionsStartOnly = true;
         UMask = "0077";
         WorkingDirectory = "${stateDir}";
       };

From dd9598cf5489303f5d02adb00669bc75c179cef3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:16:35 -0500
Subject: [PATCH 015/377] nixos/teamspeak3: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/teamspeak3.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
index 9ea9c83e37c..fadb32dcd77 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -111,16 +111,15 @@ in
       gid = config.ids.gids.teamspeak;
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.logPath}' - ${user} ${group} - -"
+    ];
+
     systemd.services.teamspeak3-server = {
       description = "Teamspeak3 voice communication server daemon";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        mkdir -p ${cfg.logPath}
-        chown ${user}:${group} ${cfg.logPath}
-      '';
-
       serviceConfig = {
         ExecStart = ''
           ${ts3}/bin/ts3server \
@@ -135,7 +134,6 @@ in
         WorkingDirectory = cfg.dataDir;
         User = user;
         Group = group;
-        PermissionsStartOnly = true;
       };
     };
   };

From 307a99bb01ed30f5a3c690c0b1f5fc3204d269ce Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:26:36 -0500
Subject: [PATCH 016/377] nixos/squid: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/squid.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix
index b220c21b604..9d063b92aa1 100644
--- a/nixos/modules/services/networking/squid.nix
+++ b/nixos/modules/services/networking/squid.nix
@@ -159,11 +159,10 @@ in
       serviceConfig = {
         Type="forking";
         PIDFile="/run/squid.pid";
-        PermissionsStartOnly = true;
         ExecStart  = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}";
       };
     };
 
   };
 
-}
\ No newline at end of file
+}

From d33c64eec862abe88fd4fdce6177c48d6f195bf8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:34:02 -0500
Subject: [PATCH 017/377] nixos/slimserver: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/audio/slimserver.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 640403d2c97..8f94a2b4940 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -42,15 +42,17 @@ in {
 
   config = mkIf cfg.enable {
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - slimserver slimserver - -"
+    ];
+
     systemd.services.slimserver = {
       after = [ "network.target" ];
       description = "Slim Server for Logitech Squeezebox Players";
       wantedBy = [ "multi-user.target" ];
 
-      preStart = "mkdir -p ${cfg.dataDir} && chown -R slimserver:slimserver ${cfg.dataDir}";
       serviceConfig = {
         User = "slimserver";
-        PermissionsStartOnly = true;
         # Issue 40589: Disable broken image/video support (audio still works!)
         ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo";
       };

From cdcc50484812443b38f8dd23b7aa429b6da41b6a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:34:52 -0500
Subject: [PATCH 018/377] nixos/scollector: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/scollector.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index fbded746a5f..dc0899c7e68 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -116,7 +116,6 @@ in {
       path = [ pkgs.coreutils pkgs.iproute ];
 
       serviceConfig = {
-        PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
         ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

From 780ff9a4eb9c4017e65b3d847224d5fcc1997ddc Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:38:32 -0500
Subject: [PATCH 019/377] nixos/riemann-tools: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/riemann-tools.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index 4e8832dadc5..9c400a1e3e4 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -54,7 +54,6 @@ in {
       serviceConfig = {
         User = "riemanntools";
         ExecStart = "${healthLauncher}/bin/riemann-health";
-        PermissionsStartOnly = true;
       };
     };
 

From 46a5db08105f98cef5464dfb4f3318555958689e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 08:56:36 -0500
Subject: [PATCH 020/377] nixos/quassel: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/quassel.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index b223a48e055..b495b3948fb 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -104,6 +104,10 @@ in
         gid = config.ids.gids.quassel;
       }];
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${user} - - -"
+    ];
+
     systemd.services.quassel =
       { description = "Quassel IRC client daemon";
 
@@ -111,11 +115,6 @@ in
         after = [ "network.target" ] ++ optional config.services.postgresql.enable "postgresql.service"
                                      ++ optional config.services.mysql.enable "mysql.service";
 
-        preStart = ''
-          mkdir -p ${cfg.dataDir}
-          chown ${user} ${cfg.dataDir}
-        '';
-
         serviceConfig =
         {
           ExecStart = concatStringsSep " " ([
@@ -126,7 +125,6 @@ in
           ] ++ optional cfg.requireSSL "--require-ssl"
             ++ optional (cfg.certificateFile != null) "--ssl-cert=${cfg.certificateFile}");
           User = user;
-          PermissionsStartOnly = true;
         };
       };
 

From ff2fdc294eddaf4b75066b32e5a07978345b4e88 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 12:39:56 -0500
Subject: [PATCH 021/377] nixos/kapacitor: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/kapacitor.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
index a4bdfa8f805..9966ffd500e 100644
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -163,6 +163,10 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kapacitor ];
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.kapacitor = {
       description = "Kapacitor Real-Time Stream Processing Engine";
       wantedBy = [ "multi-user.target" ];
@@ -171,12 +175,7 @@ in
         ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";
         User = "kapacitor";
         Group = "kapacitor";
-        PermissionsStartOnly = true;
       };
-      preStart = ''
-        mkdir -p ${cfg.dataDir}
-        chown ${cfg.user}:${cfg.group} ${cfg.dataDir}
-      '';
     };
 
     users.users.kapacitor = {

From 2c350782ba394eb8b50586781d3fa28abc930db3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 12:52:36 -0500
Subject: [PATCH 022/377] nixos/alerta: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/alerta.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix
index 8f4258e26de..2a6afac119e 100644
--- a/nixos/modules/services/monitoring/alerta.nix
+++ b/nixos/modules/services/monitoring/alerta.nix
@@ -83,6 +83,10 @@ in
   };
 
   config = mkIf cfg.enable {
+    systemd.tmpfiles.rules = [
+      "d '${cfg.logDir}' - alerta alerta - -"
+    ];
+
     systemd.services.alerta = {
       description = "Alerta Monitoring System";
       wantedBy = [ "multi-user.target" ];
@@ -94,12 +98,7 @@ in
         ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
         User = "alerta";
         Group = "alerta";
-        PermissionsStartOnly = true;
       };
-      preStart = ''
-        mkdir -p ${cfg.logDir}
-        chown alerta:alerta ${cfg.logDir}
-      '';
     };
 
     environment.systemPackages = [ pkgs.python36Packages.alerta ];

From b6bfb874ecb52d7d3cadcd8c22edc3303ebd5a13 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 12:56:12 -0500
Subject: [PATCH 023/377] nixos/apache-kafka: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/misc/apache-kafka.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 363ac4411e1..9eeae955699 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -131,6 +131,8 @@ in {
       home = head cfg.logDirs;
     };
 
+    systemd.tmpfiles.rules = map (logDir: "d '${logDir} 0700 apache-kafka - - -") cfg.logDirs;
+
     systemd.services.apache-kafka = {
       description = "Apache Kafka Daemon";
       wantedBy = [ "multi-user.target" ];
@@ -145,15 +147,8 @@ in {
             ${serverConfig}
         '';
         User = "apache-kafka";
-        PermissionsStartOnly = true;
         SuccessExitStatus = "0 143";
       };
-      preStart = ''
-        mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs}
-        if [ "$(id -u)" = 0 ]; then
-           chown apache-kafka ${concatStringsSep " " cfg.logDirs};
-        fi
-      '';
     };
 
   };

From e85d03e52b05b4aae4c95f1941ea6e1880be55e4 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 13:02:10 -0500
Subject: [PATCH 024/377] nixos/aria2: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/aria2.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 98eb0086101..53829bf1886 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -102,22 +102,19 @@ in
 
     users.groups.aria2.gid = config.ids.gids.aria2;
 
+    systemd.tmpfiles.rules = [
+      "d '${homeDir}' 0770 aria2 aria2 - -"
+      "d '${config.services.aria2.downloadDir}' 0770 aria2 aria2 - -"
+    ];
+
     systemd.services.aria2 = {
       description = "aria2 Service";
       after = [ "local-fs.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        mkdir -m 0770 -p "${homeDir}"
-        chown aria2:aria2 "${homeDir}"
-        if [[ ! -d "${config.services.aria2.downloadDir}" ]]
-        then
-          mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
-          chown aria2:aria2 "${config.services.aria2.downloadDir}"
-        fi
         if [[ ! -e "${sessionFile}" ]]
         then
           touch "${sessionFile}"
-          chown aria2:aria2 "${sessionFile}"
         fi
         cp -f "${settingsFile}" "${settingsDir}/aria2.conf"
       '';
@@ -128,7 +125,6 @@ in
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = "aria2";
         Group = "aria2";
-        PermissionsStartOnly = true;
       };
     };
   };

From e734494a5971564bb7169afe43634da8493e32ee Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 13:04:19 -0500
Subject: [PATCH 025/377] nixos/autossh: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/autossh.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix
index 9ea17469870..a098a155e99 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixos/modules/services/networking/autossh.nix
@@ -99,7 +99,6 @@ in
 
               serviceConfig = {
                   User = "${s.user}";
-                  PermissionsStartOnly = true;
                   # AutoSSH may exit with 0 code if the SSH session was
                   # gracefully terminated by either local or remote side.
                   Restart = "on-success";

From 8ac5973610e39ff3bd1d8a94a375c036ac7eef8a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 13:05:44 -0500
Subject: [PATCH 026/377] nixos/boinc: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/computing/boinc/client.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 8abe3c5b8c9..7022751b3f0 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -105,19 +105,18 @@ in
         isSystemUser = true;
       };
 
+      systemd.tmpfiles.rules = [
+        "d '${cfg.dataDir}' - boinc - - -"
+      ];
+
       systemd.services.boinc = {
         description = "BOINC Client";
         after = ["network.target" "local-fs.target"];
         wantedBy = ["multi-user.target"];
-        preStart = ''
-          mkdir -p ${cfg.dataDir}
-          chown boinc ${cfg.dataDir}
-        '';
         script = ''
           ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
         '';
         serviceConfig = {
-          PermissionsStartOnly = true; # preStart must be run as root
           User = "boinc";
           Nice = 10;
         };

From 99f74c268bf17523d22b92e12f7488eaf2feb3be Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 15:30:57 -0500
Subject: [PATCH 027/377] nixos/confluence: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 .../services/web-apps/atlassian/confluence.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 15744d90cc7..cf163271d27 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -149,6 +149,17 @@ in
 
     users.groups."${cfg.group}" = {};
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.home}' - ${cfg.user} - - -"
+      "d /run/confluence - - - - -"
+
+      "L+ /run/confluence/home - - - - ${cfg.home}"
+      "L+ /run/confluence/logs - - - - ${cfg.home}/logs"
+      "L+ /run/confluence/temp - - - - ${cfg.home}/temp"
+      "L+ /run/confluence/work - - - - ${cfg.home}/work"
+      "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml"
+    ];
+
     systemd.services.confluence = {
       description = "Atlassian Confluence";
 
@@ -167,12 +178,6 @@ in
       preStart = ''
         mkdir -p ${cfg.home}/{logs,work,temp,deploy}
 
-        mkdir -p /run/confluence
-        ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence
-        ln -sf ${cfg.home} /run/confluence/home
-
-        chown ${cfg.user} ${cfg.home}
-
         sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
           -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \
@@ -184,7 +189,6 @@ in
         User = cfg.user;
         Group = cfg.group;
         PrivateTmp = true;
-        PermissionsStartOnly = true;
         ExecStart = "${pkg}/bin/start-confluence.sh -fg";
         ExecStop = "${pkg}/bin/stop-confluence.sh";
       };

From 204be045312a1167d81fee023d3b817c762cbd74 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 15:35:59 -0500
Subject: [PATCH 028/377] nixos/crowd: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 .../services/web-apps/atlassian/crowd.nix       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index c144b21bdaf..020ca8d89db 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -117,6 +117,16 @@ in
 
     users.groups."${cfg.group}" = {};
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"
+      "d /run/atlassian-crowd - - - - -"
+
+      "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database"
+      "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs"
+      "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work"
+      "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml"
+    ];
+
     systemd.services.atlassian-crowd = {
       description = "Atlassian Crowd";
 
@@ -136,12 +146,6 @@ in
         rm -rf ${cfg.home}/work
         mkdir -p ${cfg.home}/{logs,database,work}
 
-        mkdir -p /run/atlassian-crowd
-        ln -sf ${cfg.home}/{database,logs,work,server.xml} /run/atlassian-crowd
-
-        chown ${cfg.user}:${cfg.group} ${cfg.home}
-        chown ${cfg.user}:${cfg.group} ${cfg.home}/{logs,database,work}
-
         sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
           -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \
@@ -153,7 +157,6 @@ in
         User = cfg.user;
         Group = cfg.group;
         PrivateTmp = true;
-        PermissionsStartOnly = true;
         ExecStart = "${pkg}/start_crowd.sh -fg";
       };
     };

From 4775c595282ac0531ced5884f4485a1ae834446f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 16:01:23 -0500
Subject: [PATCH 029/377] nixos/dspam: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/mail/dspam.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 167b5aeccc8..72b8c4c08b9 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -113,19 +113,14 @@ in {
           Group = cfg.group;
           RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";
           RuntimeDirectoryMode = optional (cfg.domainSocket == defaultSock) "0750";
-          PermissionsStartOnly = true;
+          StateDirectory = "dspam";
+          StateDirectoryMode = "0750";
+          LogsDirectory = "dspam";
+          LogsDirectoryMode = "0750";
           # DSPAM segfaults on just about every error
           Restart = "on-abort";
           RestartSec = "1s";
         };
-
-        preStart = ''
-          mkdir -m750 -p /var/lib/dspam
-          chown -R "${cfg.user}:${cfg.group}" /var/lib/dspam
-
-          mkdir -m750 -p /var/log/dspam
-          chown -R "${cfg.user}:${cfg.group}" /var/log/dspam
-        '';
       };
     }
 

From 8034dac42fe97afe17f64d77d2b606b09384ddb3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 16:10:08 -0500
Subject: [PATCH 030/377] nixos/firebird: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/databases/firebird.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index cc81b440450..042c9841df5 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -95,6 +95,11 @@ in
 
     environment.systemPackages = [cfg.package];
 
+    systemd.tmpfiles.rules = [
+      "d '${dataDir}' 0700 ${cfg.user} - - -"
+      "d '${systemDir}' 0700 ${cfg.user} - - -"
+    ];
+
     systemd.services.firebird =
       { description = "Firebird Super-Server";
 
@@ -104,21 +109,16 @@ in
         # is a better way
         preStart =
           ''
-            mkdir -m 0700 -p \
-              "${dataDir}" \
-              "${systemDir}" \
-              /var/log/firebird
-
             if ! test -e "${systemDir}/security2.fdb"; then
                 cp ${firebird}/security2.fdb "${systemDir}"
             fi
 
-            chown -R ${cfg.user} "${dataDir}" "${systemDir}" /var/log/firebird
             chmod -R 700         "${dataDir}" "${systemDir}" /var/log/firebird
           '';
 
-        serviceConfig.PermissionsStartOnly = true; # preStart must be run as root
         serviceConfig.User = cfg.user;
+        serviceConfig.LogsDirectory = "firebird";
+        serviceConfig.LogsDirectoryMode = "0700";
         serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d'';
 
         # TODO think about shutdown

From 65f449fe333ae24d9ea39928be8d28694a52c106 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 16:23:57 -0500
Subject: [PATCH 031/377] nixos/graylog: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/logging/graylog.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 74a7b3c9b47..ee566825498 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -134,6 +134,10 @@ in
       };
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.messageJournalDir}' - ${cfg.user} - - -"
+    ];
+
     systemd.services.graylog = with pkgs; {
       description = "Graylog Server";
       wantedBy = [ "multi-user.target" ];
@@ -143,8 +147,6 @@ in
       };
       path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
       preStart = ''
-        mkdir -p /var/lib/graylog -m 755
-
         rm -rf /var/lib/graylog/plugins || true
         mkdir -p /var/lib/graylog/plugins -m 755
 
@@ -154,14 +156,10 @@ in
         for includedplugin in `ls ${cfg.package}/plugin/`; do
           ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true
         done
-        chown -R ${cfg.user} /var/lib/graylog
-
-        mkdir -p ${cfg.messageJournalDir} -m 755
-        chown -R ${cfg.user} ${cfg.messageJournalDir}
       '';
       serviceConfig = {
         User="${cfg.user}";
-        PermissionsStartOnly=true;
+        StateDirectory = "graylog";
         ExecStart = "${cfg.package}/bin/graylogctl run";
       };
     };

From 114bd801f478a6cd75ba3909fd31b04086296757 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 16:29:33 -0500
Subject: [PATCH 032/377] nixos/jira: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 .../services/web-apps/atlassian/jira.nix       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 0b3a5722d6c..b0019e77ac2 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -155,6 +155,17 @@ in
 
     users.groups."${cfg.group}" = {};
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.home}' - ${cfg.user} - - -"
+      "d /run/atlassian-jira - - - - -"
+
+      "L+ /run/atlassian-jira/home - - - - ${cfg.home}"
+      "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs"
+      "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work"
+      "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp"
+      "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml"
+    ];
+
     systemd.services.atlassian-jira = {
       description = "Atlassian JIRA";
 
@@ -174,12 +185,6 @@ in
       preStart = ''
         mkdir -p ${cfg.home}/{logs,work,temp,deploy}
 
-        mkdir -p /run/atlassian-jira
-        ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira
-        ln -sf ${cfg.home} /run/atlassian-jira/home
-
-        chown ${cfg.user} ${cfg.home}
-
         sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
           -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \
@@ -191,7 +196,6 @@ in
         User = cfg.user;
         Group = cfg.group;
         PrivateTmp = true;
-        PermissionsStartOnly = true;
         ExecStart = "${pkg}/bin/start-jira.sh -fg";
         ExecStop = "${pkg}/bin/stop-jira.sh";
       };

From fbe59432379249bc94e6bf7bafd925f4299596db Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 09:06:38 -0500
Subject: [PATCH 033/377] nixos/opendkim: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/mail/opendkim.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index 7855efb46c7..253823cbaf9 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -101,13 +101,16 @@ in {
 
     environment.systemPackages = [ pkgs.opendkim ];
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.opendkim = {
       description = "OpenDKIM signing and verification daemon";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
-        mkdir -p "${cfg.keyPath}"
         cd "${cfg.keyPath}"
         if ! test -f ${cfg.selector}.private; then
           ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key
@@ -116,7 +119,6 @@ in {
           cat ${cfg.selector}.txt
           echo "-------------------------------------------------------------"
         fi
-        chown ${cfg.user}:${cfg.group} ${cfg.selector}.private
       '';
 
       serviceConfig = {
@@ -124,7 +126,6 @@ in {
         User = cfg.user;
         Group = cfg.group;
         RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
-        PermissionsStartOnly = true;
       };
     };
 

From 12dec599058036f88f72ec553ee33a3df1f91c49 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 09:08:21 -0500
Subject: [PATCH 034/377] nixos/octoprint: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/misc/octoprint.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index baa7c3ade52..2e17f671a51 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -97,6 +97,10 @@ in
         gid = config.ids.gids.octoprint;
       });
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.octoprint = {
       description = "OctoPrint, web interface for 3D printers";
       wantedBy = [ "multi-user.target" ];
@@ -105,7 +109,6 @@ in
       environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ];
 
       preStart = ''
-        mkdir -p "${cfg.stateDir}"
         if [ -e "${cfg.stateDir}/config.yaml" ]; then
           ${pkgs.yaml-merge}/bin/yaml-merge "${cfg.stateDir}/config.yaml" "${cfgUpdate}" > "${cfg.stateDir}/config.yaml.tmp"
           mv "${cfg.stateDir}/config.yaml.tmp" "${cfg.stateDir}/config.yaml"
@@ -113,14 +116,12 @@ in
           cp "${cfgUpdate}" "${cfg.stateDir}/config.yaml"
           chmod 600 "${cfg.stateDir}/config.yaml"
         fi
-        chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}"
       '';
 
       serviceConfig = {
         ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}";
         User = cfg.user;
         Group = cfg.group;
-        PermissionsStartOnly = true;
       };
     };
 

From fff8b9bcaa353dd61ac258408cfe190096c4c45f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 09:23:26 -0500
Subject: [PATCH 035/377] nixos/netdata: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/monitoring/netdata.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index a49555cf677..12a0961c406 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -143,7 +143,6 @@ in {
         User = cfg.user;
         Group = cfg.group;
         Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";
-        PermissionsStartOnly = true;
         ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}";
         TimeoutStopSec = 60;
       };

From 89dae4b1aed2228960872e2ac23b6c0d23ba8fe7 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 24 Feb 2019 11:16:35 -0500
Subject: [PATCH 036/377] nixos/murmur: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/networking/murmur.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index a6e90feff7e..d91552a1887 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -257,13 +257,7 @@ in
         Restart   = "always";
         User      = "murmur";
         ExecStart = "${pkgs.murmur}/bin/murmurd -ini ${configFile}";
-        PermissionsStartOnly = true;
       };
-
-      preStart = ''
-        mkdir -p /var/log/murmur
-        chown -R murmur /var/log/murmur
-      '';
     };
   };
 }

From 1540a85458a65fbec09d9a2b84fa4ed6989930ab Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 18 Mar 2019 20:20:17 -0400
Subject: [PATCH 037/377] nixos/frab: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 nixos/modules/services/web-apps/frab.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index fb95e024817..e885dc69b3c 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -182,16 +182,16 @@ in
 
     users.groups = [ { name = cfg.group; } ];
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.statePath}/system/attachments' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.frab = {
       after = [ "network.target" "gitlab.service" ];
       wantedBy = [ "multi-user.target" ];
       environment = frabEnv;
 
       preStart = ''
-        mkdir -p ${cfg.statePath}/system/attachments
-        chown ${cfg.user}:${cfg.group} -R ${cfg.statePath}
-
-        mkdir /run/frab -p
         ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml
         ln -sf ${cfg.statePath}/system /run/frab/system
 
@@ -204,7 +204,6 @@ in
       '';
 
       serviceConfig = {
-        PermissionsStartOnly = true;
         PrivateTmp = true;
         PrivateDevices = true;
         Type = "simple";
@@ -213,6 +212,7 @@ in
         TimeoutSec = "300s";
         Restart = "on-failure";
         RestartSec = "10s";
+        RuntimeDirectory = "frab";
         WorkingDirectory = "${package}/share/frab";
         ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " +
           "--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}";

From de6e5ea8152b29c975096d7d4b7d0938874ee37a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 25 May 2019 18:30:50 -0400
Subject: [PATCH 038/377] nixos/foundationdb: replace deprecated usage of
 PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852

---
 .../services/databases/foundationdb.nix       | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 490c5e9d005..6182da5e7d6 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -359,6 +359,13 @@ in
         }
       ];
 
+    systemd.tmpfiles.rules = [
+      "d /etc/foundationdb 0755 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.logDir}' 0770 ${cfg.user} ${cfg.group} - -"
+      "F '${cfg.pidFile}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.foundationdb = {
       description             = "FoundationDB Service";
 
@@ -396,25 +403,12 @@ in
       path = [ pkg pkgs.coreutils ];
 
       preStart = ''
-        rm -f ${cfg.pidfile}   && \
-          touch ${cfg.pidfile} && \
-          chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile}
-
-        for x in "${cfg.logDir}" "${cfg.dataDir}"; do
-          [ ! -d "$x" ] && mkdir -m 0770 -vp "$x";
-          chown -R ${cfg.user}:${cfg.group} "$x";
-        done
-
-        [ ! -d /etc/foundationdb ] && \
-          mkdir -m 0775 -vp /etc/foundationdb && \
-          chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb"
-
         if [ ! -f /etc/foundationdb/fdb.cluster ]; then
             cf=/etc/foundationdb/fdb.cluster
             desc=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
             rand=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
             echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf
-            chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf
+            chmod 0664 $cf
             touch "${cfg.dataDir}/.first_startup"
         fi
       '';

From f6d2ebe313067f72696e1607dfc135bacffd10f4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 31 May 2019 22:15:17 -0400
Subject: [PATCH 039/377] Add .github/FUNDING.yml

---
 .github/FUNDING.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000000..bbaabf93c7a
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://nixos.org/nixos/foundation.html

From bc96146e75fb68dcc1d0e4f779e75fc99e4a05b7 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <abizjak.pro@gmail.com>
Date: Sat, 8 Jun 2019 20:20:31 +0200
Subject: [PATCH 040/377] vulkan-loader: Always include
 /run/opengl-driver(-32)/share in search path.

Even though FALLBACK_DATA_DIRS is set to include this, it only applies when XDG_DATA_DIRS is not defined, so the NixOS opengl.nix module still had to include these in the search path. Use a simple patch to force a default search path, consulted after all other search paths.

Note that FALLBACK_DATA_DIRS is no longer set, and the default (/usr/local/share:/usr/share) applies.
---
 .../libraries/vulkan-loader/default.nix       |  4 +-
 .../vulkan-loader/system-search-path.patch    | 45 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/vulkan-loader/system-search-path.patch

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 891ad373e02..a44e91e1bf5 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
+  patches = [ ./system-search-path.patch ];
+
   cmakeFlags = [
-    "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share"
+    "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share"
     "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
   ];
 
diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch
new file mode 100644
index 00000000000..26f83e6d534
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-loader/system-search-path.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ac5ce835..cbdb0ff56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,6 +88,12 @@ if(UNIX)
+             STRING
+             "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
+         )
++    set(
++        SYSTEM_SEARCH_PATH ""
++        CACHE
++            STRING
++            "Search path to always use, after all other search paths."
++    )
+ endif()
+ 
+ if(UNIX AND NOT APPLE) # i.e.: Linux
+@@ -184,6 +190,7 @@ if(UNIX)
+     add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
+     add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
+     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
++    add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}")
+ 
+     # Make sure /etc is searched by the loader
+     if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
+diff --git a/loader/loader.c b/loader/loader.c
+index 0d3b5a947..abe357004 100644
+--- a/loader/loader.c
++++ b/loader/loader.c
+@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
+                 search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size);
+                 search_path_size += DetermineDataFilePathSize(home_root, rel_size);
+             }
++            search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size);
+ #endif
+         }
+     }
+@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
+                 CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr);
+                 CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr);
+             }
++            CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr);
+         }
+ 
+         // Remove the last path separator

From 320e8ab5d7ee8a04011cb19a7ac15cdd2525d59a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 14:49:35 +0300
Subject: [PATCH 041/377] nixos/phpfpm: do not run anything as root

---
 .../services/web-servers/phpfpm/default.nix   | 55 +++++++++++--------
 .../web-servers/phpfpm/pool-options.nix       | 17 +++++-
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index ffafbc5e92f..b4a1a55687d 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -6,8 +6,6 @@ let
   cfg = config.services.phpfpm;
   enabled = cfg.poolConfigs != {} || cfg.pools != {};
 
-  stateDir = "/run/phpfpm";
-
   poolConfigs =
     (mapAttrs mapPoolConfig cfg.poolConfigs) //
     (mapAttrs mapPool cfg.pools);
@@ -21,8 +19,9 @@ let
   mapPool = n: p: {
     phpPackage = p.phpPackage;
     phpOptions = p.phpOptions;
+    userPool = p.user;
+    groupPool = p.group;
     config = ''
-      listen = ${p.listen}
       ${p.extraConfig}
     '';
   };
@@ -34,6 +33,7 @@ let
     ${cfg.extraConfig}
 
     [${pool}]
+    listen = /run/phpfpm-${pool}/${cfg.pools.${pool}.socketName}.sock
     ${conf}
   '';
 
@@ -49,7 +49,6 @@ let
   '';
 
 in {
-
   options = {
     services.phpfpm = {
       extraConfig = mkOption {
@@ -114,21 +113,23 @@ in {
         }));
         default = {};
         example = literalExample ''
-         {
-           mypool = {
-             listen = "/path/to/unix/socket";
-             phpPackage = pkgs.php;
-             extraConfig = '''
-               user = nobody
-               pm = dynamic
-               pm.max_children = 75
-               pm.start_servers = 10
-               pm.min_spare_servers = 5
-               pm.max_spare_servers = 20
-               pm.max_requests = 500
-             ''';
-           }
-         }'';
+          {
+            mypool = {
+              socketName = "example";
+              phpPackage = pkgs.php;
+              user = "phpfpm";
+              group = "phpfpm";
+              extraConfig = '''
+                pm = dynamic
+                pm.max_children = 75
+                pm.start_servers = 10
+                pm.min_spare_servers = 5
+                pm.max_spare_servers = 20
+                pm.max_requests = 500
+              ''';
+            }
+          }
+        '';
         description = ''
           PHP-FPM pools. If no pools or poolConfigs are defined, the PHP-FPM
           service is disabled.
@@ -154,9 +155,6 @@ in {
         after = [ "network.target" ];
         wantedBy = [ "phpfpm.target" ];
         partOf = [ "phpfpm.target" ];
-        preStart = ''
-          mkdir -p ${stateDir}
-        '';
         serviceConfig = let
           cfgFile = fpmCfgFile pool poolConfig.config;
           iniFile = phpIni poolConfig;
@@ -166,10 +164,19 @@ in {
           ProtectSystem = "full";
           ProtectHome = true;
           # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work
-          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+          RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
           Type = "notify";
-          ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}";
+          ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y '${cfgFile}' -c '${iniFile}'";
           ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
+          # User and group
+          User = "${poolConfig.userPool}";
+          Group = "${poolConfig.groupPool}";
+          # Runtime directory and mode
+          RuntimeDirectory = "phpfpm-${pool}";
+          RuntimeDirectoryMode = "0750";
+          # Capabilities
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" "CAP_CHOWN" "CAP_SYS_RESOURCE" ];
+          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" "CAP_CHOWN" "CAP_SYS_RESOURCE" ];
         };
       }
    );
diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix
index d9ad7eff71f..2c3ed090e1c 100644
--- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix
+++ b/nixos/modules/services/web-servers/phpfpm/pool-options.nix
@@ -8,9 +8,9 @@ with lib; {
 
   options = {
 
-    listen = mkOption {
+    socketName = mkOption {
       type = types.str;
-      example = "/path/to/unix/socket";
+      example = "php-fpm";
       description = ''
         The address on which to accept FastCGI requests.
       '';
@@ -34,10 +34,21 @@ with lib; {
       '';
     };
 
+    user = mkOption {
+      type = types.string;
+      default = "phpfpm";
+      description = "User account under which phpfpm runs.";
+    };
+
+    group = mkOption {
+      type = types.string;
+      default = "phpfpm";
+      description = "Group account under which phpfpm runs.";
+    };
+
     extraConfig = mkOption {
       type = types.lines;
       example = ''
-        user = nobody
         pm = dynamic
         pm.max_children = 75
         pm.start_servers = 10

From 59a33f25e54a05b0be4f772073b7dec660e94c04 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 15:22:36 +0300
Subject: [PATCH 042/377] nixos/roundcube: fix work with phpfpm-rootless mode

---
 nixos/modules/services/mail/roundcube.nix | 42 +++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index e8b2e11bf72..12837f7efe7 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -105,7 +105,7 @@ in
             extraConfig = ''
               location ~* \.php$ {
                 fastcgi_split_path_info ^(.+\.php)(/.+)$;
-                fastcgi_pass unix:/run/phpfpm/roundcube;
+                fastcgi_pass unix:/run/phpfpm-roundcube/roundcube.sock;
                 include ${pkgs.nginx}/conf/fastcgi_params;
                 include ${pkgs.nginx}/conf/fastcgi.conf;
               }
@@ -119,24 +119,28 @@ in
       enable = true;
     };
 
-    services.phpfpm.poolConfigs.roundcube = ''
-      listen = /run/phpfpm/roundcube
-      listen.owner = nginx
-      listen.group = nginx
-      listen.mode = 0660
-      user = nginx
-      pm = dynamic
-      pm.max_children = 75
-      pm.start_servers = 2
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 20
-      pm.max_requests = 500
-      php_admin_value[error_log] = 'stderr'
-      php_admin_flag[log_errors] = on
-      php_admin_value[post_max_size] = 25M
-      php_admin_value[upload_max_filesize] = 25M
-      catch_workers_output = yes
-    '';
+    services.phpfpm.pools.roundcube = {
+      socketName = "roundcube";
+      phpPackage = pkgs.php;
+      user = "${config.services.nginx.user}";
+      group = "${config.services.nginx.group}";
+      extraConfig = ''
+        listen.owner = ${config.services.nginx.user}
+        listen.group = ${config.services.nginx.group}
+        listen.mode = 0600
+        pm = dynamic
+        pm.max_children = 75
+        pm.start_servers = 2
+        pm.min_spare_servers = 1
+        pm.max_spare_servers = 20
+        pm.max_requests = 500
+        php_admin_value[error_log] = 'stderr'
+        php_admin_flag[log_errors] = on
+        php_admin_value[post_max_size] = 25M
+        php_admin_value[upload_max_filesize] = 25M
+        catch_workers_output = yes
+      '';
+    };
     systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
 
     systemd.services.roundcube-setup = let

From d49857a885e86ed1b910b8bc550b9a4e5ded783a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 15:44:18 +0300
Subject: [PATCH 043/377] nixos/limesurvey: fix work with phpfpm-rootless mode

---
 nixos/modules/services/web-apps/limesurvey.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index f9e12e3642e..d68812dd45c 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -202,13 +202,13 @@ in
     };
 
     services.phpfpm.pools.limesurvey = {
+      socketName = "limesurvey";
       phpPackage = php;
-      listen = "/run/phpfpm/limesurvey.sock";
+      user = "${user}";
+      group = "${group}";
       extraConfig = ''
         listen.owner = ${config.services.httpd.user};
         listen.group = ${config.services.httpd.group};
-        user = ${user};
-        group = ${group};
 
         env[LIMESURVEY_CONFIG] = ${limesurveyConfig}
 
@@ -241,7 +241,7 @@ in
             <Directory "${pkg}/share/limesurvey">
               <FilesMatch "\.php$">
                 <If "-f %{REQUEST_FILENAME}">
-                  SetHandler "proxy:unix:/run/phpfpm/limesurvey.sock|fcgi://localhost/"
+                  SetHandler "proxy:unix:/run/phpfpm-limesurvey/limesurvey.sock|fcgi://localhost/"
                 </If>
               </FilesMatch>
 

From 2172419101c08b68652c37b38eb03b453fb252fa Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 16:36:20 +0300
Subject: [PATCH 044/377] nixos/icingaweb2: fix work with phpfpm-rootless mode

---
 .../web-apps/icingaweb2/icingaweb2.nix        | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 910e1d937bf..e83270fda5c 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }: with lib; let
   cfg = config.services.icingaweb2;
   poolName = "icingaweb2";
-  phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";
 
   defaultConfig = {
     global = {
@@ -162,19 +161,23 @@ in {
   };
 
   config = mkIf cfg.enable {
-    services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
-      "${poolName}" = ''
-        listen = "${phpfpmSocketName}"
-        listen.owner = nginx
-        listen.group = nginx
-        listen.mode = 0600
-        user = icingaweb2
-        pm = dynamic
-        pm.max_children = 75
-        pm.start_servers = 2
-        pm.min_spare_servers = 2
-        pm.max_spare_servers = 10
-      '';
+    services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
+      "${poolName}" = {
+        socketName = "${poolName}";
+        phpPackage = pkgs.php;
+        user = "icingaweb2";
+        group = "icingaweb2";
+        extraConfig = ''
+          listen.owner = ${config.services.nginx.user}
+          listen.group = ${config.services.nginx.group}
+          listen.mode = 0600
+          pm = dynamic
+          pm.max_children = 75
+          pm.start_servers = 2
+          pm.min_spare_servers = 2
+          pm.max_spare_servers = 10
+        '';
+      };
     };
 
     services.phpfpm.phpOptions = mkIf (cfg.pool == "${poolName}")
@@ -206,7 +209,7 @@ in {
             include ${config.services.nginx.package}/conf/fastcgi.conf;
             try_files $uri =404;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass unix:${phpfpmSocketName};
+            fastcgi_pass unix:/run/phpfpm-${poolName}/${poolName}.sock;
             fastcgi_param SCRIPT_FILENAME ${pkgs.icingaweb2}/public/index.php;
           '';
         };
@@ -239,5 +242,8 @@ in {
       group = "icingaweb2";
       isSystemUser = true;
     };
+    users.users.nginx = {
+      extraGroups = [ "icingaweb2" ];
+    };
   };
 }

From 5d3805487a8b6172ce04604f2dc39902e4fcb286 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 16:38:07 +0300
Subject: [PATCH 045/377] nixos/zoneminder: fix work with phpfpm-rootless mode

---
 nixos/modules/services/misc/zoneminder.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 9c555e8031c..82d49cdedec 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -19,7 +19,7 @@ let
 
   useCustomDir = cfg.storageDir != null;
 
-  socket = "/run/phpfpm/${dirName}.sock";
+  socket = "/run/phpfpm-zoneminder/zoneminder.sock";
 
   zms = "/cgi-bin/zms";
 
@@ -278,7 +278,10 @@ in {
 
       phpfpm = lib.mkIf useNginx {
         pools.zoneminder = {
-          listen = socket;
+          socketName = "zoneminder";
+          phpPackage = pkgs.php;
+          user = "${user}";
+          group = "${group}";
           phpOptions = ''
             date.timezone = "${config.time.timeZone}"
 
@@ -286,9 +289,6 @@ in {
             "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}
           '';
           extraConfig = ''
-            user = ${user}
-            group = ${group}
-
             listen.owner = ${user}
             listen.group = ${group}
             listen.mode = 0660

From 08dae69741a91e12a7a1910ee1339b48cf346611 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 17:43:09 +0300
Subject: [PATCH 046/377] nixos/matomo: fix work with phpfpm-rootless mode

---
 nixos/modules/services/web-apps/matomo.nix | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index 14aca45a342..e058c18ad87 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -4,13 +4,14 @@ let
   cfg = config.services.matomo;
 
   user = "matomo";
+  group = "matomo";
   dataDir = "/var/lib/${user}";
   deprecatedDataDir = "/var/lib/piwik";
 
   pool = user;
-  # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,
+  # it's not possible to use /run/phpfpm-${pool}/${pool}.sock because /run/phpfpm/ is root:root 0770,
   # and therefore is not accessible by the web server.
-  phpSocket = "/run/phpfpm-${pool}.sock";
+  phpSocket = "/run/phpfpm-${pool}/${pool}.sock";
   phpExecutionUnit = "phpfpm-${pool}";
   databaseService = "mysql.service";
 
@@ -137,9 +138,12 @@ in {
       isSystemUser = true;
       createHome = true;
       home = dataDir;
-      group  = user;
+      group  = "${group}";
     };
-    users.groups.${user} = {};
+    users.users.${config.services.nginx.user} = {
+      extraGroups = [ "${group}" ];
+    };
+    users.groups.${group} = {};
 
     systemd.services.matomo-setup-update = {
       # everything needs to set up and up to date before Matomo php files are executed
@@ -169,7 +173,7 @@ in {
           echo "Migrating from ${deprecatedDataDir} to ${dataDir}"
           mv -T ${deprecatedDataDir} ${dataDir}
         fi
-        chown -R ${user}:${user} ${dataDir}
+        chown -R ${user}:${group} ${dataDir}
         chmod -R ug+rwX,o-rwx ${dataDir}
         '';
       script = ''
@@ -225,22 +229,26 @@ in {
       serviceConfig.UMask = "0007";
     };
 
-    services.phpfpm.poolConfigs = let
+    services.phpfpm.pools = let
       # workaround for when both are null and need to generate a string,
       # which is illegal, but as assertions apparently are being triggered *after* config generation,
       # we have to avoid already throwing errors at this previous stage.
       socketOwner = if (cfg.nginx != null) then config.services.nginx.user
       else if (cfg.webServerUser != null) then cfg.webServerUser else "";
     in {
-      ${pool} = ''
-        listen = "${phpSocket}"
-        listen.owner = ${socketOwner}
-        listen.group = root
-        listen.mode = 0600
-        user = ${user}
-        env[PIWIK_USER_PATH] = ${dataDir}
-        ${cfg.phpfpmProcessManagerConfig}
-      '';
+      ${pool} = {
+        socketName = "${pool}";
+        phpPackage = pkgs.php;
+        user = "${user}";
+        group = "${group}";
+        extraConfig = ''
+          listen.owner = ${socketOwner}
+          listen.group = ${group}
+          listen.mode = 0600
+          env[PIWIK_USER_PATH] = ${dataDir}
+          ${cfg.phpfpmProcessManagerConfig}
+        '';
+      };
     };
 
 

From 5b1a4730bc65ff7c5310bc885f9dbd0c28182fee Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 18:13:04 +0300
Subject: [PATCH 047/377] nixos/nextcloud: fix work with phpfpm-rootless mode

---
 nixos/modules/services/web-apps/nextcloud.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index bb39a5d1d71..35be5cb9712 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -394,13 +394,14 @@ in {
                 phpOptions)));
         in {
           phpOptions = phpOptionsExtensions;
+          socketName = "nextcloud";
           phpPackage = phpPackage;
-          listen = "/run/phpfpm/nextcloud";
+          user = "nextcloud";
+          group = "${config.services.nginx.group}";
           extraConfig = ''
-            listen.owner = nginx
-            listen.group = nginx
-            user = nextcloud
-            group = nginx
+            listen.owner = ${config.services.nginx.user}
+            listen.group = ${config.services.nginx.group}
+            listen.mode = 0600
             ${cfg.poolConfig}
             env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config
             env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin
@@ -466,7 +467,7 @@ in {
                   fastcgi_param HTTPS ${if cfg.https then "on" else "off"};
                   fastcgi_param modHeadersAvailable true;
                   fastcgi_param front_controller_active true;
-                  fastcgi_pass unix:/run/phpfpm/nextcloud;
+                  fastcgi_pass unix:/run/phpfpm-nextcloud/nextcloud.sock;
                   fastcgi_intercept_errors on;
                   fastcgi_request_buffering off;
                   fastcgi_read_timeout 120s;

From d44f759b5588e5c9350958329409c7ab598740e5 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 18:40:11 +0300
Subject: [PATCH 048/377] nixos/restya-board: fix work with phpfpm-rootless
 mode

---
 .../modules/services/web-apps/restya-board.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 2e5e0ea6622..d4c99d6c44b 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -13,7 +13,7 @@ let
   runDir = "/run/restya-board";
 
   poolName = "restya-board";
-  phpfpmSocketName = "/run/phpfpm/${poolName}.sock";
+  phpfpmSocketName = "/run/phpfpm-${poolName}/${poolName}.sock";
 
 in
 
@@ -178,9 +178,12 @@ in
 
   config = mkIf cfg.enable {
 
-    services.phpfpm.poolConfigs = {
+    services.phpfpm.pools = {
       "${poolName}" = {
-        listen = phpfpmSocketName;
+        socketName = "${poolName}";
+        phpPackage = pkgs.php;
+        user = "${cfg.user}";
+        group = "${cfg.group}";
         phpOptions = ''
           date.timezone = "CET"
 
@@ -192,11 +195,9 @@ in
           ''}
         '';
         extraConfig = ''
-          listen.owner = nginx
-          listen.group = nginx
+          listen.owner = ${config.services.nginx.user}
+          listen.group = ${config.services.nginx.group}
           listen.mode = 0600
-          user = ${cfg.user}
-          group = ${cfg.group}
           pm = dynamic
           pm.max_children = 75
           pm.start_servers = 10
@@ -365,6 +366,9 @@ in
       home = runDir;
       group  = "restya-board";
     };
+    users.users.nginx = {
+      extraGroups = [ "restya-board" ];
+     };
     users.groups.restya-board = {};
 
     services.postgresql.enable = mkIf (cfg.database.host == null) true;

From 6290bf906773f3e45df27c4ffe0f199e1cd7798a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 19:09:31 +0300
Subject: [PATCH 049/377] nixos/selfoss: fix work with phpfpm-rootless mode

---
 nixos/modules/services/web-apps/selfoss.nix | 45 ++++++++++++---------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index cd0f743a5fb..6c5942d1e17 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -3,9 +3,9 @@ with lib;
 let
   cfg = config.services.selfoss;
 
-  poolName = "selfoss_pool";
-  phpfpmSocketName = "/run/phpfpm/${poolName}.sock";
-
+  poolName = "selfoss";
+  phpfpmSocketName = "/run/phpfpm-${poolName}/${poolName}.sock";
+  group = "${cfg.user}";
   dataDir = "/var/lib/selfoss";
 
   selfoss-config =
@@ -116,21 +116,25 @@ in
 
   config = mkIf cfg.enable {
 
-    services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
-      "${poolName}" = ''
-        listen = "${phpfpmSocketName}";
-        listen.owner = nginx
-        listen.group = nginx
-        listen.mode = 0600
-        user = nginx
-        pm = dynamic
-        pm.max_children = 75
-        pm.start_servers = 10
-        pm.min_spare_servers = 5
-        pm.max_spare_servers = 20
-        pm.max_requests = 500
-        catch_workers_output = 1
-      '';
+    services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
+      "${poolName}" = {
+        socketName = "${poolName}";
+        phpPackage = pkgs.php;
+        user = "${cfg.user}";
+        group = "${group}";
+        extraConfig = ''
+          listen.owner = ${config.services.nginx.user}
+          listen.group = ${config.services.nginx.group}
+          listen.mode = 0600
+          pm = dynamic
+          pm.max_children = 75
+          pm.start_servers = 10
+          pm.min_spare_servers = 5
+          pm.max_spare_servers = 20
+          pm.max_requests = 500
+          catch_workers_output = 1
+        '';
+      };
     };
 
     systemd.services.selfoss-config = {
@@ -145,7 +149,7 @@ in
         # Create the files
         cp -r "${pkgs.selfoss}/"* "${dataDir}"
         ln -sf "${selfoss-config}" "${dataDir}/config.ini"
-        chown -R "${cfg.user}" "${dataDir}"
+        chown -R "${cfg.user}":"${group}" "${dataDir}"
         chmod -R 755 "${dataDir}"
       '';
       wantedBy = [ "multi-user.target" ];
@@ -162,5 +166,8 @@ in
 
     };
 
+    users.users.nginx = {
+      extraGroups = [ "${group}" ];
+     };
   };
 }

From 4dcbdbc41657865d02cc4227bb808187d70eb6a3 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 16 Jun 2019 12:49:39 +0100
Subject: [PATCH 050/377] pythonPackages.django_taggit: fix build, enable tests

---
 .../python-modules/django_taggit/default.nix        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
index e1e9506635a..569df7f7246 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -1,7 +1,11 @@
 { stdenv
 , buildPythonPackage
+, python
 , fetchPypi
 , pythonOlder
+, django
+, mock
+, isort
 }:
 
 buildPythonPackage rec {
@@ -14,7 +18,14 @@ buildPythonPackage rec {
     sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce";
   };
 
-  doCheck = false;
+  propagatedBuildInputs = [ isort django ];
+
+  checkInputs = [ mock ];
+  checkPhase = ''
+    # prove we're running tests against installed package, not build dir
+    rm -r taggit
+    ${python.interpreter} -m django test --settings=tests.settings
+  '';
 
   meta = with stdenv.lib; {
     description = "django-taggit is a reusable Django application for simple tagging";

From 831fcf8801864b299b73ab73213dbcee9cdb14e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 16 Jun 2019 19:00:04 -0700
Subject: [PATCH 051/377] heimdal: 7.6.0 -> 7.7.0

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

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 197911be0d4..d2283f5c1d5 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -7,13 +7,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "heimdal-${version}";
-  version = "7.6.0";
+  version = "7.7.0";
 
   src = fetchFromGitHub {
     owner = "heimdal";
     repo = "heimdal";
     rev = "heimdal-${version}";
-    sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp";
+    sha256 = "099qn9b8q20invvi5r8d8q9rnwpcm3nr89hx5rj7gj2ah2x5vgxs";
   };
 
   outputs = [ "out" "dev" "man" "info" ];

From 6093c04b67a82d4de611a139f9f7d6c7ec1dd7e8 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 15 Jun 2019 19:37:41 +0300
Subject: [PATCH 052/377] nixos/tt-rss: fix work with phpfpm-rootless mode

---
 nixos/modules/services/web-apps/tt-rss.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 08297c7275a..6afb193bb37 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -513,12 +513,14 @@ let
 
     services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
       "${poolName}" = {
-        listen = "/var/run/phpfpm/${poolName}.sock";
+        socketName = "${poolName}";
+        phpPackage = pkgs.php;
+        user = "${config.services.nginx.user}";
+        group = "${config.services.nginx.group}";
         extraConfig = ''
-          listen.owner = nginx
-          listen.group = nginx
+          listen.owner = ${config.services.nginx.user}
+          listen.group = ${config.services.nginx.group}
           listen.mode = 0600
-          user = ${cfg.user}
           pm = dynamic
           pm.max_children = 75
           pm.start_servers = 10
@@ -544,7 +546,7 @@ let
           locations."~ \.php$" = {
             extraConfig = ''
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
-              fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.listen};
+              fastcgi_pass unix:/run/phpfpm-${poolName}/${poolName}.sock;
               fastcgi_index index.php;
             '';
           };

From eee87b460ea9a5a9e122dcc313fa20b9962872a5 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 16 Jun 2019 12:31:09 +0300
Subject: [PATCH 053/377] nixos/phpfpm: remove options
 services.phpfpm.poolConfigs

---
 nixos/modules/rename.nix                      |   6 +
 .../services/web-servers/phpfpm/default.nix   | 133 +++++++++---------
 .../web-servers/phpfpm/pool-options.nix       |  68 ---------
 3 files changed, 73 insertions(+), 134 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/phpfpm/pool-options.nix

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a424e86038e..7792c1eca9f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -240,6 +240,12 @@ with lib;
     # binfmt
     (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
 
+    # PHP-FPM
+    (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")
+    (mkRemovedOptionModule [ "services" "phpfpm" "phpPackage" ] "Use services.phpfpm.pools.<name>.phpPackage instead.")
+    (mkRemovedOptionModule [ "services" "phpfpm" "phpOptions" ] "Use services.phpfpm.pools.<name>.phpOptions instead.")
+    (mkRenamedOptionModule [ "services" "phpfpm" "extraConfig" ] [ "services" "phpfpm" "globalExtraConfig" ])
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index b4a1a55687d..e424080ab1f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -4,37 +4,26 @@ with lib;
 
 let
   cfg = config.services.phpfpm;
-  enabled = cfg.poolConfigs != {} || cfg.pools != {};
+  enabled = cfg.pools != {};
 
-  poolConfigs =
-    (mapAttrs mapPoolConfig cfg.poolConfigs) //
-    (mapAttrs mapPool cfg.pools);
-
-  mapPoolConfig = n: p: {
-    phpPackage = cfg.phpPackage;
-    phpOptions = cfg.phpOptions;
-    config = p;
-  };
+  poolConfigs = (mapAttrs mapPool cfg.pools);
 
   mapPool = n: p: {
     phpPackage = p.phpPackage;
     phpOptions = p.phpOptions;
     userPool = p.user;
     groupPool = p.group;
-    config = ''
-      ${p.extraConfig}
-    '';
   };
 
   fpmCfgFile = pool: conf: pkgs.writeText "phpfpm-${pool}.conf" ''
     [global]
     error_log = syslog
     daemonize = no
-    ${cfg.extraConfig}
+    ${cfg.globalExtraConfig}
 
     [${pool}]
     listen = /run/phpfpm-${pool}/${cfg.pools.${pool}.socketName}.sock
-    ${conf}
+    ${cfg.pools.${pool}.extraConfig}
   '';
 
   phpIni = pool: pkgs.runCommand "php.ini" {
@@ -51,67 +40,79 @@ let
 in {
   options = {
     services.phpfpm = {
-      extraConfig = mkOption {
+      globalExtraConfig = mkOption {
         type = types.lines;
         default = "";
         description = ''
-          Extra configuration that should be put in the global section of
+          Global extra configuration that should be put in the global section of
           the PHP-FPM configuration file. Do not specify the options
           <literal>error_log</literal> or
-          <literal>daemonize</literal> here, since they are generated by
-          NixOS.
-        '';
-      };
-
-      phpPackage = mkOption {
-        type = types.package;
-        default = pkgs.php;
-        defaultText = "pkgs.php";
-        description = ''
-          The PHP package to use for running the PHP-FPM service.
-        '';
-      };
-
-      phpOptions = mkOption {
-        type = types.lines;
-        default = "";
-        example =
-          ''
-            date.timezone = "CET"
-          '';
-        description =
-          "Options appended to the PHP configuration file <filename>php.ini</filename>.";
-      };
-
-      poolConfigs = mkOption {
-        default = {};
-        type = types.attrsOf types.lines;
-        example = literalExample ''
-          { mypool = '''
-              listen = /run/phpfpm/mypool
-              user = nobody
-              pm = dynamic
-              pm.max_children = 75
-              pm.start_servers = 10
-              pm.min_spare_servers = 5
-              pm.max_spare_servers = 20
-              pm.max_requests = 500
-            ''';
-          }
-        '';
-        description = ''
-          A mapping between PHP-FPM pool names and their configurations.
-          See the documentation on <literal>php-fpm.conf</literal> for
-          details on configuration directives. If no pools are defined,
-          the phpfpm service is disabled.
+          <literal>daemonize</literal> here, since they are generated by NixOS.
         '';
       };
 
       pools = mkOption {
-        type = types.attrsOf (types.submodule (import ./pool-options.nix {
-          inherit lib config;
-        }));
         default = {};
+        type = types.attrsOf (types.submodule {
+          options = {
+            socketName = mkOption {
+              type = types.str;
+              example = "php-fpm";
+              description = ''
+                The address on which to accept FastCGI requests.
+              '';
+            };
+
+            phpPackage = mkOption {
+              type = types.package;
+              default = fpmCfg.phpPackage;
+              defaultText = "config.services.phpfpm.phpPackage";
+              description = ''
+                The PHP package to use for running this PHP-FPM pool.
+              '';
+            };
+
+            phpOptions = mkOption {
+              type = types.lines;
+              default = fpmCfg.phpOptions;
+              defaultText = "config.services.phpfpm.phpOptions";
+              description = ''
+                "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."
+              '';
+            };
+
+            user = mkOption {
+              type = types.string;
+              default = "phpfpm";
+              description = "User account under which phpfpm runs.";
+            };
+
+            group = mkOption {
+              type = types.string;
+              default = "phpfpm";
+              description = "Group account under which phpfpm runs.";
+            };
+
+            extraConfig = mkOption {
+              type = types.lines;
+              example = ''
+                pm = dynamic
+                pm.max_children = 75
+                pm.start_servers = 10
+                pm.min_spare_servers = 5
+                pm.max_spare_servers = 20
+                pm.max_requests = 500
+              '';
+
+              description = ''
+                Extra lines that go into the pool configuration.
+                See the documentation on <literal>php-fpm.conf</literal> for
+                details on configuration directives.
+              '';
+            };
+          };
+        });
+
         example = literalExample ''
           {
             mypool = {
diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix
deleted file mode 100644
index 2c3ed090e1c..00000000000
--- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, config }:
-
-let
-  fpmCfg = config.services.phpfpm;
-in
-
-with lib; {
-
-  options = {
-
-    socketName = mkOption {
-      type = types.str;
-      example = "php-fpm";
-      description = ''
-        The address on which to accept FastCGI requests.
-      '';
-    };
-
-    phpPackage = mkOption {
-      type = types.package;
-      default = fpmCfg.phpPackage;
-      defaultText = "config.services.phpfpm.phpPackage";
-      description = ''
-        The PHP package to use for running this PHP-FPM pool.
-      '';
-    };
-
-    phpOptions = mkOption {
-      type = types.lines;
-      default = fpmCfg.phpOptions;
-      defaultText = "config.services.phpfpm.phpOptions";
-      description = ''
-        "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."
-      '';
-    };
-
-    user = mkOption {
-      type = types.string;
-      default = "phpfpm";
-      description = "User account under which phpfpm runs.";
-    };
-
-    group = mkOption {
-      type = types.string;
-      default = "phpfpm";
-      description = "Group account under which phpfpm runs.";
-    };
-
-    extraConfig = mkOption {
-      type = types.lines;
-      example = ''
-        pm = dynamic
-        pm.max_children = 75
-        pm.start_servers = 10
-        pm.min_spare_servers = 5
-        pm.max_spare_servers = 20
-        pm.max_requests = 500
-      '';
-
-      description = ''
-        Extra lines that go into the pool configuration.
-        See the documentation on <literal>php-fpm.conf</literal> for
-        details on configuration directives.
-      '';
-    };
-  };
-}
-

From e955576b43e56cb30a6ccbebef0f7fa25effe80e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Jun 2019 06:09:16 +0000
Subject: [PATCH 054/377] merkaartor: fix build

Merkaartor is not compatible with current version of Qt5 (5.12)
but is known to work with version 5.9
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fecf53c3f4d..78a47b668be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18986,7 +18986,7 @@ in
 
   mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
 
-  merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
+  merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { };
 
   meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
 

From 462c43881a4a74932c403005b501d7243c6a131b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Jun 2019 16:00:42 +0000
Subject: [PATCH 055/377] merkaartor: fix run-time loading of Qt 5 platform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this patch, running merkaartor fails with the following message:
“This application failed to start because it could not find or load the Qt
platform plugin "xcb"”.
---
 pkgs/applications/misc/merkaartor/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 70a6efb90dd..0833464f2c2 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj
+{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
 , qtbase, qtsvg, qtwebkit }:
 
 stdenv.mkDerivation rec {
@@ -12,12 +12,17 @@ stdenv.mkDerivation rec {
     sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
   };
 
-  nativeBuildInputs = [ qmake pkgconfig ];
+  nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
 
   buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    wrapProgram $out/bin/merkaartor \
+      --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
+  '';
+
   meta = with stdenv.lib; {
     description = "OpenStreetMap editor";
     homepage = http://merkaartor.be/;

From 2a3488ac9df4c77c25c4ab42d85d75d8884b20b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Jun 2019 11:13:54 +0200
Subject: [PATCH 056/377] Revert "sqlite: enable parallel builds"

Revert due to reported issues
https://github.com/NixOS/nixpkgs/issues/63157

This reverts commit 93982349c8ed4ddc88e62cb970ac6fdd331ee766.
---
 pkgs/development/libraries/sqlite/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index b2351a32fa6..ea1c38ea476 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  pname = "sqlite";
+  name = "sqlite-${version}";
   version = "3.28.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
     sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/"
   '';
 
-  enableParallelBuilding = true;
   doCheck = false; # fails to link against tcl
 
   meta = {

From ca3c1a3835add8b906fb225b99cc144900f2af03 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 18 Jun 2019 10:13:25 -0700
Subject: [PATCH 057/377] github-release: 0.6.2 -> 0.7.2

---
 .../tools/github/github-release/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix
index b80ddff054a..be268fa6de3 100644
--- a/pkgs/development/tools/github/github-release/default.nix
+++ b/pkgs/development/tools/github/github-release/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, system, fetchurl }:
 
 let
-  linuxPredicate = stdenv.hostPlatform.system == "x86_64-linux";
-  bsdPredicate = stdenv.hostPlatform.system == "x86_64-freebsd";
-  darwinPredicate = stdenv.hostPlatform.system == "x86_64-darwin";
+  linuxPredicate = system == "x86_64-linux";
+  bsdPredicate = system == "x86_64-freebsd";
+  darwinPredicate = system == "x86_64-darwin";
   metadata = assert linuxPredicate || bsdPredicate || darwinPredicate;
     if linuxPredicate then
       { arch = "linux-amd64";
-        sha256 = "0b3h0d0qsrjx99kcd2cf71xijh44wm5rpm2sr54snh3f7macj2p1";
+        sha256 = "0p0qj911nmmdj0r7wx3363gid8g4bm3my6mj3d6s4mwgh9lfisiz";
         archiveBinaryPath = "linux/amd64"; }
     else if bsdPredicate then
       { arch = "freebsd-amd64";
-        sha256 = "1yydm4ndkh80phiwk41kcf6pizvwrfhsfk3jwrrgr42wsnkkgj0q";
+        sha256 = "0g618y9n39j11l1cbhyhwlbl2gv5a2a122c1dps3m2wmv7yzq5hk";
         archiveBinaryPath = "freebsd/amd64"; }
     else
       { arch = "darwin-amd64";
-        sha256 = "1dj74cf1ahihia2dr9ii9ky0cpmywn42z2iq1vkbrrcggjvyrnlf";
+        sha256 = "0l623fgnsix0y3f960bwx3dgnrqaxs21w5652kvaaal7dhnlgmwj";
         archiveBinaryPath = "darwin/amd64"; };
 in stdenv.mkDerivation rec {
   shortname = "github-release";
   name = "${shortname}-${version}";
-  version = "0.6.2";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2";

From c932a4de6d56ceb1706d7d66e3f7fc8e1ccb3dd7 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Tue, 11 Jun 2019 19:45:56 -0600
Subject: [PATCH 058/377] drm_info: init at 2.1.0

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

diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix
new file mode 100644
index 00000000000..a97526f8538
--- /dev/null
+++ b/pkgs/development/tools/drm_info/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, libdrm, json_c
+, meson, ninja, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  pname = "drm_info";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "ascent12";
+    repo = "drm_info";
+    rev = "v${version}";
+    sha256 = "1i5bzkgqxjjw34jpj1x1gfdl3sz0sl6i7s787a6mjjslsc5g422l";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = [ libdrm json_c ];
+
+  meta = with stdenv.lib; {
+    description = "Small utility to dump info about DRM devices.";
+    homepage = "https://github.com/ascent12/drm_info";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tadeokondrak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7134db9c6f2..ac187542076 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9131,6 +9131,8 @@ in
 
   drip = callPackage ../development/tools/drip { };
 
+  drm_info = callPackage ../development/tools/drm_info { };
+
   drush = callPackage ../development/tools/misc/drush { };
 
   editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };

From b8b71aaaf97a63a1b6bf286402faf234affe6bf7 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 17 Jun 2019 11:59:30 +1000
Subject: [PATCH 059/377] octopus: init 0.6.3-beta

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

diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix
new file mode 100644
index 00000000000..0a2074a06e9
--- /dev/null
+++ b/pkgs/applications/science/biology/octopus/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}:
+
+stdenv.mkDerivation rec {
+  pname = "octopus";
+  version = "0.6.3-beta";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "luntergroup";
+    repo = "octopus";
+    rev = "v${version}";
+    sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ boost gmp htslib zlib lzma ];
+
+  postInstall = ''
+    mkdir $out/bin
+    mv $out/octopus $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Bayesian haplotype-based mutation calling";
+    license = licenses.mit;
+    homepage = "https://github.com/luntergroup/octopus";
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.x86_64;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 233b47bb3d2..f8bd8f07b9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22382,6 +22382,8 @@ in
 
   niftyseg = callPackage ../applications/science/biology/niftyseg { };
 
+  octopus-caller = callPackage ../applications/science/biology/octopus { };
+
   paml = callPackage ../applications/science/biology/paml { };
 
   picard-tools = callPackage ../applications/science/biology/picard-tools { };

From 15879c318e4218283c0e90b4d73aa43b92640463 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 19 Jun 2019 13:06:56 -0400
Subject: [PATCH 060/377] vagrant: Don't patch salt provisioner's shebang

The script is intended to run on remote systems, not on the local
system. The shebang **has** to work where nix and the current store does
not exist.
---
 pkgs/development/tools/vagrant/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 2d4bae560bd..7b47cf0aa08 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -84,6 +84,13 @@ in buildRubyGem rec {
     fi
   '';
 
+  # `patchShebangsAuto` patches this one script which is intended to run
+  # on foreign systems.
+  postFixup = ''
+    sed -i -e '1c#!/bin/sh -' \
+      $out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh
+  '';
+
   passthru = {
     inherit ruby deps;
   };

From b28a4b7495ece61a6521a18bb59cecff5fc6eaef Mon Sep 17 00:00:00 2001
From: Ari Becker <ari@coralogix.com>
Date: Thu, 20 Jun 2019 14:03:42 +0300
Subject: [PATCH 061/377] kops: 1.11.1->1.12.1

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index a521f394ebf..96f3354023c 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.11.1";
+  version = "1.12.1";
 
   goPackagePath = "k8s.io/kops";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj";
+    sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y";
   };
 
   buildInputs = [go-bindata];

From 4cdbc771fd42442893cdfbd8b09892ece37d822c Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Thu, 20 Jun 2019 23:20:02 +1000
Subject: [PATCH 062/377] luaPackages.bit32: Tiny patch to fix a
 LuaJIT-incompatible declaration

---
 pkgs/development/lua-modules/bit32.patch   | 14 ++++++++++++++
 pkgs/development/lua-modules/overrides.nix | 10 ++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/lua-modules/bit32.patch

diff --git a/pkgs/development/lua-modules/bit32.patch b/pkgs/development/lua-modules/bit32.patch
new file mode 100644
index 00000000000..544c4d42398
--- /dev/null
+++ b/pkgs/development/lua-modules/bit32.patch
@@ -0,0 +1,14 @@
+diff -Naur lua-compat-5.2/c-api/compat-5.2.h lua-compat-5.2-patched/c-api/compat-5.2.h
+--- lua-compat-5.2/c-api/compat-5.2.h	2015-02-19 09:23:42.000000000 +1100
++++ lua-compat-5.2-patched/c-api/compat-5.2.h	2019-06-17 17:58:13.585361793 +1000
+@@ -146,8 +146,10 @@
+ #define lua_pushglobaltable(L) \
+   lua_pushvalue(L, LUA_GLOBALSINDEX)
+ 
++#if !defined(luaL_newlib)
+ #define luaL_newlib(L, l) \
+   (lua_newtable((L)),luaL_setfuncs((L), (l), 0))
++#endif
+ 
+ void luaL_checkversion (lua_State *L);
+ 
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 1967668b1a7..1ce2dc809e5 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -6,10 +6,12 @@ with super;
   #### manual fixes for generated packages
   ##########################################3
   bit32 = super.bit32.override({
-    disabled = !isLua51;
-    # Theoretically works with luajit, but it does redefine at least one Lua
-    # 5.2 function that Luajit 2.1 provides, see:
-    # https://github.com/LuaJIT/LuaJIT/issues/325
+    # Small patch in order to no longer redefine a Lua 5.2 function that Luajit
+    # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for
+    # more
+    patches = [
+      ./bit32.patch
+    ];
   });
 
   busted = super.busted.override({

From 514415deded21962c3fa99ceb796b894e44517ef Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 20 Jun 2019 17:15:27 +0200
Subject: [PATCH 063/377] dafny: 2.1.0 -> 2.3.0

---
 pkgs/top-level/dotnet-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ea4a0962a43..1740b327809 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -305,14 +305,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Boogie = buildDotnetPackage rec {
     baseName = "Boogie";
-    version = "2018-05-28";
+    version = "2019-06-20";
     name = "${baseName}-unstable-${version}";
 
     src = fetchFromGitHub {
       owner = "boogie-org";
       repo = "boogie";
-      rev = "fc97aac639505f46cda7904dae95c9557716d037";
-      sha256 = "1hjksc5sapw1shxjwg0swja5afman8i15wnv5b6rzkqd4mg8y6nz";
+      rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e";
+      sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2";
     };
 
     # emulate `nuget restore Source/Boogie.sln`
@@ -359,11 +359,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Dafny = buildDotnetPackage rec {
     baseName = "Dafny";
-    version = "2.1.0";
+    version = "2.3.0";
 
     src = fetchurl {
       url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz";
-      sha256 = "1iyhy0zpi6wvqif7826anzgdipgsy5bk775ds9qqwfw27j7x6fy5";
+      sha256 = "0s6ihx32kda7400lvdrq60l46c11nki8b6kalir2g4ic508f6ypa";
     };
 
     postPatch = ''

From 28563ef5cb835898a6f2d69eea8d2c315dfb8258 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 2 Jan 2019 21:35:58 +0800
Subject: [PATCH 064/377] libvirtd (nixos): support bridging for user sessions

---
 nixos/modules/virtualisation/libvirtd.nix | 104 +++++++++++++---------
 1 file changed, 64 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index f4d7af1664a..394b4ce5656 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -23,14 +23,16 @@ let
     ''}
     ${cfg.qemuVerbatimConfig}
   '';
+  dirName = "libvirt";
+  subDirs = list: [ dirName ] ++ map (e: "${dirName}/${e}") list;
 
 in {
 
   ###### interface
 
-  options = {
+  options.virtualisation.libvirtd = {
 
-    virtualisation.libvirtd.enable = mkOption {
+    enable = mkOption {
       type = types.bool;
       default = false;
       description = ''
@@ -41,7 +43,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.qemuPackage = mkOption {
+    qemuPackage = mkOption {
       type = types.package;
       default = pkgs.qemu;
       description = ''
@@ -51,7 +53,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.extraConfig = mkOption {
+    extraConfig = mkOption {
       type = types.lines;
       default = "";
       description = ''
@@ -60,7 +62,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.qemuRunAsRoot = mkOption {
+    qemuRunAsRoot = mkOption {
       type = types.bool;
       default = true;
       description = ''
@@ -72,7 +74,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.qemuVerbatimConfig = mkOption {
+    qemuVerbatimConfig = mkOption {
       type = types.lines;
       default = ''
         namespaces = []
@@ -84,7 +86,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.qemuOvmf = mkOption {
+    qemuOvmf = mkOption {
       type = types.bool;
       default = true;
       description = ''
@@ -93,7 +95,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.extraOptions = mkOption {
+    extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--verbose" ];
@@ -102,7 +104,7 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.onShutdown = mkOption {
+    onShutdown = mkOption {
       type = types.enum ["shutdown" "suspend" ];
       default = "suspend";
       description = ''
@@ -113,6 +115,14 @@ in {
       '';
     };
 
+    allowedBridges = mkOption {
+      type = types.listOf types.str;
+      default = [ "virbr0" ];
+      description = ''
+        List of bridge devices that can be used by qemu:///session
+      '';
+    };
+
   };
 
 
@@ -120,7 +130,12 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];
+    environment = {
+      # this file is expected in /etc/qemu and not sysconfdir (/var/lib)
+      etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e:
+        "allow ${e}") cfg.allowedBridges;
+      systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];
+    };
 
     boot.kernelModules = [ "tun" ];
 
@@ -134,30 +149,15 @@ in {
       group = "qemu-libvirtd";
     };
 
+    security.wrappers.qemu-bridge-helper = {
+      source = "/run/${dirName}/nix-helpers/qemu-bridge-helper";
+    };
+
     systemd.packages = [ pkgs.libvirt ];
 
-    systemd.services.libvirtd = {
-      description = "Libvirt Virtual Machine Management Daemon";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "systemd-udev-settle.service" ]
-              ++ optional vswitch.enable "vswitchd.service";
-
-      environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
-
-      path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
-             ++ optional vswitch.enable vswitch.package;
-
-      preStart = ''
-        mkdir -p /var/log/libvirt/qemu -m 755
-        rm -f /var/run/libvirtd.pid
-
-        mkdir -p /var/lib/libvirt
-        mkdir -p /var/lib/libvirt/dnsmasq
-
-        chmod 755 /var/lib/libvirt
-        chmod 755 /var/lib/libvirt/dnsmasq
-
+    systemd.services.libvirtd-config = {
+      description = "Libvirt Virtual Machine Management Daemon - configuration";
+      script = ''
         # Copy default libvirt network config .xml files to /var/lib
         # Files modified by the user will not be overwritten
         for i in $(cd ${pkgs.libvirt}/var/lib && echo \
@@ -169,21 +169,45 @@ in {
         done
 
         # Copy generated qemu config to libvirt directory
-        cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
+        cp -f ${qemuConfigFile} /var/lib/${dirName}/qemu.conf
 
         # stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs
-        mkdir -p /run/libvirt/nix-emulators
         for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do
-          ln -s --force "$emulator" /run/libvirt/nix-emulators/
+          ln -s --force "$emulator" /run/${dirName}/nix-emulators/
+        done
+
+        for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do
+          ln -s --force ${cfg.qemuPackage}/$helper /run/${dirName}/nix-helpers/
         done
 
         ${optionalString cfg.qemuOvmf ''
-            mkdir -p /run/libvirt/nix-ovmf
-            ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/
-            ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/
+          ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/
         ''}
       '';
 
+      serviceConfig = {
+        Type = "oneshot";
+        RuntimeDirectoryPreserve = "yes";
+        LogsDirectory = subDirs [ "qemu" ];
+        RuntimeDirectory = subDirs [ "nix-emulators" "nix-helpers" "nix-ovmf" ];
+        StateDirectory = subDirs [ "dnsmasq" ];
+      };
+    };
+
+    systemd.services.libvirtd = {
+      description = "Libvirt Virtual Machine Management Daemon";
+
+      wantedBy = [ "multi-user.target" ];
+      requires = [ "libvirtd-config.service" ];
+      after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
+              ++ optional vswitch.enable "vswitchd.service";
+
+      environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
+
+      path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
+             ++ optional vswitch.enable vswitch.package;
+
       serviceConfig = {
         Type = "notify";
         KillMode = "process"; # when stopping, leave the VMs alone
@@ -203,7 +227,7 @@ in {
     systemd.sockets.virtlogd = {
       description = "Virtual machine log manager socket";
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "/run/libvirt/virtlogd-sock" ];
+      listenStreams = [ "/run/${dirName}/virtlogd-sock" ];
     };
 
     systemd.services.virtlogd = {
@@ -215,7 +239,7 @@ in {
     systemd.sockets.virtlockd = {
       description = "Virtual machine lock manager socket";
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "/run/libvirt/virtlockd-sock" ];
+      listenStreams = [ "/run/${dirName}/virtlockd-sock" ];
     };
 
     systemd.services.virtlockd = {

From 463bd416f0d27a6916f9319f76c5758de1068561 Mon Sep 17 00:00:00 2001
From: Steve Elliott <1699155+Steell@users.noreply.github.com>
Date: Fri, 21 Jun 2019 14:59:42 -0400
Subject: [PATCH 065/377] Add maintainer @Steell

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 79c844ce747..30ee3d9fdbd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4831,6 +4831,11 @@
     github = "severen";
     name = "Severen Redwood";
   };
+  steell = {
+    email = "steve@steellworks.com";
+    github = "Steell";
+    name = "Steve Elliott";
+  };
   stephenmw = {
     email = "stephen@q5comm.com";
     github = "stephenmw";

From 1ee7d5f9367557cf875e6e26043f27a1e5a3c554 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 22 Jun 2019 16:19:22 +0300
Subject: [PATCH 066/377] zola: 0.7.0 -> 0.8.0

---
 pkgs/applications/misc/zola/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index f945da61274..48f5b216ea1 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = pname;
     rev = "v${version}";
-    sha256 = "02lr1n3gf0agj8x451ndyvv16lq7rccazp4nz9zy0pzwxwrlwhra";
+    sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5";
   };
 
-  cargoSha256 = "003dhh41fh337k3djibpj6hyd16xprbgws3lbp7x37p4lx7qlnfy";
+  cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];

From d1621653504aed01b3a6e1c3530ad320cba8d814 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sat, 22 Jun 2019 22:41:59 +0200
Subject: [PATCH 067/377] mosdepth: 0.2.3 -> 0.2.6

---
 .../science/biology/mosdepth/default.nix             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 3cd83a5cdd2..1bdb31616e4 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -4,26 +4,26 @@ let
   hts-nim = fetchFromGitHub {
     owner = "brentp";
     repo = "hts-nim";
-    rev = "v0.2.5";
-    sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb";
+    rev = "v0.2.14";
+    sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3";
   };
 
   docopt = fetchFromGitHub {
     owner = "docopt";
     repo = "docopt.nim";
-    rev = "v0.6.5";
-    sha256 = "0yx79m4jkdcazwlky55nwf39zj5kdhymrrdrjq29mahiwx83x5zr";
+    rev = "v0.6.7";
+    sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";
   };
 
 in stdenv.mkDerivation rec {
   name = "mosdepth-${version}";
-  version = "0.2.3";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "brentp";
     repo = "mosdepth";
     rev = "v${version}";
-    sha256 = "1b9frrwhcvay3alhn0d02jccc2qlbij1732hzq9nhwnr4kvsvxx7";
+    sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk";
   };
 
   buildInputs = [ nim ];

From b0b64b3927f33040f52cb3c8318b5d4be4d1cbde Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sat, 22 Jun 2019 22:42:17 +0200
Subject: [PATCH 068/377]  nim: 0.19.4 -> 0.20.0

- link sqlite (needed for the the stdlib sqlite module)
- update nodejs to 11.x
- use default phase order (fixes linker errors during test phase)
- substitution in ./test/async/tioselectors.nim not needed anymore
- two more tests need to be disabled
- LD=$CC workaround not needed anymore
- disable unsupported tests on aarch64
- trigger pre and post hooks
- use checkInputs instead of nativeBuildInputs
- don't override patchPhase
---
 pkgs/development/compilers/nim/default.nix | 80 ++++++++++++++--------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index aaf45ac36f6..77d8710cdf9 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,14 +1,15 @@
 # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
 
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline,
+  boehmgc, sfml, tzdata, coreutils, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.19.4";
+  version = "0.20.0";
 
   src = fetchurl {
     url = "https://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl";
+    sha256 = "144sd7icg2p6qsrr29jdnl11hr34daxq4h16ywwrayz866w7kx2i";
   };
 
   doCheck = !stdenv.isDarwin;
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
     "-lpcre"
     "-lreadline"
     "-lgc"
+    "-lsqlite3"
   ];
 
   # 1. nodejs is only needed for tests
@@ -27,19 +29,21 @@ stdenv.mkDerivation rec {
   #    used for bootstrapping, but koch insists on moving the nim compiler around
   #    as part of building it, so it cannot be read-only
 
+  checkInputs = [
+    nodejs-slim-11_x tzdata coreutils
+  ];
+
   nativeBuildInputs = [
-    makeWrapper nodejs-slim-10_x tzdata coreutils
+    makeWrapper
   ];
 
   buildInputs = [
-    openssl pcre readline boehmgc sfml
+    openssl pcre readline boehmgc sfml sqlite
   ];
 
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];
-
   buildPhase = ''
-    # use $CC to trigger the linker since calling ld in build.sh causes an error
-    LD=$CC
+    runHook preBuild
+
     # build.sh wants to write to $HOME/.cache
     HOME=$TMPDIR
     sh build.sh
@@ -48,35 +52,55 @@ stdenv.mkDerivation rec {
                  -d:useGnuReadline \
                  ${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"}
     ./koch tools -d:release
+
+    runHook postBuild
+  '';
+
+  prePatch =
+    let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
+        disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
+        disableCompile = ''sed -i -e 's/^/#/' '';
+    in ''
+      substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
+      substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+
+      # reported upstream: https://github.com/nim-lang/Nim/issues/11435
+      ${disableTest} ./tests/misc/tstrace.nim
+
+      # runs out of memory on a machine with 8GB RAM
+      ${disableTest} ./tests/system/t7894.nim
+
+      # requires network access (not available in the build container)
+      ${disableTest} ./tests/stdlib/thttpclient.nim
+    '' + lib.optionalString stdenv.isAarch64 ''
+      # supposedly broken on aarch64
+      ${disableStdLibTest} ./lib/pure/stats.nim
+
+      # reported upstream: https://github.com/nim-lang/Nim/issues/11463
+      ${disableCompile} ./lib/nimhcr.nim
+      ${disableTest} ./tests/dll/nimhcr_unit.nim
+      ${disableTest} ./tests/dll/nimhcr_integration.nim
+    '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    ./koch tests --nim:bin/nim all
+
+    runHook postCheck
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dt $out/bin bin/* koch
     ./koch install $out
     mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
     mv $out/nim/*     $out/     && rmdir $out/nim
     wrapProgram $out/bin/nim \
       --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
-  '';
 
-  patchPhase =
-    let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
-        disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
-    in ''
-      substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
-      substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
-      substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
-
-      # disable tests requiring network access (not available in the build container)
-      ${disableTest} ./tests/stdlib/thttpclient.nim
-    '' + lib.optionalString stdenv.isAarch64 ''
-      # disable test supposedly broken on aarch64
-      ${disableStdLibTest} ./lib/pure/stats.nim
-    '';
-
-  checkPhase = ''
-    PATH=$PATH:$out/bin
-    ./koch tests
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {

From 98deb873545deae4f475c3f54451cda0693c29e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sun, 23 Jun 2019 21:33:14 +0200
Subject: [PATCH 069/377] hostapd: Add noscan mode.

Applies OpenWRT's noscan patch to hostapd and the relevant option to
the hostapd module.

This noscan patch adds a new `noscan` option allowing us to create
some overlapping BSSs in HT40+/- mode.

Note: this option is disabled by default, we leave this up to the end
user whether it should be enabled or not.

Not being able to create those overlapping BSSs is basically
preventing us to use 802.11n in any urban area where chances to
overlap with another SSID are extremely high.

The patch we are using is a courtesy of the openwrt team and is
applied to the defaul hostapd package in both OpenWRT and Archlinux.
---
 nixos/modules/services/networking/hostapd.nix | 13 +++++++++++--
 pkgs/os-specific/linux/hostapd/default.nix    | 10 ++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 7add48308f8..a3407888496 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -30,10 +30,11 @@ let
     ctrl_interface=/run/hostapd
     ctrl_interface_group=${cfg.group}
 
-    ${if cfg.wpa then ''
+    ${optionalString cfg.wpa ''
       wpa=2
       wpa_passphrase=${cfg.wpaPassphrase}
-      '' else ""}
+    ''}
+    ${optionalString cfg.noScan "noscan=1"}
 
     ${cfg.extraConfig}
   '' ;
@@ -69,6 +70,14 @@ in
         '';
       };
 
+      noScan = mkOption {
+        default = false;
+        description = ''
+          Do not scan for overlapping BSSs in HT40+/- mode.
+          Caution: turning this on will violate regulatory requirements!
+        '';
+      };
+
       driver = mkOption {
         default = "nl80211";
         example = "hostapd";
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 73174779c8c..1ec98cb9c51 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,7 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
+let noScanPatch = fetchurl {
+      url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
+      sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
+  };
+in stdenv.mkDerivation rec {
   name = "hostapd-${version}";
   version = "2.8";
 
@@ -13,6 +17,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 
+  patches = [ noScanPatch ];
+
   outputs = [ "out" "man" ];
 
   extraConfig = ''
@@ -66,7 +72,7 @@ stdenv.mkDerivation rec {
     repositories.git = git://w1.fi/hostap.git;
     description = "A user space daemon for access point and authentication servers";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ phreedom ];
+    maintainers = with maintainers; [ phreedom ninjatrappeur ];
     platforms = platforms.linux;
   };
 }

From 5121f8d1e6a82e949563111843c1f577a9ecf9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sun, 23 Jun 2019 21:30:51 +0200
Subject: [PATCH 070/377] hostapd: starting hostapd systemd service at boot.

---
 nixos/modules/services/networking/hostapd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index a3407888496..54a5bed2563 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -171,6 +171,7 @@ in
         after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
         bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
         requiredBy = [ "network-link-${cfg.interface}.service" ];
+        wantedBy = [ "multi-user.target" ];
 
         serviceConfig =
           { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";

From 4099a9ad3866f1624a5b0a3d419b66ff11494b83 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Jun 2019 10:16:02 +0200
Subject: [PATCH 071/377] libressl: add openssl license

LibreSSL is also licensed under the OpenSSL license. See:

https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/lib/libssl/LICENSE?rev=1.12&content-type=text/plain
---
 pkgs/development/libraries/libressl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index fb4b1ac54a9..d710c41a97c 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -39,7 +39,7 @@ let
     meta = with lib; {
       description = "Free TLS/SSL implementation";
       homepage    = "https://www.libressl.org";
-      license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ];
+      license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice fpletz globin ];
     };

From 7e38a64709d026209cf5b02c654454aeffe7a506 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 24 Jun 2019 09:53:38 +0100
Subject: [PATCH 072/377] nixos/lidarr: allow specifying package

This commit allows users of `services.lidarr` to specify the package
that is used with `services.lidarr.package`.
---
 nixos/modules/services/misc/lidarr.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix
index f466402abfc..92108ec5508 100644
--- a/nixos/modules/services/misc/lidarr.nix
+++ b/nixos/modules/services/misc/lidarr.nix
@@ -9,6 +9,13 @@ in
   options = {
     services.lidarr = {
       enable = mkEnableOption "Lidarr";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.lidarr;
+        defaultText = "pkgs.lidarr";
+        description = "The Lidarr package to use";
+      };
     };
   };
 
@@ -22,7 +29,7 @@ in
         Type = "simple";
         User = "lidarr";
         Group = "lidarr";
-        ExecStart = "${pkgs.lidarr}/bin/Lidarr";
+        ExecStart = "${cfg.package}/bin/Lidarr";
         Restart = "on-failure";
 
         StateDirectory = "lidarr";

From 333de5d0ff00faf0f29c97b4b245bfdd38b939fe Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 24 Jun 2019 18:33:35 -0500
Subject: [PATCH 073/377] postgresqlPackages.timescaledb: 1.3.1 -> 1.3.2

---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 7fa128baabc..d77a4129dd3 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx";
+    sha256 = "117az52h8isi15p47r5d6k5y80ng9vj3x8ljq39iavgr364q716c";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];

From f0d7610c14419aea874614cf395867e8b6b940d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 25 Jun 2019 08:55:54 -0300
Subject: [PATCH 074/377] matcha: 2019_05_09 -> 2019-06-22

---
 pkgs/data/themes/matcha/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 31d4a068908..5a43511d532 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matcha-${version}";
-  version = "2019_05_09";
+  version = "2019-06-22";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "matcha";
-    rev = version;
-    sha256 = "0xnv89appivrnbppyjqaa35pls120mkz253p2lblyxzbvi5kgn73";
+    rev = "f42df7a3219d7fbacb7be1b2e0e416d74339865e";
+    sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";
   };
 
   buildInputs = [ gdk_pixbuf librsvg ];

From 725e2793dd1c3e57e46d1a282d6d623c285bb95f Mon Sep 17 00:00:00 2001
From: Steve Elliott <1699155+Steell@users.noreply.github.com>
Date: Fri, 21 Jun 2019 14:58:20 -0400
Subject: [PATCH 075/377] roon-server: init at 100600401

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/audio/roon-server.nix | 49 +++++++++++++++
 pkgs/servers/roon-server/default.nix         | 65 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 4 files changed, 117 insertions(+)
 create mode 100644 nixos/modules/services/audio/roon-server.nix
 create mode 100644 pkgs/servers/roon-server/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 50e3078d977..ea072aa885e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -190,6 +190,7 @@
   ./services/audio/liquidsoap.nix
   ./services/audio/mpd.nix
   ./services/audio/mopidy.nix
+  ./services/audio/roon-server.nix
   ./services/audio/slimserver.nix
   ./services/audio/snapserver.nix
   ./services/audio/squeezelite.nix
diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix
new file mode 100644
index 00000000000..9562ad1b164
--- /dev/null
+++ b/nixos/modules/services/audio/roon-server.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  name = "roon-server";
+  cfg = config.services.roon-server;
+in {
+  options = {
+    services.roon-server = {
+      enable = mkEnableOption "Roon Server";
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open ports in the firewall for the server.
+
+          UDP: 9003
+          TCP: 9100 - 9200
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.roon-server = {
+      after = [ "network.target" ];
+      description = "Roon Server";
+      wantedBy = [ "multi-user.target" ];
+
+      environment.ROON_DATAROOT = "/var/lib/${name}";
+
+      serviceConfig = {
+        ExecStart = "${pkgs.roon-server}/opt/start.sh";
+        LimitNOFILE = 8192;
+        DynamicUser = true;
+        SupplementaryGroups = "audio";
+        StateDirectory = name;
+      };
+    };
+    
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPortRanges = [
+        { from = 9100; to = 9200; }
+      ];
+      allowedUDPPorts = [ 9003 ];
+    };
+  };
+}
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
new file mode 100644
index 00000000000..64b212eb49f
--- /dev/null
+++ b/pkgs/servers/roon-server/default.nix
@@ -0,0 +1,65 @@
+{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg, libav, mono, stdenv }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "roon-server";
+  version = "100600401";
+
+  src = fetchurl {
+    url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2";
+    sha256 = "121mmdh35q4bpgsqhcps6a6q1f4ld9v4hq9gp181bf2n779pk8sh";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    # Check script
+    sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg libav ]}' check.sh
+    sed -i '/check_ulimit$/d' check.sh
+
+    # Start script
+    sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg libav ]}' start.sh
+
+    # Debug logging
+    sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance
+
+    # Binaries
+    sed -i '/# boost ulimit/,+2 d' Appliance/RAATServer
+    sed -i '/# boost ulimit/,+2 d' Appliance/RoonAppliance
+    sed -i '/# boost ulimit/,+2 d' Server/RoonServer
+    sed -i '/ln -sf/ d' Appliance/RAATServer
+    sed -i '/ln -sf/ d' Appliance/RoonAppliance
+    sed -i '/ln -sf/ d' Server/RoonServer
+    mkdir -p $out/opt
+    mv * $out/opt
+    ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonServer
+    ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonAppliance
+    ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RAATServer
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${alsaLib}/lib" \
+      $out/opt/RoonMono/bin/mono-sgen
+
+    # Checkers
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${alsaLib}/lib" \
+      $out/opt/Appliance/check_alsa
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/opt/Appliance/check_bincompat
+  '';
+
+  meta = {
+    description = "The music player for music lovers.";
+    homepage    = https://roonlabs.com;
+    license     = licenses.unfree;
+    maintainers = with maintainers; [ steell ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fca009a4338..65b5c686878 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14715,6 +14715,8 @@ in
     };
   };
 
+  roon-server = callPackage ../servers/roon-server { };
+
   s6 = skawarePackages.s6;
 
   s6-rc = skawarePackages.s6-rc;

From 3fc7e97d5cb1047d42cbe5dba6e40407b4ab6c38 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 25 Jun 2019 17:28:41 +0200
Subject: [PATCH 076/377] wxwidgets 3.1: add default libGLSupported, fixes eval

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

diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 60d026e9beb..cee967ef2aa 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, pkgconfig
 , gtk2, gtk3, libXinerama, libSM, libXxf86vm
 , xorgproto, gstreamer, gst-plugins-base, GConf, setfile
-, libGLSupported
+, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported, libGLU ? null, libGL ? null
 , compat28 ? false, compat30 ? true, unicode ? true
 , withGtk2 ? true

From 74ff20fae74034326211116bc71347f1a740614c Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 21 Jun 2019 11:36:02 -0400
Subject: [PATCH 077/377] nixos/zoneminder: fix some issues with
 database.createLocally option

---
 nixos/modules/services/misc/zoneminder.nix | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 9c555e8031c..8d58c2b37c8 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -50,7 +50,7 @@ let
     ZM_DB_TYPE=mysql
     ZM_DB_HOST=${cfg.database.host}
     ZM_DB_NAME=${cfg.database.name}
-    ZM_DB_USER=${if cfg.database.createLocally then user else cfg.database.username}
+    ZM_DB_USER=${cfg.database.username}
     ZM_DB_PASS=${cfg.database.password}
 
     # Web
@@ -155,6 +155,7 @@ in {
           default = "zmpass";
           description = ''
             Username for accessing the database.
+            Not used if <literal>createLocally</literal> is set.
           '';
         };
       };
@@ -189,6 +190,12 @@ in {
 
   config = lib.mkIf cfg.enable {
 
+    assertions = [
+      { assertion = cfg.database.createLocally -> cfg.database.username == user;
+        message = "services.zoneminder.database.username must be set to ${user} if services.zoneminder.database.createLocally is set true";
+      }
+    ];
+
     environment.etc = {
       "zoneminder/60-defaults.conf".source = defaultsFile;
       "zoneminder/80-nixos.conf".source    = configFile;
@@ -204,10 +211,9 @@ in {
       };
 
       mysql = lib.mkIf cfg.database.createLocally {
+        enable = true;
+        package = lib.mkDefault pkgs.mariadb;
         ensureDatabases = [ cfg.database.name ];
-        initialDatabases = [{
-          inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql";
-        }];
         ensureUsers = [{
           name = cfg.database.username;
           ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
@@ -315,11 +321,16 @@ in {
           procps
           psmisc
         ];
-        after = [ "mysql.service" "nginx.service" ];
+        after = [ "nginx.service" ] ++ lib.optional cfg.database.createLocally "mysql.service";
         wantedBy = [ "multi-user.target" ];
         restartTriggers = [ defaultsFile configFile ];
-        preStart = lib.mkIf useCustomDir ''
+        preStart = lib.optionalString useCustomDir ''
           install -dm775 -o ${user} -g ${group} ${cfg.storageDir}/{${lib.concatStringsSep "," libDirs}}
+        '' + lib.optionalString cfg.database.createLocally ''
+          if ! test -e "/var/lib/${dirName}/db-created"; then
+            ${config.services.mysql.package}/bin/mysql < ${pkg}/share/zoneminder/db/zm_create.sql
+            touch "/var/lib/${dirName}/db-created"
+          fi
         '';
         serviceConfig = {
           User = user;

From 9472a2ea45858c3e7113d8f25ccc7aee9c181ba3 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 20 Jun 2019 23:40:01 +0200
Subject: [PATCH 078/377] xtrace: 1.3.1 -> 1.4.0

---
 pkgs/tools/X11/xtrace/default.nix | 43 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index 1905ed9752c..8db15a8f033 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }:
+{ stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }:
 
-let version = "1.3.1"; in
-stdenv.mkDerivation {
-  name = "xtrace-${version}";
-  src = fetchgit {
-    url = "git://git.debian.org/xtrace/xtrace.git";
-    rev = "refs/tags/xtrace-1.3.1";
-    sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi";
+stdenv.mkDerivation rec {
+  pname = "xtrace";
+  version = "1.4.0";
+
+  src = fetchFromGitLab rec {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = pname;
+    rev = "xtrace-${version}";
+    sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libX11 makeWrapper ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper ];
+  buildInputs = [ libX11 ];
 
-  preConfigure = ''
-    ./autogen.sh
+  postInstall = ''
+    wrapProgram "$out/bin/xtrace" \
+        --prefix PATH ':' "${xauth}/bin"
   '';
 
-  postInstall =
-    '' wrapProgram "$out/bin/xtrace" \
-         --prefix PATH ':' "${xauth}/bin"
-    '';
-
-  meta = {
-    homepage = http://xtrace.alioth.debian.org/;
+  meta = with stdenv.lib; {
+    homepage = "https://salsa.debian.org/debian/xtrace";
     description = "Tool to trace X11 protocol connections";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }

From b88ac050bda46b630b85fe91f273f966199fbca3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Jun 2019 12:15:38 -0500
Subject: [PATCH 079/377] bazelisk: 0.0.7 -> 0.0.8 (#63769)

---
 pkgs/development/tools/bazelisk/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 2ac58203d0d..27db701ef54 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,20 +2,23 @@
 
 buildGoModule rec {
   pname = "bazelisk";
-  version = "0.0.7";
+  version = "0.0.8";
 
   src = fetchFromGitHub {
-    owner = "philwo";
+    owner = "bazelbuild";
     repo = pname;
     rev = "v${version}";
-    sha256 = "177x0mal960gs8578h5ir51vgn1bndm9z091110gqxb9xs9jq8pf";
+    sha256 = "16jiy71x8zr3x94p3qms3xbl8632avhwi66i82wv03n4ahkyb6qr";
   };
 
   modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
 
   meta = with stdenv.lib; {
     description = "A user-friendly launcher for Bazel";
-    homepage = https://github.com/philwo/bazelisk;
+    longDescription = ''
+      BEWARE: This package does not work on NixOS.
+    '';
+    homepage = "https://github.com/bazelbuild/bazelisk";
     license = licenses.asl20;
     maintainers = with maintainers; [ elasticdog ];
   };

From 080b2fb7305534e365861b4b69bd8d497f5cbe2a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 25 Jun 2019 11:27:50 -0700
Subject: [PATCH 080/377] pythonPackages.python-dotenv: 0.10.2 -> 0.10.3

---
 .../python-modules/python-dotenv/default.nix  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index b3a9d666262..ba74817a63f 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -1,15 +1,28 @@
-{ lib, buildPythonPackage, fetchPypi, click, ipython }:
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, click
+, ipython
+, pytest
+, sh
+, typing
+}:
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6640acd76e6cab84648e4fec16c9d19de6700971f9d91d045e7120622167bfda";
+    sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi";
   };
 
-  checkInputs = [ click ipython ];
+  propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];
+
+  checkInputs = [ ipython pytest sh ];
+
+  # cli tests are impure
+  checkPhase = ''
+    pytest tests/ -k 'not cli'
+  '';
 
   meta = with lib; {
     description = "Add .env support to your django/flask apps in development and deployments";

From 71a7fbf613a07c6447087552e95a53efc39b4cb7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Jun 2019 14:17:17 -0500
Subject: [PATCH 081/377] go-tools: 2019.1.1 -> 2019.2 (#63749)

---
 pkgs/development/tools/go-tools/default.nix | 15 +++++------
 pkgs/development/tools/go-tools/deps.nix    | 29 ---------------------
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/tools/go-tools/deps.nix

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index ee61a745f10..a5a81cd98c4 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -1,11 +1,11 @@
-{ buildGoPackage
+{ buildGoModule
 , lib
 , fetchFromGitHub
 }:
 
-buildGoPackage rec {
-  name = "go-tools-${version}";
-  version = "2019.1.1";
+buildGoModule rec {
+  pname = "go-tools";
+  version = "2019.2";
 
   goPackagePath = "honnef.co/go/tools";
   excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';
@@ -13,17 +13,16 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
-    rev = "${version}";
-    sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha";
+    rev = version;
+    sha256 = "0gxvrxahfgrx630fq4j629jl177qqw1kyip805k4lw607ph8m7h6";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";
 
   meta = with lib; {
     description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
     homepage = https://staticcheck.io;
     license = licenses.mit;
     maintainers = with maintainers; [ rvolosatovs kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/go-tools/deps.nix b/pkgs/development/tools/go-tools/deps.nix
deleted file mode 100644
index 469d4b9d153..00000000000
--- a/pkgs/development/tools/go-tools/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
-    goPackagePath = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
-    };
-  }
-  {
-    goPackagePath = "github.com/kisielk/gotool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/gotool";
-      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
-      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "2c0ae70061356820330c96810d9483beb9a6da8e";
-      sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
-    };
-  }
-]

From 43459327624b7e3c8e340c57b0577f3625526f6e Mon Sep 17 00:00:00 2001
From: Serge Bazanski <serge@bazanski.pl>
Date: Tue, 25 Jun 2019 22:00:03 +0200
Subject: [PATCH 082/377] go-protobuf: 2018-01-04 -> 1.3.1 (#63744)

---
 pkgs/development/tools/go-protobuf/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index 750df126e94..e64d61478e6 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   name = "go-protobuf-${version}";
-  version = "2018-01-04";
-  rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
-
-  goPackagePath = "github.com/golang/protobuf";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "golang";
     repo = "protobuf";
-    sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
+    rev = "v${version}";
+    sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
   };
 
+  modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+
   meta = with stdenv.lib; {
     homepage    = "https://github.com/golang/protobuf";
     description = " Go bindings for protocol buffer";

From c6078c77be3bdad23274650b31834dad052f15e6 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 25 Jun 2019 22:13:03 +0200
Subject: [PATCH 083/377] home-manager: 2019-05-24 -> 2019-06-25

---
 pkgs/tools/package-management/home-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index ca3fa8eca96..ffa9f427dc2 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   name = "home-manager-${version}";
-  version = "2019-05-24";
+  version = "2019-06-25";
 
   src = fetchFromGitHub {
     owner = "rycee";
     repo = "home-manager";
-    rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe";
-    sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf";
+    rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d";
+    sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d0683d4a878dbe357a74a92eac7fcbd4bf392da7 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 25 Jun 2019 23:09:55 +0200
Subject: [PATCH 084/377] grafana: 6.2.4 -> 6.2.5

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index fe6ca64f0e6..70ba29dfe03 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "6.2.4";
+  version = "6.2.5";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -11,12 +11,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1xfxvjhq96s3hchvigji7ppz777kggf39gh4dcqjzhls5qy6rm3i";
+    sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "082mmwksv97r2g8ywvsj5f126ycp3jwxjp21jfq0135l8yz73vwh";
+    sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8";
   };
 
   postPatch = ''

From 2a911454d349656e6140dcf919d1907c250d727a Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Fri, 7 Jun 2019 11:18:32 -0400
Subject: [PATCH 085/377] kakoune: support for adding plugins

Motivation: There is a thriving plugin ecosystem for Kakoune now,
and it is nice to add these in our Nix configurations. This was modeled
on neovim's plugins.

parinfer-rust is useable both standalone and as a Kakoune plugin,
so the plugin file inherits the same definition as pkgs.

I'll make PRs for other plugins if this gets accepted.
[Here](https://github.com/eraserhd/nixpkgs/tree/kak-ansi)'s a tested
branch for the `kak-ansi` plugin.
---
 doc/package-notes.xml                         | 12 +++++
 pkgs/applications/editors/kakoune/default.nix |  2 +-
 pkgs/applications/editors/kakoune/plugins.nix |  5 +++
 pkgs/applications/editors/kakoune/wrapper.nix | 44 +++++++++++++++++++
 pkgs/applications/editors/kakoune/wrapper.sh  | 30 +++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++-
 6 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/editors/kakoune/plugins.nix
 create mode 100644 pkgs/applications/editors/kakoune/wrapper.nix
 create mode 100644 pkgs/applications/editors/kakoune/wrapper.sh

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 2b7b4b9bc51..d2c660e22a9 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -325,6 +325,18 @@ packageOverrides = pkgs: {
    elm2nix</link>.
   </para>
  </section>
+ <section xml:id="sec-kakoune">
+  <title>Kakoune</title>
+
+  <para>
+   Kakoune can be built to autoload plugins:
+<programlisting>(kakoune.override {
+  configure = {
+    plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
+  };
+})</programlisting>
+  </para>
+ </section>
  <section xml:id="sec-shell-helpers">
   <title>Interactive shell helpers</title>
 
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 16596056c9a..8dfcc485668 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "kakoune-${version}";
+  pname = "kakoune-unwrapped";
   version = "2019.01.20";
   src = fetchFromGitHub {
     repo = "kakoune";
diff --git a/pkgs/applications/editors/kakoune/plugins.nix b/pkgs/applications/editors/kakoune/plugins.nix
new file mode 100644
index 00000000000..d2f3607d63c
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins.nix
@@ -0,0 +1,5 @@
+{ parinfer-rust }:
+
+{
+  inherit parinfer-rust;
+}
diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix
new file mode 100644
index 00000000000..b4cc823880e
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/wrapper.nix
@@ -0,0 +1,44 @@
+{ stdenv, bash }:
+with stdenv.lib;
+
+kakoune:
+
+let
+  getPlugins = { plugins ? [] }: plugins;
+
+  wrapper = { configure ? {} }:
+  stdenv.mkDerivation rec {
+    pname = "kakoune";
+    version = getVersion kakoune;
+
+    src = ./.;
+    buildCommand = ''
+      mkdir -p $out/share/kak
+      for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do
+        if [[ -d $plugin/share/kak/autoload ]]; then
+          find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do
+            printf 'source "%s"\n' "$rcfile"
+          done
+        fi
+      done >>$out/share/kak/plugins.kak
+
+      mkdir -p $out/bin
+      substitute ${src}/wrapper.sh $out/bin/kak \
+        --subst-var-by bash "${bash}" \
+        --subst-var-by kakoune "${kakoune}" \
+        --subst-var-by out "$out"
+      chmod +x $out/bin/kak
+    '';
+
+    preferLocalBuild = true;
+    buildInputs = [ bash kakoune ];
+    passthru = { unwrapped = kakoune; };
+
+    meta = kakoune.meta // {
+      # prefer wrapper over the package
+      priority = (kakoune.meta.priority or 0) - 1;
+      hydraPlatforms = [];
+    };
+  };
+in
+  makeOverridable wrapper
diff --git a/pkgs/applications/editors/kakoune/wrapper.sh b/pkgs/applications/editors/kakoune/wrapper.sh
new file mode 100644
index 00000000000..48a971a10c6
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/wrapper.sh
@@ -0,0 +1,30 @@
+#!@bash@/bin/bash
+
+# We use the -E option to load plugins.  This only makes sense when we are
+# starting a new session, so we detect that.  Also, Kakoune can only handle
+# one -E option, so we prepend loading plugins to an existing one.
+args=( "$@" )
+loadPlugins=true
+EValueOffset=-1
+pluginScript='@out@/share/kak/plugins.kak'
+
+for (( i = 0; i < ${#args[@]}; i++ )); do
+    case "${args[i]}" in
+        -n|-c|-l|-p|-clear|-version) loadPlugins=false;;
+        -E)                          EValueOffset=$(( i + 1 ));;
+        --)                          break;;
+    esac
+    case "${args[i]}" in
+        -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));;
+    esac
+done
+
+if [[ $loadPlugins = true ]]; then
+    if (( EValueOffset >= 0 )); then
+        args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}"
+    else
+        args=( "-E" "source '$pluginScript'" "${args[@]}" )
+    fi
+fi
+
+exec @kakoune@/bin/kak "${args[@]}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a2f6c391d..f213cc7c83f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3943,7 +3943,10 @@ in
 
   kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };
 
-  kakoune = callPackage ../applications/editors/kakoune { };
+  wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { };
+  kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { };
+  kakoune-unwrapped = callPackage ../applications/editors/kakoune { };
+  kakoune = wrapKakoune kakoune-unwrapped { };
 
   kbdd = callPackage ../applications/window-managers/kbdd { };
 

From 7d44ceeb2c3a00ac020d76e54d0ff9f9800048d1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 25 Jun 2019 17:02:02 -0400
Subject: [PATCH 086/377] mysql55: remove package

---
 .../libraries/unixODBCDrivers/default.nix     |  4 +-
 pkgs/servers/sql/mysql/5.5.17-cygwin.patch    | 44 ---------
 .../sql/mysql/5.5.17-export-symbols.patch     | 22 -----
 pkgs/servers/sql/mysql/5.5.x.nix              | 93 -------------------
 pkgs/top-level/all-packages.nix               |  5 -
 5 files changed, 2 insertions(+), 166 deletions(-)
 delete mode 100644 pkgs/servers/sql/mysql/5.5.17-cygwin.patch
 delete mode 100644 pkgs/servers/sql/mysql/5.5.17-export-symbols.patch
 delete mode 100644 pkgs/servers/sql/mysql/5.5.x.nix

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 7d4c6c7a299..7b72e12a66b 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql55, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
 
 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
 
@@ -67,7 +67,7 @@
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC mysql55 ];
+    buildInputs = [ unixODBC mysql ];
 
     cmakeFlags = [ "-DWITH_UNIXODBC=1" ];
 
diff --git a/pkgs/servers/sql/mysql/5.5.17-cygwin.patch b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch
deleted file mode 100644
index f5178cd3f39..00000000000
--- a/pkgs/servers/sql/mysql/5.5.17-cygwin.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mysql-5.5.17/cmake/install_macros.cmake	2011-10-12 07:10:24.000000000 -0500
-+++ mysql-5.5.17/cmake/install_macros.cmake	2011-11-07 23:19:35.772837800 -0600
-@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
-   IF(ARG_COMPONENT)
-     SET(COMP COMPONENT ${ARG_COMPONENT})
-   ENDIF()
--  INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
-+  IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")
-+    INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}
-+                               RUNTIME DESTINATION bin
-+                               ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})
-+  ELSE()
-+    INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
-+  ENDIF()
-   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
-   INSTALL_DEBUG_SYMBOLS("${TARGETS}")
-   SET(INSTALL_LOCATION)
---- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500
-+++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600
-@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)
-     SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- 
-+    IF(NOT CYGWIN)
-     # Install links to libmysqlclient.so (client_r)
-     GET_VERSIONED_LIBNAME(
-       "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
-@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)
-         linkname)
-       INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
-     ENDFOREACH()
-+    ENDIF(NOT CYGWIN)
-   ENDIF()
- ENDIF()
---- mysql-5.5.17/strings/dtoa.c	2011-10-12 07:10:25.000000000 -0500
-+++ mysql-5.5.17/strings/dtoa.c	2011-11-07 20:38:05.064690100 -0600
-@@ -36,6 +36,7 @@
- 
-  ***************************************************************/
- 
-+#define __STRICT_ANSI__
- #include <my_base.h> /* for EOVERFLOW on Windows */
- #include <my_global.h>
- #include <m_string.h>  /* for memcpy and NOT_FIXED_DEC */
diff --git a/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch
deleted file mode 100644
index edc93c44dfe..00000000000
--- a/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500
-+++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600
-@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES(
- ADD_DEFINITIONS(${SSL_DEFINES})
- 
- SET(CLIENT_API_FUNCTIONS
-+dynstr_free
-+dynstr_append_mem
-+dynstr_append_os_quoted
-+dynstr_realloc
-+init_dynamic_string
- get_tty_password
- handle_options
- load_defaults
-@@ -131,6 +136,7 @@ mysql_server_end
- mysql_set_character_set
- mysql_get_character_set_info
- mysql_stmt_next_result
-+strfill
- 
- CACHE INTERNAL "Functions exported by client API"
- 
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
deleted file mode 100644
index e089640a5b6..00000000000
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ stdenv, fetchpatch, fetchurl, cmake, bison, ncurses, openssl
-, readline, zlib, perl, cctools, CoreServices }:
-
-# Note: zlib is not required; MySQL can use an internal zlib.
-
-let
-self = stdenv.mkDerivation rec {
-  name = "mysql-${version}";
-  version = "5.5.62";
-
-  src = fetchurl {
-    url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi";
-  };
-
-  patches =
-    # Minor type error that is a build failure as of clang 6.
-    stdenv.lib.optional stdenv.cc.isClang (fetchpatch {
-      url = "https://svn.freebsd.org/ports/head/databases/mysql55-server/files/patch-sql_sql_partition.cc?rev=469888";
-      extraPrefix = "";
-      sha256 = "09sya27z3ir3xy5mrv3x68hm274594y381n0i6r5s627x71jyszf";
-    }) ++
-    stdenv.lib.optionals stdenv.isCygwin [
-      ./5.5.17-cygwin.patch
-      ./5.5.17-export-symbols.patch
-    ];
-
-  preConfigure = stdenv.lib.optional stdenv.isDarwin ''
-    ln -s /bin/ps $TMPDIR/ps
-    export PATH=$PATH:$TMPDIR
-  '';
-
-  buildInputs = [ cmake bison ncurses openssl readline zlib ]
-     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = [
-    "-DWITH_SSL=yes"
-    "-DWITH_READLINE=yes"
-    "-DWITH_EMBEDDED_SERVER=yes"
-    "-DWITH_ZLIB=yes"
-    "-DHAVE_IPV6=yes"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-    "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_SYSCONFDIR=etc/mysql"
-    "-DINSTALL_INFODIR=share/mysql/docs"
-    "-DINSTALL_MANDIR=share/man"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-    "-DINSTALL_SCRIPTDIR=bin"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/mysql"
-    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_DOCDIR=share/mysql/docs"
-    "-DINSTALL_SHAREDIR=share/mysql"
-    "-DINSTALL_MYSQLTESTDIR="
-    "-DINSTALL_SQLBENCHDIR="
-  ];
-
-  NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionals stdenv.cc.isGNU [ "-fpermissive" ] # since gcc-7
-    ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-c++11-narrowing" ]; # since clang 6
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-
-  prePatch = ''
-    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
-  '';
-  postInstall = ''
-    sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
-    rm -r $out/data "$out"/lib/*.a
-  '';
-
-  passthru = {
-    client = self;
-    connector-c = self;
-    server = self;
-    mysqlVersion = "5.5";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://www.mysql.com/;
-    description = "The world's most popular open source database";
-    platforms = platforms.unix;
-    # See https://downloads.mysql.com/docs/licenses/mysqld-5.5-gpl-en.pdf
-    license = with licenses; [
-      artistic1 bsd0 bsd2 bsd3 bsdOriginal
-      gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib
-    ];
-    broken = stdenv.isAarch64;
-  };
-}; in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b5bac38d3d..ee5857019cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14568,11 +14568,6 @@ in
 
   influxdb = callPackage ../servers/nosql/influxdb { };
 
-  mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {
-    inherit (darwin) cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
-
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
     inherit (darwin) cctools developer_cmds;
     inherit (darwin.apple_sdk.frameworks) CoreServices;

From fb918a9254b5085d9bdb7eec36907da52a6cef70 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 25 Jun 2019 17:05:55 -0400
Subject: [PATCH 087/377] nixos/mysql: drop rootPassword option

---
 nixos/modules/rename.nix                   |  1 +
 nixos/modules/services/databases/mysql.nix | 16 ----------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a424e86038e..7fa76dc0c68 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -213,6 +213,7 @@ with lib;
     (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")
+    (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 66d55b650a4..02f40683313 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -204,12 +204,6 @@ in
         '';
       };
 
-      # FIXME: remove this option; it's a really bad idea.
-      rootPassword = mkOption {
-        default = null;
-        description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
-      };
-
       replication = {
         role = mkOption {
           type = types.enum [ "master" "slave" "none" ];
@@ -400,16 +394,6 @@ in
                     cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N
                   ''}
 
-                ${optionalString (cfg.rootPassword != null)
-                  ''
-                    # Change root password
-
-                    ( echo "use mysql;"
-                      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
-                      echo "flush privileges;"
-                    ) | ${mysql}/bin/mysql -u root -N
-                  ''}
-
               rm /tmp/mysql_init
             fi
 

From 1a50722c04958f93b7279ed560206eed22a3e496 Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Wed, 26 Jun 2019 02:12:20 +0200
Subject: [PATCH 088/377] vscode-with-extensions: add missing URL handler The
 URL handler for VS Code was not copied from the generic version.

---
 pkgs/applications/editors/vscode/with-extensions.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index c6ba528c358..074e6b8b12d 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -68,6 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
 
   ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
   ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
+  ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
   makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
     --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
   ''}

From 6fba2c3565dfc0119943bf80681dbe810bb938f5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 25 Jun 2019 20:24:58 -0400
Subject: [PATCH 089/377] sd-image-raspberrypi: populateBoot ->
 populateFirmware

Fixes an incomplete change from the last changes.
---
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index cb78bbafecf..8c9090471dc 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -22,7 +22,7 @@ in
   boot.kernelPackages = pkgs.linuxPackages_rpi;
 
   sdImage = {
-    populateBootCommands = let
+    populateFirmwareCommands = let
       configTxt = pkgs.writeText "config.txt" ''
         # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
         # when attempting to show low-voltage or overtemperature warnings.

From 27170f9619f495d4dfba633be6b6897b8a329ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 25 Jun 2019 22:26:16 -0300
Subject: [PATCH 090/377] deepin.dtkcore: explicitly set DTK_VERSION

The build system fails to detect the version to build, defaulting to
the minimum one. To circunvent that it has to be explicitly set.
---
 pkgs/desktops/deepin/dtkcore/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index fe162a2677c..a0ed5c04e18 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
     sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
   '';
 
-  qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ];
+  qmakeFlags = [
+    "DTK_VERSION=${version}"
+    "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs"
+  ];
 
   postFixup = ''
     chmod +x $out/lib/dtk2/*.py

From 45108a48b3f8faac8590bdb50bd229c746c4e2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 25 Jun 2019 23:07:43 -0300
Subject: [PATCH 091/377] deepin.dde-daemon: 3.27.2.5 -> 3.27.2.6

---
 pkgs/desktops/deepin/dde-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 63fed89e1c6..5d8171b85ce 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -9,7 +9,7 @@
 buildGoPackage rec {
   name = "${pname}-${version}";
   pname = "dde-daemon";
-  version = "3.27.2.5";
+  version = "3.27.2.6";
 
   goPackagePath = "pkg.deepin.io/dde/daemon";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "117yhsb0axwblncyj02fhcyl4b7jl7vvh1bbx08bscih5lnvjihx";
+    sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4";
   };
 
   patches = [

From aadbc98fe8a935e26f775520e9effce4e8f88ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 23 Jun 2019 22:40:01 -0300
Subject: [PATCH 092/377] deepin.dde-daemon: fix some hard coded paths

---
 pkgs/desktops/deepin/dde-daemon/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 5d8171b85ce..4fb0272a3ce 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -4,7 +4,7 @@
   deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
   libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
   pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go,
-  deepin, makeWrapper, wrapGAppsHook }:
+  deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
 
 buildGoPackage rec {
   name = "${pname}-${version}";
@@ -63,6 +63,7 @@ buildGoPackage rec {
     librsvg
     pulseaudio
     tzdata
+    xkeyboard_config
   ];
 
   postPatch = ''
@@ -70,12 +71,16 @@ buildGoPackage rec {
     patchShebangs network/nm_generator/gen_nm_consts.py
 
     fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
+    fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go
     fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
     fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
     fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
     fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
     fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
     fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
+    fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go
+
+    # TODO: deepin-system-monitor comes from dde-extra
 
     sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
     sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile

From 356a347467e1510a563ae17289ae2efd0421aeb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 26 Jun 2019 00:25:57 -0300
Subject: [PATCH 093/377] deepin.deepin-calculator: init at 1.0.11

---
 .../deepin/deepin-calculator/default.nix      | 49 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-calculator/default.nix

diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
new file mode 100644
index 00000000000..5b7ca756607
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,
+  dtkwidget, deepin }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-calculator";
+  version = "1.0.11";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq";
+  };
+
+  nativeBuildInputs = [
+    qmake
+    pkgconfig
+    qttools
+    deepin.setupHook
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    qtsvg
+  ];
+
+  postPatch = ''
+    searchHardCodedPaths  # debugging
+    patchShebangs translate_generation.sh
+    fixPath $out /usr deepin-calculator.pro
+    substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator"
+  '';
+
+  postFixup = ''
+    searchHardCodedPaths $out  # debugging
+  '';
+  
+  passthru.updateScript = deepin.updateScript { inherit name; };
+
+  meta = with stdenv.lib; {
+    description = "Easy to use calculator for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/deepin-calculator;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 49114330f13..68dbf3be79a 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -17,6 +17,7 @@ let
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
     dde-session-ui = callPackage ./dde-session-ui { };
     deepin-anything = callPackage ./deepin-anything { };
+    deepin-calculator = callPackage ./deepin-calculator { };
     deepin-desktop-base = callPackage ./deepin-desktop-base { };
     deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };

From 1d964892c495cae2e64ea013baf043b5620ae37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 22 Jun 2019 17:28:29 -0300
Subject: [PATCH 094/377] deepin.dde-launcher: init at 4.6.13

fixup! deepin.dde-launcher: init at 4.6.11

deepin.dde-launcher: 4.6.11 -> 4.6.12

deepin.dde-launcher: 4.6.12 -> 4.6.13
---
 pkgs/desktops/deepin/dde-launcher/default.nix | 76 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dde-launcher/default.nix

diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
new file mode 100644
index 00000000000..2710393a257
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
+  dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
+  dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
+  which, xdg_utils, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dde-launcher";
+  version = "4.6.13";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    qttools
+    wrapGAppsHook
+    deepin.setupHook
+  ];
+
+  buildInputs = [
+    dde-qt-dbus-factory
+    dde-session-ui
+    deepin-desktop-schemas
+    deepin-wallpapers
+    dtkcore
+    dtkwidget
+    gsettings-qt
+    qtsvg
+    qtx11extras
+    which
+    xdg_utils
+  ];
+
+  postPatch = ''
+    # debugging
+    searchHardCodedPaths
+
+    substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share"
+
+    substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out"
+
+    substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open"
+    substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown"
+    substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which"
+
+    # Uncomment (and remove space after $) after packaging deepin-manual
+    #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman"
+
+    for f in src/boxframe/*.cpp; do
+      substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg"
+    done
+
+    # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0
+  '';
+
+  postFixup = ''
+    # debugging
+    searchHardCodedPaths $out
+  '';
+
+  passthru.updateScript = deepin.updateScript { inherit name; };
+
+  meta = with stdenv.lib; {
+    description = "Deepin Desktop Environment launcher module";
+    homepage = https://github.com/linuxdeepin/dde-launcher;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 49114330f13..6077591bb4f 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -12,6 +12,7 @@ let
     dde-daemon = callPackage ./dde-daemon { };
     dde-dock = callPackage ./dde-dock { };
     dde-file-manager = callPackage ./dde-file-manager { };
+    dde-launcher = callPackage ./dde-launcher { };
     dde-network-utils = callPackage ./dde-network-utils { };
     dde-polkit-agent = callPackage ./dde-polkit-agent { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };

From b86c7b85689ea452aef5dcc89a5e9de15a2a5e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 22 Jun 2019 17:29:09 -0300
Subject: [PATCH 095/377] nixos/deepin: add dde-launcher usb service

---
 nixos/modules/services/desktops/deepin/deepin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix
index d9d5d539e42..1e46ad83299 100644
--- a/nixos/modules/services/desktops/deepin/deepin.nix
+++ b/nixos/modules/services/desktops/deepin/deepin.nix
@@ -35,6 +35,7 @@
         pkgs.deepin.dde-calendar
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
+        pkgs.deepin.dde-launcher
         pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
         pkgs.deepin.deepin-anything
@@ -47,6 +48,7 @@
         pkgs.deepin.dde-calendar
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
+        pkgs.deepin.dde-launcher
         pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
         pkgs.deepin.deepin-anything

From 5a6bd14c1db78fd12a250dc6675b9efac9dc3242 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 26 Jun 2019 14:17:52 +0800
Subject: [PATCH 096/377] parity: 2.4.6 -> 2.4.8

---
 pkgs/applications/altcoins/parity/default.nix | 6 +++---
 pkgs/applications/altcoins/parity/parity.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 18e3dd4129e..9c7ee5111f4 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.4.6";
-  sha256      = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z";
-  cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9";
+  version     = "2.4.8";
+  sha256      = "1kr7hzv27vxa14wafhpaq5a4fv97zh71xjjmwzaqq4gj3k9yj0rm";
+  cargoSha256 = "1yjyk6mhr3ws73aq6h8z5iabvj03ch7mxhkrfdkmhw3cjj0jgx6j";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
index 9eb189f014e..e9b76726115 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -5,7 +5,7 @@
 
 { stdenv
 , fetchFromGitHub
-, rustPlatform 
+, rustPlatform
 , pkgconfig
 , openssl
 , systemd
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Fast, light, robust Ethereum implementation";
-    homepage = http://parity.io;
+    homepage = "http://parity.io";
     license = licenses.gpl3;
     maintainers = [ maintainers.akru ];
     platforms = platforms.linux;

From 7a66175ed189e94ce18c62a14089e8dc079503c0 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 26 Jun 2019 14:18:14 +0800
Subject: [PATCH 097/377] parity-beta: 2.5.1 -> 2.5.3

---
 pkgs/applications/altcoins/parity/beta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index ed3f691122c..9c322b4cb8c 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,6 +1,6 @@
 let
-  version     = "2.5.1";
-  sha256      = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d";
-  cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf";
+  version     = "2.5.3";
+  sha256      = "04z38ba4f1kmaa3d9b4gqz7dwr5blbppnkngw758xdm56772hfmj";
+  cargoSha256 = "03dlzl96g8k02lifymwp1xs0b2mrnj5c1xzpwp014ijqlnzcfgsv";
 in
   import ./parity.nix { inherit version sha256 cargoSha256; }

From f3b94dee34e49d1393de0bfb030451cf90a5f776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Wed, 26 Jun 2019 08:16:44 +0200
Subject: [PATCH 098/377] hostapd: fix hostapd noscan patch url.

Something somehow got wrong in #63699; some adjustments made after the
review have been discarded :/
---
 pkgs/os-specific/linux/hostapd/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 1ec98cb9c51..b2417ebeb47 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,11 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
 with stdenv.lib;
-let noScanPatch = fetchurl {
-      url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
-      sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "hostapd-${version}";
   version = "2.8";
 
@@ -17,7 +13,13 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 
-  patches = [ noScanPatch ];
+  patches = [
+    (fetchurl {
+      # Note: fetchurl seems to be unhappy with openwrt git
+      # server's URLs containing semicolons. Using the github mirror instead.
+      url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
+      sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})
+  ];
 
   outputs = [ "out" "man" ];
 

From 4907ef3c8f0e5370eea47b8e186a4b5e3dc68f91 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 26 Jun 2019 14:57:30 +0800
Subject: [PATCH 099/377] parity: activate "final" feature

---
 pkgs/applications/altcoins/parity/parity.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
index e9b76726115..011a44fe170 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -29,6 +29,8 @@ rustPlatform.buildRustPackage rec {
     systemd.lib systemd.dev openssl openssl.dev
   ];
 
+  cargoBuildFlags = [ "--features final" ];
+
   # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out
   doCheck = false;
 

From 1e5a8f9dd7aea4d45403e31440dbf25de6b5a157 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 26 Jun 2019 09:26:29 +0200
Subject: [PATCH 100/377] hostapd: remove global with stdenv.lib

---
 pkgs/os-specific/linux/hostapd/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index b2417ebeb47..7629a20473b 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "hostapd-${version}";
   version = "2.8";
@@ -50,7 +49,7 @@ stdenv.mkDerivation rec {
     CONFIG_INTERNETWORKING=y
     CONFIG_HS20=y
     CONFIG_ACS=y
-  '' + optionalString (sqlite != null) ''
+  '' + stdenv.lib.optionalString (sqlite != null) ''
     CONFIG_SQLITE=y
   '';
 
@@ -69,7 +68,7 @@ stdenv.mkDerivation rec {
     install -vD hostapd_cli.1 -t $man/share/man/man1
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://hostap.epitest.fi;
     repositories.git = git://w1.fi/hostap.git;
     description = "A user space daemon for access point and authentication servers";

From ff6eb60c72bcbb6c5d3cce429ae0233467788455 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 26 Jun 2019 11:01:35 +0100
Subject: [PATCH 101/377] conda: 4.3.31 -> 4.6.14

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

diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix
index f3021b111d1..ecc520b6e42 100644
--- a/pkgs/tools/package-management/conda/default.nix
+++ b/pkgs/tools/package-management/conda/default.nix
@@ -28,10 +28,10 @@
 # $ conda-shell
 # $ conda install spyder
 let
-  version = "4.3.31";
+  version = "4.6.14";
   src = fetchurl {
       url = "https://repo.continuum.io/miniconda/Miniconda3-${version}-Linux-x86_64.sh";
-      sha256 = "1rklq81s9v7xz1q0ha99w2sl6kyc5vhk6b21cza0jr3b8cgz0lam";
+      sha256 = "1gn43z1y5zw4yv93q1qajwbmmqs83wx5ls5x4i4llaciba4j6sqd";
   };
 
   conda = runCommand "conda-install" { buildInputs = [ makeWrapper ]; }

From d2c84bb3d1cae127cc4dcfeae42e7db605857d7a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 23 Jun 2019 14:47:19 +0100
Subject: [PATCH 102/377] pythonPackages.execnet: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 7ad1f4267d0..50a5683a571 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -3,21 +3,21 @@
 , buildPythonPackage
 , isPyPy
 , fetchPypi
-, pytest_3
+, pytest
 , setuptools_scm
 , apipkg
 }:
 
 buildPythonPackage rec {
   pname = "execnet";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
+    sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
   };
 
-  checkInputs = [ pytest_3 ];
+  checkInputs = [ pytest ];
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ apipkg ];
 
@@ -34,9 +34,6 @@ buildPythonPackage rec {
     py.test testing
   '';
 
-  # not yet compatible with pytest 4
-  doCheck = false;
-
   __darwinAllowLocalNetworking = true;
 
   meta = with stdenv.lib; {

From 8df753c5983cdd4ca9b454570c7987feba8ebb2a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 23 Jun 2019 00:27:59 +0100
Subject: [PATCH 103/377] pythonPackages.requests-toolbelt: Add missing
 checkinput pyopenssl

---
 pkgs/development/python-modules/requests-toolbelt/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index ff3a18e7e76..8dba9a91226 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -5,6 +5,7 @@
 , betamax
 , mock
 , pytest
+, pyopenssl
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
   };
 
-  checkInputs = [ betamax mock pytest ];
+  checkInputs = [ pyopenssl betamax mock pytest ];
   propagatedBuildInputs = [ requests ];
 
   checkPhase = ''

From ce22805852c0a811ff421e10fb21c050efbbf2cf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 26 Jun 2019 12:48:12 +0100
Subject: [PATCH 104/377] conda: Remove version suffix

Currently the `conda-shell` binary is installed as
`conda-shell-4.6.14` which is not very friendly to type.

With this change the binary is simply installed as `conda-shell`.
---
 pkgs/tools/package-management/conda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix
index ecc520b6e42..5ddcee6d1d3 100644
--- a/pkgs/tools/package-management/conda/default.nix
+++ b/pkgs/tools/package-management/conda/default.nix
@@ -48,7 +48,7 @@ let
     '';
 in
   buildFHSUserEnv {
-    name = "conda-shell-${version}";
+    name = "conda-shell";
     targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]);
     profile = ''
       # Add conda to PATH

From 6ee5152e711071c8936e39e37531338839deb601 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 13:58:34 +0200
Subject: [PATCH 105/377] python.pkgs.dm-sonnet: fix build with bazel 0.27
 (#63806)

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

diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index a44453f778a..9fc66214990 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -38,6 +38,11 @@ let
       sha256 = "0q7mz69nzng8i6pn3h0va79q4nh60jfjjj9crric8g6dmdwc3h1i";
     };
 
+    bazelFlags = [
+      # https://github.com/deepmind/sonnet/issues/134
+      "--incompatible_disable_deprecated_attr_params=false"
+    ];
+
     buildAttrs = {
       preBuild = ''
         patchShebangs .

From 06ffd2b2b73ed61a5526cae7de77abc9e01e20af Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 24 Jun 2019 13:48:05 +0200
Subject: [PATCH 106/377] linuxptp: init at 2.0

---
 pkgs/os-specific/linux/linuxptp/default.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/os-specific/linux/linuxptp/default.nix

diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix
new file mode 100644
index 00000000000..84a0f4a10d5
--- /dev/null
+++ b/pkgs/os-specific/linux/linuxptp/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, linuxHeaders } :
+
+
+stdenv.mkDerivation rec {
+  pname = "linuxptp";
+  version = "2.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz";
+    sha256 = "0zcw8nllla06451r7bfsa31q4z8jj56j67i07l1azm473r0dj90a";
+  };
+
+  postPatch = ''
+    substituteInPlace incdefs.sh --replace \
+       '/usr/include/linux/' "${linuxHeaders}/include/linux/"
+  '';
+
+  makeFlags = [ "prefix=" ];
+
+  preInstall = ''
+    export DESTDIR=$out
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux";
+    homepage = "http://linuxptp.sourceforge.net/";
+    maintainers = [ maintainers.markuskowa ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b89c63b949..1f0c4986508 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1671,6 +1671,8 @@ in
 
   link-grammar = callPackage ../tools/text/link-grammar { };
 
+  linuxptp = callPackage ../os-specific/linux/linuxptp { };
+
   loadwatch = callPackage ../tools/system/loadwatch { };
 
   loccount = callPackage ../development/tools/misc/loccount { };

From c06b8b5988f8ab08cd874ef404f4a55116ceaafb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jun 2019 14:07:57 +0200
Subject: [PATCH 107/377] haskell-ci: update to latest git version

Drop un-referenced "multi-ghc-travis" directory.
---
 .../haskell-modules/configuration-common.nix  |  8 ++---
 .../haskell/multi-ghc-travis/default.nix      | 29 -------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/multi-ghc-travis/default.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 621c5239312..233438b963e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1262,14 +1262,14 @@ self: super: {
   # The latest release version is ancient. You really need this tool from git.
   haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"
     (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {
-      version = "20190307-git";
+      version = "20190625-git";
       src = pkgs.fetchFromGitHub {
         owner = "haskell-CI";
         repo = "haskell-ci";
-        rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2";
-        sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4";
+        rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01";
+        sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk";
       };
-  }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck]));
+  }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary]));
 
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
deleted file mode 100644
index 2d1ce7f8758..00000000000
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
-, deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "haskell-ci";
-  version = "0";
-  src = fetchFromGitHub {
-    owner = "haskell-CI";
-    repo = "haskell-ci";
-    rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";
-    sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base Cabal containers deepseq directory filepath ShellCheck
-    transformers
-  ];
-  executableHaskellDepends = [ base ];
-  testHaskellDepends = [
-    ansi-terminal base bytestring Diff directory filepath tasty
-    tasty-golden transformers
-  ];
-  homepage = "https://github.com/haskell-CI/haskell-ci";
-  description = "Script generator for Travis-CI";
-  license = stdenv.lib.licenses.bsd3;
-}

From 036728f3f4e068be6c4103d8d9efccd3f846f08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 26 Jun 2019 14:30:56 +0200
Subject: [PATCH 108/377] nix.binaryCaches: always set https://cache.nixos.org

There are many support questions when people add a new binary cache
and they suddenly lose nixos substitutions.

Most of the users want to keep that, so we're doing a breaking change.

Previously to disable all binary caches one had to do:

  nix.binaryCache = [];

Now the same is possible via:

  nix.binaryCache = lib.mkForce;
---
 nixos/modules/services/misc/nix-daemon.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 8db3c44246f..d8f90f1539c 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -272,10 +272,12 @@ in
 
       binaryCaches = mkOption {
         type = types.listOf types.str;
-        default = [ https://cache.nixos.org/ ];
         description = ''
           List of binary cache URLs used to obtain pre-built binaries
           of Nix packages.
+
+          By default https://cache.nixos.org/ is added,
+          to override it use <literal>lib.mkForce []</literal>.
         '';
       };
 
@@ -386,6 +388,7 @@ in
   config = {
 
     nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+    nix.binaryCaches = [ "https://cache.nixos.org/" ];
 
     environment.etc."nix/nix.conf".source = nixConf;
 

From f572d4eb91115b992361fddd3373a527518fdf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 26 Jun 2019 15:51:40 +0200
Subject: [PATCH 109/377] duplicati: PermissionsStartOnly is deprecated

---
 nixos/modules/services/backup/duplicati.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix
index d2fe4698e88..a4b895d78a6 100644
--- a/nixos/modules/services/backup/duplicati.nix
+++ b/nixos/modules/services/backup/duplicati.nix
@@ -47,15 +47,11 @@ in
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         User = cfg.user;
-        PermissionsStartOnly = true;
         Group = "duplicati";
+        StateDirectory = "/var/lib/duplicati";
         ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati";
         Restart = "on-failure";
       };
-      preStart = ''
-        mkdir -p /var/lib/duplicati
-        chown -R ${cfg.user}:duplicati /var/lib/duplicati
-      '';
     };
 
     users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") {

From 54cbf55543a8da5d8198e15e46fa92607e169b63 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 17:48:44 +0200
Subject: [PATCH 110/377] python.pkgs.dm-sonnet: fix hash (#63815)

Follow up to https://github.com/NixOS/nixpkgs/pull/63806, where I failed
to update the hash.
---
 pkgs/development/python-modules/dm-sonnet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 9fc66214990..1c972cb2aa0 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -35,7 +35,7 @@ let
     bazelTarget = ":install";
 
     fetchAttrs = {
-      sha256 = "0q7mz69nzng8i6pn3h0va79q4nh60jfjjj9crric8g6dmdwc3h1i";
+      sha256 = "0f2rlzrlazmgjrsin8vq3jfv431cc8sx8lxsr6x4wgd4jx5d1zzy";
     };
 
     bazelFlags = [

From 438b4875617f2e81fa6998de4915356072b81a34 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 27 Jun 2019 00:03:44 +0800
Subject: [PATCH 111/377] rust-bindgen: 0.49.2 -> 0.49.3

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

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index cad237b9cbc..8a024994156 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
-  version = "0.49.2";
+  version = "0.49.3";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0m9c7zswp87yj7y972ghbx5z7lwbhdxb9qyws5cwiazkl582q0qj";
+    sha256 = "032sgg27pdxlmas67clqldvamd2ncdiw1hmk1hiprcxng7073f4y";
   };
 
   cargoSha256 = "1311d0wjjj99m59zd2n6r4aq6lwbbpyj54ha2z9g4yd1hn344r91";

From 02a0ae6dbc369864720e83842ca779543738994d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 26 Jun 2019 20:38:01 +0300
Subject: [PATCH 112/377] netdata: 1.11.1 -> 1.15.0

---
 pkgs/tools/system/netdata/default.nix         |  6 +-
 .../netdata/no-files-in-etc-and-var.patch     | 81 ++++++++++---------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index ec30c1d070c..f0082f4a441 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }:
 
 stdenv.mkDerivation rec{
-  version = "1.11.1";
+  version = "1.15.0";
   name = "netdata-${version}";
 
   src = fetchurl {
     url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
-    sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01";
+    sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec{
   postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     # rename this plugin so netdata will look for setuid wrapper
     mv $out/libexec/netdata/plugins.d/apps.plugin \
-      $out/libexec/netdata/plugins.d/apps.plugin.org
+       $out/libexec/netdata/plugins.d/apps.plugin.org
   '';
 
   preConfigure = ''
diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index bf9b6c19e7c..c3927c29dd2 100644
--- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
@@ -1,14 +1,15 @@
-diff -ruN orig/Makefile.am new/Makefile.am
---- orig/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/Makefile.am	2018-11-16 10:30:22.000000000 -0500
-@@ -99,10 +99,10 @@
+diff --git a/Makefile.am b/Makefile.am
+index f2087bb..7a70cfb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -116,10 +116,10 @@ AM_CFLAGS = \
  	$(NULL)
  
  sbin_PROGRAMS =
--dist_cache_DATA = installer/.keep
--dist_varlib_DATA = installer/.keep
--dist_registry_DATA = installer/.keep
--dist_log_DATA = installer/.keep
+-dist_cache_DATA = packaging/installer/.keep
+-dist_varlib_DATA = packaging/installer/.keep
+-dist_registry_DATA = packaging/installer/.keep
+-dist_log_DATA = packaging/installer/.keep
 +dist_cache_DATA =
 +dist_varlib_DATA =
 +dist_registry_DATA =
@@ -16,64 +17,70 @@ diff -ruN orig/Makefile.am new/Makefile.am
  plugins_PROGRAMS =
  
  LIBNETDATA_FILES = \
-diff -ruN orig/collectors/charts.d.plugin/Makefile.am new/collectors/charts.d.plugin/Makefile.am
---- orig/collectors/charts.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/collectors/charts.d.plugin/Makefile.am	2018-11-16 11:16:47.000000000 -0500
-@@ -32,7 +32,6 @@
+diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
+index 2989b4b..64de7d6 100644
+--- a/collectors/charts.d.plugin/Makefile.am
++++ b/collectors/charts.d.plugin/Makefile.am
+@@ -32,7 +32,6 @@ dist_charts_DATA = \
  
  userchartsconfigdir=$(configdir)/charts.d
  dist_userchartsconfig_DATA = \
--    $(top_srcdir)/installer/.keep \
+-    .keep \
      $(NULL)
  
  chartsconfigdir=$(libconfigdir)/charts.d
-diff -ruN orig/collectors/node.d.plugin/Makefile.am new/collectors/node.d.plugin/Makefile.am
---- orig/collectors/node.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/collectors/node.d.plugin/Makefile.am	2018-11-16 11:16:42.000000000 -0500
-@@ -23,7 +23,6 @@
+diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
+index 3b5a0a5..b7abe01 100644
+--- a/collectors/node.d.plugin/Makefile.am
++++ b/collectors/node.d.plugin/Makefile.am
+@@ -23,7 +23,6 @@ dist_noinst_DATA = \
  
  usernodeconfigdir=$(configdir)/node.d
  dist_usernodeconfig_DATA = \
--    $(top_srcdir)/installer/.keep \
+-    .keep \
      $(NULL)
  
  nodeconfigdir=$(libconfigdir)/node.d
-diff -ruN orig/collectors/python.d.plugin/Makefile.am new/collectors/python.d.plugin/Makefile.am
---- orig/collectors/python.d.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/collectors/python.d.plugin/Makefile.am	2018-11-16 10:56:06.000000000 -0500
-@@ -29,7 +29,6 @@
+diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
+index 652a35d..cf4b2cc 100644
+--- a/collectors/python.d.plugin/Makefile.am
++++ b/collectors/python.d.plugin/Makefile.am
+@@ -29,7 +29,6 @@ dist_python_DATA = \
  
  userpythonconfigdir=$(configdir)/python.d
  dist_userpythonconfig_DATA = \
--    $(top_srcdir)/installer/.keep \
+-    .keep \
      $(NULL)
  
  pythonconfigdir=$(libconfigdir)/python.d
-diff -ruN orig/collectors/statsd.plugin/Makefile.am new/collectors/statsd.plugin/Makefile.am
---- orig/collectors/statsd.plugin/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/collectors/statsd.plugin/Makefile.am	2018-11-16 10:53:04.000000000 -0500
-@@ -15,6 +15,5 @@
+diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
+index e63bf98..0f59782 100644
+--- a/collectors/statsd.plugin/Makefile.am
++++ b/collectors/statsd.plugin/Makefile.am
+@@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \
  
  userstatsdconfigdir=$(configdir)/statsd.d
  dist_userstatsdconfig_DATA = \
--    $(top_srcdir)/installer/.keep \
+-    .keep \
      $(NULL)
  
-diff -ruN orig/health/Makefile.am new/health/Makefile.am
---- orig/health/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/health/Makefile.am	2018-11-16 10:56:30.000000000 -0500
-@@ -16,7 +16,6 @@
+diff --git a/health/Makefile.am b/health/Makefile.am
+index 62a4c6d..4d651df 100644
+--- a/health/Makefile.am
++++ b/health/Makefile.am
+@@ -16,7 +16,6 @@ dist_noinst_DATA = \
  
  userhealthconfigdir=$(configdir)/health.d
  dist_userhealthconfig_DATA = \
--    $(top_srcdir)/installer/.keep \
+-    .keep \
      $(NULL)
  
  healthconfigdir=$(libconfigdir)/health.d
-diff -ruN orig/system/Makefile.am new/system/Makefile.am
---- orig/system/Makefile.am	2018-11-02 08:56:21.000000000 -0500
-+++ new/system/Makefile.am	2018-11-16 10:29:21.000000000 -0500
-@@ -17,10 +17,6 @@
+diff --git a/system/Makefile.am b/system/Makefile.am
+index b085dca..ccfa588 100644
+--- a/system/Makefile.am
++++ b/system/Makefile.am
+@@ -17,10 +17,6 @@ CLEANFILES = \
  include $(top_srcdir)/build/subst.inc
  SUFFIXES = .in
  

From b05870d2232729c823c0c8daac92bf608a2a2c95 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Tue, 25 Jun 2019 02:01:16 +0200
Subject: [PATCH 113/377] nixos/cgit: fix config example

The order of the keys matters: scan-path must be the last key for other settings
to be taken into account.
---
 nixos/modules/services/web-servers/lighttpd/cgit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 4ec4a5a3359..9f25dc34f3f 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -42,10 +42,10 @@ in
     configText = mkOption {
       default = "";
       example = ''
-        cache-size=1000
-        scan-path=/srv/git
         source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
         about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh
+        cache-size=1000
+        scan-path=/srv/git
       '';
       type = types.lines;
       description = ''

From cc8152323dbcb2733f913f0d5483cea071ca2f8a Mon Sep 17 00:00:00 2001
From: uHOOCCOOHu <hooccooh1896@gmail.com>
Date: Thu, 27 Jun 2019 02:32:24 +0800
Subject: [PATCH 114/377] shadowsocks-libev: fix shared libraries

---
 pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index f4ede05047a..26e932fc5d5 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DWITH_STATIC=OFF"  "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];
 
+  postInstall = ''
+    cp lib/* $out/lib
+  '';
+
   meta = with stdenv.lib; {
     description = "A lightweight secured SOCKS5 proxy";
     longDescription = ''

From 6ea5cf34b211b9ddcdb8a30cead68ee461b65c13 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Thu, 27 Jun 2019 04:57:37 +1000
Subject: [PATCH 115/377] kubecfg: 0.9.1 -> 0.12.0 (#63681)

---
 .../networking/cluster/kubecfg/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 1e16cf1afca..cf0116ba856 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,22 +1,22 @@
 { lib, buildGoPackage, fetchFromGitHub, ... }:
 
-let version = "0.9.1"; in
+let version = "0.12.0"; in
 
 buildGoPackage {
   name = "kubecfg-${version}";
 
   src = fetchFromGitHub {
-    owner = "ksonnet";
+    owner = "bitnami";
     repo = "kubecfg";
     rev = "v${version}";
-    sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi";
+    sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";
   };
 
-  goPackagePath = "github.com/ksonnet/kubecfg";
+  goPackagePath = "github.com/bitnami/kubecfg";
 
   meta = {
     description = "A tool for managing Kubernetes resources as code";
-    homepage = https://github.com/ksonnet/kubecfg;
+    homepage = https://github.com/bitnami/kubecfg;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ benley ];
     platforms = lib.platforms.unix;

From a772b8633fb8da9826c344953bdfd83d03c72293 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Wed, 26 Jun 2019 20:57:51 +0100
Subject: [PATCH 116/377] asciidoctor: add update.sh for dependency updates

---
 pkgs/tools/typesetting/asciidoctor/default.nix | 10 ++++++++--
 pkgs/tools/typesetting/asciidoctor/update.sh   |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/tools/typesetting/asciidoctor/update.sh

diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index 760cc41609e..0f9bb0ef7de 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, bundlerApp, ruby
+{ stdenv, lib, bundlerApp, ruby, bundix, mkShell
   # Dependencies of the 'mathematical' package
 , cmake, bison, flex, glib, pkgconfig, cairo
 , pango, gdk_pixbuf, libxml2, python3, patchelf
 }:
 
-bundlerApp {
+bundlerApp rec {
   inherit ruby;
   pname = "asciidoctor";
   gemdir = ./.;
@@ -43,6 +43,12 @@ bundlerApp {
     };
   };
 
+  passthru.updateShell = mkShell {
+    buildInputs = (gemConfig.mathematical {}).buildInputs ++ [
+      bundix
+    ];
+  };
+
   meta = with lib; {
     description = "A faster Asciidoc processor written in Ruby";
     homepage = https://asciidoctor.org/;
diff --git a/pkgs/tools/typesetting/asciidoctor/update.sh b/pkgs/tools/typesetting/asciidoctor/update.sh
new file mode 100755
index 00000000000..db7511330be
--- /dev/null
+++ b/pkgs/tools/typesetting/asciidoctor/update.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+rm gemset.nix Gemfile.lock
+nix-shell ../../../.. -A asciidoctor.updateShell --run '
+  bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle
+'
+rm -r .bundle

From bfeaa8f7d60cd8478a80a1609bc7be6d475db2ba Mon Sep 17 00:00:00 2001
From: Sarunas Valaskevicius <rakatan@gmail.com>
Date: Fri, 1 Mar 2019 18:13:53 +0000
Subject: [PATCH 117/377] asciidoctor: add rouge to dependencies

---
 pkgs/tools/typesetting/asciidoctor/Gemfile      |  1 +
 pkgs/tools/typesetting/asciidoctor/Gemfile.lock |  4 +++-
 pkgs/tools/typesetting/asciidoctor/gemset.nix   | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile
index 4edebabc4cd..bdaf1721227 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -5,3 +5,4 @@ gem 'asciidoctor-pdf'
 gem 'asciidoctor-mathematical'
 gem 'coderay'
 gem 'pygments.rb'
+gem 'rouge'
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 7416bd0268e..2195e224bf8 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -54,9 +54,10 @@ GEM
     prawn-templates (0.1.1)
       pdf-reader (~> 2.0)
       prawn (~> 2.2)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
+    rouge (3.5.1)
     ruby-enum (0.7.2)
       i18n
     ruby-rc4 (0.1.5)
@@ -76,6 +77,7 @@ DEPENDENCIES
   asciidoctor-pdf
   coderay
   pygments.rb
+  rouge
 
 BUNDLED WITH
    1.17.2
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index aef9061e130..3e416600822 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -237,10 +237,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
+      sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
       type = "gem";
     };
-    version = "3.1.0";
+    version = "3.1.1";
   };
   "pygments.rb" = {
     dependencies = ["multi_json"];
@@ -253,6 +253,16 @@
     };
     version = "1.2.1";
   };
+  rouge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
   ruby-enum = {
     dependencies = ["i18n"];
     groups = ["default"];

From 4ae993455deeec79254712bdeb4e5a75b9ef7da8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 26 Jun 2019 22:28:06 +0200
Subject: [PATCH 118/377] signal-desktop: 1.25.1 -> 1.25.2

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index e1ba2900785..fec394b27b4 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -57,11 +57,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.25.1";
+  version = "1.25.2";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1185psv93amqj0s7rgm8bhl3y4jcxc1945paslvjbmw01vi3p1lp";
+    sha256 = "0kbvanq5hvxbabs6p8qlsv3bcyh4cjb51n74nn0sa0qjyrp7lndq";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 0c739fd88cf3dd16b54decb0fe36bc325ce4efd7 Mon Sep 17 00:00:00 2001
From: kjuvi <quentin.vaucher@protonmail.com>
Date: Tue, 25 Jun 2019 23:24:50 +0200
Subject: [PATCH 119/377] timetable: init at 1.0.6

---
 .../applications/office/timetable/default.nix | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/office/timetable/default.nix

diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
new file mode 100644
index 00000000000..bbf252d2892
--- /dev/null
+++ b/pkgs/applications/office/timetable/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+, glib
+, gtk3
+, hicolor-icon-theme
+, json-glib
+, libgee
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, wrapGAppsHook
+}:
+
+
+stdenv.mkDerivation rec {
+  pname = "timetable";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "lainsce";
+    repo = pname;
+    rev = version;
+    sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    pantheon.vala
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    hicolor-icon-theme
+    json-glib
+    libgee
+    pantheon.granite
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Plot out your own timetable for the week and organize it";
+    homepage = "https://github.com/lainsce/timetable";
+    maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b5bac38d3d..2e5aba0fa87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6216,6 +6216,8 @@ in
 
   timetrap = callPackage ../applications/office/timetrap { };
 
+  timetable = callPackage ../applications/office/timetable { };
+
   tzupdate = callPackage ../applications/misc/tzupdate { };
 
   tinc = callPackage ../tools/networking/tinc { };

From c393b601797ac5d5038ab45d9ce9bab47947ce10 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 21 Jun 2019 18:23:50 +0200
Subject: [PATCH 120/377] python.pkgs.dm-sonnet: add estimator dependency

Previously was implicitly included in the binary tensorflow release.
---
 pkgs/development/python-modules/dm-sonnet/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 1c972cb2aa0..41dc30e4719 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -11,6 +11,7 @@
 , wrapt
 , tensorflow
 , tensorflow-probability
+, tensorflow-estimator
 }:
 
 let
@@ -73,6 +74,7 @@ in buildPythonPackage rec {
     wrapt
     tensorflow
     tensorflow-probability
+    tensorflow-estimator
   ];
 
   # not sure how to properly run the real test suite -- through bazel?

From 183d32842fdc9acecf39b2d4f1fe695577590f75 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 22 Jun 2019 13:51:39 +0200
Subject: [PATCH 121/377] python.pkgs.google-pasta: init at 0.1.7

Used by tensorflow for its tf1 -> tf2 migration.
---
 .../python-modules/google-pasta/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/google-pasta/default.nix

diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix
new file mode 100644
index 00000000000..e469de924f6
--- /dev/null
+++ b/pkgs/development/python-modules/google-pasta/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "google-pasta";
+  version = "0.1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zmqfvy28i2509277s6sz098kddd16cx21vpxyc8xml1nclcxlbr";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  meta = {
+    description = "An AST-based Python refactoring library";
+    homepage    = https://github.com/google/pasta;
+    license     = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c06cf060d6e..e957fe5746c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2099,6 +2099,8 @@ in {
 
   google-music-utils = callPackage ../development/python-modules/google-music-utils { };
 
+  google-pasta = callPackage ../development/python-modules/google-pasta { };
+
   gpapi = callPackage ../development/python-modules/gpapi { };
   gplaycli = callPackage ../development/python-modules/gplaycli { };
 

From 0266ca8db0ff25b017b0e800196b21c3016fbba8 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 21 Jun 2019 15:11:03 +0200
Subject: [PATCH 122/377] python.pkgs.tensorflow-probability: 0.6 -> 0.7

---
 .../tensorflow-probability/default.nix        | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index aa32904b8d3..4b0e6e7722f 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -1,35 +1,56 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
+, python
 , tensorflow
+, decorator
+, cloudpickle
+, hypothesis
+, scipy
+, matplotlib
+, mock
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "tensorflow-probability";
-  version = "0.6.0";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "probability";
     rev = "v${version}";
-    sha256 = "1y210n4asv8j39pk68bdfrz01gddflvzhxbcvj5jw6rjgaagnhvx";
+    sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
   };
 
   propagatedBuildInputs = [
     tensorflow
+    decorator
+    cloudpickle
   ];
 
+  # Listed here:
+  # https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58
   checkInputs = [
+    hypothesis
     pytest
+    scipy
+    matplotlib
+    mock
   ];
 
-  # Tests have an invalid import (`tensorflow_probability.opensource`), should
-  # be resolved in the next version with
-  # https://github.com/tensorflow/probability/commit/77d5957f2f0bdddcb46582799cd9c5c5167a1a40
-  doCheck = false;
+  # actual checks currently fail because for some reason
+  # tf.enable_eager_execution is called too late. Probably because upstream
+  # intents these tests to be run by bazel, not plain pytest.
+  # checkPhase = ''
+  #   # tests need to import from other test files
+  #   export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH"
+  #   py.test
+  # '';
+
+  # sanity check
   checkPhase = ''
-    py.test
+    python -c 'import tensorflow_probability'
   '';
 
   meta = with lib; {

From 8c3dd6f5e792e8aa53bdb115a673f444aaf86e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Fri, 14 Jun 2019 00:11:50 +0200
Subject: [PATCH 123/377] nixos/gitea: Generate a JWT secret for git LFS

---
 nixos/modules/services/misc/gitea.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index d1807a90619..5a964e672ed 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -38,6 +38,7 @@ let
     HTTP_PORT = ${toString cfg.httpPort}
     ROOT_URL = ${cfg.rootUrl}
     STATIC_ROOT_PATH = ${cfg.staticRootPath}
+    LFS_JWT_SECRET = #jwtsecret#
 
     [session]
     COOKIE_NAME = session
@@ -326,21 +327,28 @@ in
       preStart = let
         runConfig = "${cfg.stateDir}/custom/conf/app.ini";
         secretKey = "${cfg.stateDir}/custom/conf/secret_key";
+        jwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret";
       in ''
         # copy custom configuration and generate a random secret key if needed
         ${optionalString (cfg.useWizard == false) ''
           cp -f ${configFile} ${runConfig}
 
           if [ ! -e ${secretKey} ]; then
-              head -c 16 /dev/urandom | base64 > ${secretKey}
+              ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey}
           fi
 
-          KEY=$(head -n1 ${secretKey})
-          DBPASS=$(head -n1 ${cfg.database.passwordFile})
+          if [ ! -e ${jwtSecret} ]; then
+              ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
+          fi
+
+          KEY="$(head -n1 ${secretKey})"
+          DBPASS="$(head -n1 ${cfg.database.passwordFile})"
+          JWTSECRET="$(head -n1 ${jwtSecret})"
           sed -e "s,#secretkey#,$KEY,g" \
               -e "s,#dbpass#,$DBPASS,g" \
+              -e "s,#jwtsecet#,$JWTSECET,g" \
               -i ${runConfig}
-          chmod 640 ${runConfig} ${secretKey}
+          chmod 640 ${runConfig} ${secretKey} ${jwtSecret}
         ''}
 
         # update all hooks' binary paths

From c273648a209ff231c6043e68301916f4187cb10e Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 26 Jun 2019 18:02:38 -0700
Subject: [PATCH 124/377] bazel-watcher: replace the sed commands with a patch

---
 pkgs/development/tools/bazel-watcher/default.nix    | 13 +++++++------
 .../tools/bazel-watcher/use-go-in-path.patch        | 13 +++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/tools/bazel-watcher/use-go-in-path.patch

diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 035bc16064d..a30b5c9bd4e 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -6,6 +6,9 @@
 , stdenv
 }:
 
+let
+  patches = [ ./use-go-in-path.patch ];
+in
 buildBazelPackage rec {
   name = "bazel-watcher-${version}";
   version = "0.10.3";
@@ -22,11 +25,10 @@ buildBazelPackage rec {
   bazelTarget = "//ibazel";
 
   fetchAttrs = {
+    inherit patches;
+
     preBuild = ''
       patchShebangs .
-
-      # tell rules_go to use the Go binary found in the PATH
-      sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
     '';
 
     preInstall = ''
@@ -51,11 +53,10 @@ buildBazelPackage rec {
   };
 
   buildAttrs = {
+    inherit patches;
+
     preBuild = ''
       patchShebangs .
-
-      # tell rules_go to use the Go binary found in the PATH
-      sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
     '';
 
     installPhase = ''
diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch
new file mode 100644
index 00000000000..010ba56165d
--- /dev/null
+++ b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch
@@ -0,0 +1,13 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 51273b6..fcf9ffb 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
+ 
+ go_rules_dependencies()
+ 
+-go_register_toolchains()
++go_register_toolchains(go_version = "host")
+ 
+ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
+ 

From f10f860cbfc8b6d7f7a4df72a489c97075582ef7 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 26 Jun 2019 18:05:49 -0700
Subject: [PATCH 125/377] bazel-watcher: update rules_go and fix the hash of
 the fetch derivation

---
 .../development/tools/bazel-watcher/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index a30b5c9bd4e..db04c2026d8 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -1,5 +1,6 @@
 { buildBazelPackage
 , fetchFromGitHub
+, fetchpatch
 , git
 , go
 , python
@@ -7,7 +8,19 @@
 }:
 
 let
-  patches = [ ./use-go-in-path.patch ];
+  patches = [
+    ./use-go-in-path.patch
+
+    # update rules_go to fix the build. Remove these when updating past 0.10.3
+    (fetchpatch {
+      url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch";
+      sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb";
+    })
+    (fetchpatch {
+      url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch";
+      sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6";
+    })
+  ];
 in
 buildBazelPackage rec {
   name = "bazel-watcher-${version}";
@@ -49,7 +62,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny";
+    sha256 = "01d4m4kb2mhz8fxl9apzsdq0pd7i79w3q49x51rwa524caml9zfv";
   };
 
   buildAttrs = {

From 1046fc2728e7c8ff0a681f181e4396d7a13bbdcd Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 11 Jun 2019 23:14:10 +0900
Subject: [PATCH 126/377] nettools_mptcp: init at 0.95

Adds an -m flag to track MPTCP connection.
---
 pkgs/os-specific/linux/net-tools/mptcp.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/os-specific/linux/net-tools/mptcp.nix

diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix
new file mode 100644
index 00000000000..700bc5cb7f1
--- /dev/null
+++ b/pkgs/os-specific/linux/net-tools/mptcp.nix
@@ -0,0 +1,21 @@
+{ stdenv, nettools, fetchFromGitHub  }:
+
+nettools.overrideAttrs(oa: rec {
+  name = "net-tools-mptcp";
+  version = "0.95";
+
+  src = fetchFromGitHub {
+    owner = "multipath-tcp";
+    repo = "net-tools";
+    rev = "mptcp_v${version}";
+    sha256 = "0i7gr1y699nc7j9qllsx8kicqkpkhw51x4chcmyl5xs06b2mdjri";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/multipath-tcp/net-tools;
+    description = "A set of tools for controlling the network subsystem in Linux";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ teto ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c92c3f57b83..c621efdddd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15728,6 +15728,8 @@ in
   nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
              else unixtools.nettools;
 
+  nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };
+
   nftables = callPackage ../os-specific/linux/nftables { };
 
   noah = callPackage ../os-specific/darwin/noah {

From e775f2ddd2f2ae16534e28eb967e89bafed62183 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 11 Jun 2019 23:41:25 +0900
Subject: [PATCH 127/377] iproute_mptcp: init at 0.95

allows to disable MPTCP on specific interfaces.
---
 pkgs/os-specific/linux/iproute/mptcp.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/os-specific/linux/iproute/mptcp.nix

diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix
new file mode 100644
index 00000000000..90503c21c04
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/mptcp.nix
@@ -0,0 +1,22 @@
+{ stdenv, iproute, fetchFromGitHub }:
+
+iproute.overrideAttrs (oa: rec {
+  pname = "iproute_mptcp";
+  version = "0.95";
+
+  src = fetchFromGitHub {
+    owner = "multipath-tcp";
+    repo = "iproute-mptcp";
+    rev = "mptcp_v${version}";
+    sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/multipath-tcp/iproute-mptcp;
+    description = "IP-Route extensions for MultiPath TCP";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ teto ];
+    priority = 2;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c621efdddd2..8f276e19fbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15205,6 +15205,8 @@ in
 
   iproute = callPackage ../os-specific/linux/iproute { };
 
+  iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };
+
   iputils = callPackage ../os-specific/linux/iputils { };
 
   iptables = callPackage ../os-specific/linux/iptables { };

From cb77f7e227dd0953beceeebbc8f4842c51e389be Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 03:16:46 -0400
Subject: [PATCH 128/377] exiv2: 0.26.2018.12.30 -> 0.27.1

Also run tests and remove additionally installed stuff.

Co-authored-by: periklis <periklis.tsirakidis@holidaycheck.com>
Co-authored-by: vcunat <vcunat@gmail.com>
---
 pkgs/development/libraries/exiv2/default.nix  | 73 ++++++++++++++++---
 .../libraries/exiv2/fix-cmake.patch           | 16 ++++
 2 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/exiv2/fix-cmake.patch

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index d3095099d3c..c37bacefcab 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,28 +1,79 @@
-{ stdenv, fetchFromGitHub, zlib, expat, gettext
-, autoconf }:
+{ stdenv
+, fetchFromGitHub
+, zlib
+, expat
+, cmake
+, which
+, libxml2
+, python3
+, gettext
+}:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.26.2018.12.30";
+  pname = "exiv2";
+  version = "0.27.1";
 
-    #url = "https://www.exiv2.org/builds/${name}-trunk.tar.gz";
   src = fetchFromGitHub rec {
     owner = "exiv2";
     repo  = "exiv2";
-    rev = "f5d0b25"; # https://github.com/Exiv2/exiv2/commits/0.26
-    sha256 = "1blaz3g8dlij881g14nv2nsgr984wy6ypbwgi2pixk978p0gm70i";
+    rev = version;
+    sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c";
   };
 
-  postPatch = "patchShebangs ./src/svn_version.sh";
-
-  preConfigure = "make config"; # needed because not using tarball
+  patches = [
+    # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments
+    ./fix-cmake.patch
+  ];
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
+    cmake
     gettext
-    autoconf # needed because not using tarball
   ];
-  propagatedBuildInputs = [ zlib expat ];
+
+  propagatedBuildInputs = [
+    expat
+    zlib
+  ];
+
+  checkInputs = [
+    libxml2.bin
+    python3
+    which
+  ];
+
+  doCheck = stdenv.isLinux;
+
+  # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.
+  checkTarget = "tests";
+
+  preCheck = ''
+    patchShebangs ../test/
+    mkdir ../test/tmp
+    export LD_LIBRARY_PATH="$(realpath ../build/lib)"
+
+    # Fix tests on Aarch64
+    ${stdenv.lib.optionalString stdenv.isAarch64 ''
+      rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
+    ''}
+  '';
+
+  postCheck = ''
+    (cd ../tests/ && python3 runner.py)
+  '';
+
+  # With cmake we have to enable samples or there won't be
+  # a tests target. This removes them.
+  postInstall = ''
+    ( cd "$out/bin"
+      mv exiv2 .exiv2
+      rm *
+      mv .exiv2 exiv2
+    )
+  '';
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = https://www.exiv2.org/;
diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch
new file mode 100644
index 00000000000..1e19aed8b90
--- /dev/null
+++ b/pkgs/development/libraries/exiv2/fix-cmake.patch
@@ -0,0 +1,16 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 34087004..41b3a068 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -239,9 +239,9 @@ install(FILES
+     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
+ 
+-install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+ # ******************************************************************************
+ # exiv2 application

From 91a3b41967e1ef368d123303342d3c42d857a38f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 03:17:57 -0400
Subject: [PATCH 129/377] exiv2: enable docs and po

Also multiout man
---
 pkgs/development/libraries/exiv2/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index c37bacefcab..9b05165e1b2 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -7,6 +7,9 @@
 , libxml2
 , python3
 , gettext
+, doxygen
+, graphviz
+, libxslt
 }:
 
 stdenv.mkDerivation rec {
@@ -25,11 +28,19 @@ stdenv.mkDerivation rec {
     ./fix-cmake.patch
   ];
 
-  outputs = [ "out" "dev" ];
+  cmakeFlags = [
+    "-DEXIV2_BUILD_PO=ON"
+    "-DEXIV2_BUILD_DOC=ON"
+  ];
+
+  outputs = [ "out" "dev" "doc" "man" ];
 
   nativeBuildInputs = [
     cmake
+    doxygen
     gettext
+    graphviz
+    libxslt
   ];
 
   propagatedBuildInputs = [
@@ -43,6 +54,10 @@ stdenv.mkDerivation rec {
     which
   ];
 
+  buildFlags = [
+    "doc"
+  ];
+
   doCheck = stdenv.isLinux;
 
   # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.

From ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 21:34:14 -0400
Subject: [PATCH 130/377] gwenview: fix build with exiv2 0.27.1

---
 pkgs/applications/kde/gwenview.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 3d03d1dea3e..ceb928acdf2 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   exiv2, lcms2,
   baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras, kinit
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch
 }:
 
 mkDerivation {
@@ -18,4 +18,12 @@ mkDerivation {
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
+
+  # Fixes build with exiv2-0.27.1. Drop in 19.04.2
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch";
+      sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq";
+    })
+  ];
 }

From be579502287d0290e053c44620865258807c9bce Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 21:54:11 -0400
Subject: [PATCH 131/377] libextractor: fix build with exiv2 0.27.1

---
 pkgs/development/libraries/libextractor/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index bc371423e43..43e6abe1a39 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis
-, exiv2, libgsf, rpm, pkgconfig
+, exiv2, libgsf, rpm, pkgconfig, fetchpatch
 , gtkSupport ? true, glib ? null, gtk3 ? null
 , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}:
 
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh";
   };
 
+  patches = [
+    # Fixes build with exiv2 0.27
+    (fetchpatch {
+      name = "libextractor-exiv2-0.27.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
+      sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
+    })
+  ];
+
   preConfigure =
     '' echo "patching installation directory in \`extractor.c'..."
        sed -i "src/main/extractor.c" \

From 00be2a4a2e562d1e79bd4274e0d2f8940009ab33 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 22:04:01 -0400
Subject: [PATCH 132/377] hugin: fix build with exiv2 0.27.1

---
 pkgs/applications/graphics/hugin/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 6be43cffea5..d7888da15ef 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
+{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch
 , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
 , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
 , libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";
   };
 
+  patches = [
+    # Fixes build with exiv2 0.27.1
+    (fetchpatch {
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/hugin-exiv2-0.27.1.patch?h=packages/hugin";
+      sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r";
+    })
+  ];
+
   buildInputs = [
     boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
     libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra

From a215eca765b4e43294d2378662f89f27ff95edcc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 23:03:58 -0400
Subject: [PATCH 133/377] qtpfsgui: remove

https://github.com/LuminanceHDR points to the homepage
of this package which has continued development.
Wikipedia also cites that LuminanceHDR was formerly qtpfsgui.
---
 .../graphics/qtpfsgui/default.nix             | 41 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/applications/graphics/qtpfsgui/default.nix

diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix
deleted file mode 100644
index 4be7d230b5f..00000000000
--- a/pkgs/applications/graphics/qtpfsgui/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{stdenv, fetchurl, qt4, qmake4Hook, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }:
-
-stdenv.mkDerivation rec {
-  name = "qtpfsgui-1.9.3";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/qtpfsgui/${name}.tar.gz";
-    sha256 = "1mlg9dry4mfnnjlnwsw375hzsiagssdhccfmapx5nh6ykqrslsh1";
-  };
-
-  buildInputs = [ qt4 exiv2 openexr fftwSinglePrec libtiff ];
-  nativeBuildInputs = [ qmake4Hook ];
-
-  hardeningDisable = [ "format" ];
-
-  preConfigure = ''
-    export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH"
-  '';
-
-  qmakeFlags = [
-    "EXIV2PATH=${exiv2.dev}/include/exiv2"
-    "OPENEXRDIR=${openexr.dev}/include/OpenEXR"
-    "FFTW3DIR=${fftwSinglePrec.dev}/include"
-    "LIBTIFFDIR=${libtiff.dev}/include"
-  ];
-
-  meta = {
-    homepage = http://qtpfsgui.sourceforge.net/;
-    description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging";
-
-    longDescription =
-      '' Qtpfsgui is an open source graphical user interface application that
-         aims to provide a workflow for high dynamic range (HDR) imaging.
-      '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6312d1bd571..fd873605056 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -280,6 +280,7 @@ mapAliases ({
   qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
+  qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rdmd = dtools;  # added 2017-08-19
   rhc = throw "deprecated in 2019-04-09: abandoned by upstream.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50ff45cd0b5..061f3ecd7ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19825,8 +19825,6 @@ in
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
 
-  qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
-
   qtractor = libsForQt5.callPackage ../applications/audio/qtractor { };
 
   qtscrobbler = callPackage ../applications/audio/qtscrobbler { };

From 2be463f7d868700efc685fd9f6778f09523e1612 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 23:15:26 -0400
Subject: [PATCH 134/377] luminance-hdr: 2.5.1 -> 2.6.0

Switch to GitHub source.
---
 .../graphics/luminance-hdr/default.nix        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index 867c0a55838..94899c937a8 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl
+{ stdenv, cmake, fetchFromGitHub, pkgconfig, boost, exiv2, fftwFloat, gsl
 , ilmbase, lcms2, libraw, libtiff, openexr
-, qtbase, qtdeclarative, qttools, qtwebengine
+, qtbase, qtdeclarative, qttools, qtwebengine, eigen
 }:
 
 stdenv.mkDerivation rec {
-  name = "luminance-hdr-2.5.1";
+  pname = "luminance-hdr";
+  version = "2.6.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2";
-    sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658";
+  src = fetchFromGitHub {
+    owner = "LuminanceHDR";
+    repo = "LuminanceHDR";
+    rev = "v.${version}";
+    sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
-  buildInputs =
-    [
-      qtbase qtdeclarative qttools qtwebengine
-      boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
-    ];
+  buildInputs = [
+    qtbase qtdeclarative qttools qtwebengine eigen
+    boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
+  ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 

From cee981f0319a29f3331f793a09e18d91e4e03f51 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 00:46:59 -0400
Subject: [PATCH 135/377] mythtv: fix build with exiv2 0.27.1

---
 pkgs/applications/video/mythtv/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 1be4fc252fd..74167a67bd2 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -2,7 +2,7 @@
 , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
 , perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
 , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
-, linuxHeaders
+, linuxHeaders, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
   };
 
+  patches = [
+    # Fixes build with exiv2 0.27.1.
+    (fetchpatch {
+      name = "004-exiv2.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946";
+      sha256 = "0mh542f53qgky0w3s2bv0gmcxzvmb10834z3cfff40fby2ffr6k8";
+    })
+  ];
+
   setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
 
   buildInputs = [

From 248014f053c38a7b794cd6dd05064813bc651ac5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 01:32:52 -0400
Subject: [PATCH 136/377] gpscorrelate: 1.6.1 -> unstable-2019-06-05

GPSCorrelate was originally written by Daniel Foote.
The maintainer is now Dan Fandrich and we now fetch
from their repo.

This default builds the newly ported gtk3 application
and should build with exiv2 0.27.1.
---
 .../misc/gpscorrelate/default.nix             | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index e691c79d85c..5bcaccb43bc 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,28 +1,41 @@
-{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2
-, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
+{ fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3
+, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gpscorrelate-${version}";
-  version = "1.6.1";
+  pname = "gpscorrelate";
+  version = "unstable-2019-06-05";
 
   src = fetchFromGitHub {
-    owner = "freefoote";
-    repo = "gpscorrelate";
-    rev = version;
-    sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";
+    owner = "dfandrich";
+    repo = pname;
+    rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85";
+    sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    exiv2 libxml2 gtk2
-    libxslt docbook_xsl 
+  nativeBuildInputs = [
+    desktop-file-utils
     docbook_xml_dtd_42
+    docbook_xsl
+    libxslt
+    pkgconfig
   ];
 
-  patchPhase = ''
-    sed -i "Makefile" \
-        -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"
-  '';
+  buildInputs = [
+    exiv2
+    gtk3
+    libxml2
+  ];
+
+  makeFlags = [
+    "prefix=${placeholder ''out''}"
+    "GTK=3"
+    "CC=cc"
+    "CXX=c++"
+  ];
+
+  doCheck = true;
+
+  installTargets = [ "install" "install-desktop-file" ];
 
   meta = with stdenv.lib; {
     description = "A GPS photo correlation tool, to add EXIF geotags";
@@ -44,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.gpl2Plus;
-    homepage = https://github.com/freefoote/gpscorrelate;
+    homepage = "https://github.com/dfandrich/gpscorrelate";
     platforms = platforms.linux;
   };
 }

From c74d21a38cc833d70e47221fa097e27bbd449f00 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 01:51:23 -0400
Subject: [PATCH 137/377] nomacs: add missing headers

---
 pkgs/applications/graphics/nomacs/default.nix |  4 +++
 .../graphics/nomacs/nomacs-iostream.patch     | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/graphics/nomacs/nomacs-iostream.patch

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 14a28fc55b7..d0838070262 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i";
   };
 
+  patches = [
+    ./nomacs-iostream.patch
+  ];
+
   enableParallelBuilding = true;
 
   setSourceRoot = ''
diff --git a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/pkgs/applications/graphics/nomacs/nomacs-iostream.patch
new file mode 100644
index 00000000000..53224e0260e
--- /dev/null
+++ b/pkgs/applications/graphics/nomacs/nomacs-iostream.patch
@@ -0,0 +1,26 @@
+diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp
+index d195757e..affec7be 100644
+--- a/src/DkCore/DkMetaData.cpp
++++ b/src/DkCore/DkMetaData.cpp
+@@ -42,6 +42,8 @@
+ #include <QApplication>
+ #pragma warning(pop)		// no warnings from includes - end
+
++#include <iostream>
++
+ namespace nmc {
+
+ // DkMetaDataT --------------------------------------------------------------------
+diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp
+index 6a412f70..bbfba233 100644
+--- a/src/DkGui/DkNoMacs.cpp
++++ b/src/DkGui/DkNoMacs.cpp
+@@ -96,6 +96,8 @@
+ #include <QWinTaskbarButton>
+ #endif
+
++#include <iostream>
++
+ namespace nmc {
+
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {

From e186ad5c31739f69d083412dbf22d5e9959f9a6d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 02:00:38 -0400
Subject: [PATCH 138/377] photivo: mark as broken

---
 pkgs/applications/graphics/photivo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 4843898eb64..6bd2fa98b1b 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     license = licenses.gpl3;
+    broken = true; # exiv2 0.27.1 FTBFS
   };
 }

From 38be980e5d2e8bfca9b9070e29995c479f6c248f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 02:18:46 -0400
Subject: [PATCH 139/377] photoqt: 1.5.1 -> 1.7.1

Also pull in patch upstream to fix build with exiv2
0.27.1.
---
 .../applications/graphics/photoqt/default.nix | 29 ++++++++++++++-----
 .../photoqt/photoqt-1.5.1-qt-5.9.patch        | 13 ---------
 2 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 7571bb29bec..68afdd8694b 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,23 +1,36 @@
-{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
+, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
 }:
 
 stdenv.mkDerivation rec {
-  name = "photoqt-${version}";
-  version = "1.5.1";
+  pname = "photoqt";
+  version = "1.7.1";
 
   src = fetchurl {
-    url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
+    url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz";
+    sha256 = "1qvxdh3cbjcywqx0da2qp8z092660qyzv5yknqbps2zr12qqb103";
   };
 
-  patches = [ ./photoqt-1.5.1-qt-5.9.patch ];
+  patches = [
+    # Fixes build with exiv2 0.27.1
+    (fetchpatch {
+      url = "https://gitlab.com/luspi/photoqt/commit/c6fd41478e818f3a651d40f96cab3d790e1c09a4.patch";
+      sha256 = "1j2pdr7hm3js7lswhb4qkf9sj9viclhjqz50qxpyd7pqrl1gf2va";
+    })
+  ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
 
   buildInputs = [
-    qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    qtbase qtquickcontrols exiv2 graphicsmagick poppler
     qtmultimedia qtdeclarative libraw qtgraphicaleffects
+    kimageformats libarchive
+  ];
+
+  cmakeFlags = [
+    "-DFREEIMAGE=OFF"
+    "-DDEVIL=OFF"
   ];
 
   preConfigure = ''
diff --git a/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch b/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch
deleted file mode 100644
index daa982b5f3a..00000000000
--- a/pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 97abcb5..fd4877a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,7 +50,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
- #### FIND REQUIRED PACKAGES ####
- ################################
- 
--FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg REQUIRED)
-+FIND_PACKAGE(Qt5 COMPONENTS LinguistTools Quick Widgets Core Svg Sql Xml REQUIRED)
- SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
- FIND_PACKAGE(Magick)
- FIND_PACKAGE(Exiv2)

From 36f005b830ebd8a421c2a3201f1c79a864606437 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 02:32:50 -0400
Subject: [PATCH 140/377] geeqie: fix build with exiv2 0.27.1

---
 pkgs/applications/graphics/geeqie/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 4e1e7138e77..e4e31db94a6 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
 , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
-, wrapGAppsHook
+, wrapGAppsHook, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
   };
 
-  # Do not build the changelog as this requires markdown.
-  patches = [ ./geeqie-no-changelog.patch ];
+  patches = [
+    # Do not build the changelog as this requires markdown.
+    ./geeqie-no-changelog.patch
+    # Fixes build with exiv2 0.27.1
+    (fetchpatch {
+      name = "geeqie-exiv2-0.27.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d";
+      sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p";
+    })
+  ];
 
   preConfigure = "./autogen.sh";
 

From 368a6bacc1594f048832fcf1754696748dba6dbf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 27 Jun 2019 02:34:18 -0400
Subject: [PATCH 141/377] geeqie: fetch a patch from fedora

---
 pkgs/applications/graphics/geeqie/default.nix      |  6 +++++-
 .../graphics/geeqie/geeqie-no-changelog.patch      | 14 --------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index e4e31db94a6..08b2757dd6e 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     # Do not build the changelog as this requires markdown.
-    ./geeqie-no-changelog.patch
+    (fetchpatch {
+      name = "geeqie-1.4-goodbye-changelog.patch";
+      url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";
+      sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";
+    })
     # Fixes build with exiv2 0.27.1
     (fetchpatch {
       name = "geeqie-exiv2-0.27.patch";
diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
deleted file mode 100644
index 1b8833b135f..00000000000
--- a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- geeqie-1.4.orig/Makefile.am	2017-12-31 07:31:21.000000000 -0500
-+++ geeqie-1.4/Makefile.am	2018-01-01 15:05:58.742068166 -0500
-@@ -10,9 +10,9 @@
- readmedir = @readmedir@
- 
- if HAVE_MARKDOWN
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
- else
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
- endif
- 
- desktopdir = $(datadir)/applications

From 85109b92cded4c3a4b9128f3fd99e676143f2faf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 26 Jun 2019 05:36:56 +0000
Subject: [PATCH 142/377] amiri: init at 0.111

Amiri is a classical Arabic typeface in Naskh style for typesetting books and
other running text.

Homepage: https://www.amirifont.org/
---
 pkgs/data/fonts/amiri/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/data/fonts/amiri/default.nix

diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix
new file mode 100644
index 00000000000..36d8ed3c674
--- /dev/null
+++ b/pkgs/data/fonts/amiri/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchzip }:
+
+let
+  version = "0.111";
+
+in fetchzip rec {
+  name = "Amiri-${version}";
+
+  url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";
+
+  sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr";
+
+  postFetch = ''
+    unzip $downloadedFile
+    install -m444 -Dt $out/share/fonts/truetype ${name}/*.ttf
+    install -m444 -Dt $out/share/doc/${name}    ${name}/{*.txt,*.pdf}
+  '';
+
+  meta = with lib; {
+    description = "A classical Arabic typeface in Naskh style";
+    homepage = "https://www.amirifont.org/";
+    license = licenses.ofl;
+    maintainers = [ maintainers.vbgl ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f276e19fbd..ace2dd38364 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16145,6 +16145,8 @@ in
 
   aileron = callPackage ../data/fonts/aileron { };
 
+  amiri = callPackage ../data/fonts/amiri { };
+
   andagii = callPackage ../data/fonts/andagii { };
 
   andika = callPackage ../data/fonts/andika { };

From 6eee5555973006de13efae8e7f878502525f99c6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 27 Jun 2019 12:18:23 +0300
Subject: [PATCH 143/377] nixUnstable: pre6631_e58a7144 -> pre6631_324a5dc9

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 744d795cb78..8749ae009da 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -181,12 +181,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";
-    suffix = "pre6631_e58a7144";
+    suffix = "pre6779_324a5dc9";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "e58a71442ad4a538b48fc7a9938c3690628c4741";
-      sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802";
+      rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837";
+      sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r";
     };
     fromGit = true;
 

From 39bd21616bb47918028d3018272cde3fbcf7117e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 27 Jun 2019 12:50:56 +0200
Subject: [PATCH 144/377] soapyuhd: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix
index f7c0f27160d..6ed88e0431e 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/pkgs/applications/radio/soapyuhd/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.3.5";
+  version = "0.3.6";
 
 in stdenv.mkDerivation {
   name = "soapyuhd-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyUHD";
     rev = "soapy-uhd-${version}";
-    sha256 = "07cr4zk42d0l5g03wm7dzl5lmqr104hmzp1fdjqa1z7xq4v9c9b1";
+    sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 7e90540d137552708d75c5d0efa31b866c01898c Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Sun, 23 Jun 2019 21:53:51 +0200
Subject: [PATCH 145/377] elpi: release 1.4.1

---
 .../ocaml-modules/elpi/default.nix            | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index c3e5a272f74..c00af00b859 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,40 +1,28 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5
+{ lib, fetchFromGitHub, buildDunePackage, camlp5
 , ppx_tools_versioned, ppx_deriving, re
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
-then throw "elpi is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+  pname = "elpi";
+  version = "1.4.1";
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-elpi-${version}";
-  version = "1.2.0";
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "1n4jpidx0vk4y66bhd704ajn8n6f1fd5wsi1shj6wijfmjl14h7s";
+    sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w";
   };
 
-  buildInputs = [ ocaml findlib ppx_tools_versioned ];
+  minimumOCamlVersion = "4.04";
+
+  buildInputs = [ ppx_tools_versioned ];
 
   propagatedBuildInputs = [ camlp5 ppx_deriving re ];
 
-  createFindlibDestdir = true;
-
-  preInstall = "make byte";
-
-  postInstall = ''
-    mkdir -p $out/bin
-    make install-bin BIN=$out/bin
-    make install-bin BYTE=1 BIN=$out/bin
-  '';
-
   meta = {
     description = "Embeddable λProlog Interpreter";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
   };
 }

From 2072043efbd74b40ef107e235287ba91e489695b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Jun 2019 14:15:21 +0200
Subject: [PATCH 146/377] duplicati: fix StateDirectory

---
 nixos/modules/services/backup/duplicati.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix
index a4b895d78a6..0ff720c5897 100644
--- a/nixos/modules/services/backup/duplicati.nix
+++ b/nixos/modules/services/backup/duplicati.nix
@@ -48,7 +48,7 @@ in
       serviceConfig = {
         User = cfg.user;
         Group = "duplicati";
-        StateDirectory = "/var/lib/duplicati";
+        StateDirectory = "duplicati";
         ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati";
         Restart = "on-failure";
       };

From 5f78fa399da1cbca3591930d58e2c2a68c8c8a44 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 27 Jun 2019 13:59:02 +0000
Subject: [PATCH 147/377] coqPackages.gappalib: disable for Coq 8.10

---
 pkgs/development/coq-modules/gappalib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix
index b76dd1b43d1..c610039eeec 100644
--- a/pkgs/development/coq-modules/gappalib/default.nix
+++ b/pkgs/development/coq-modules/gappalib/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = stdenv.lib.flip stdenv.lib.versionAtLeast "8.7";
+    compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ];
   };
 
 }

From 8f182df3f822774b06c9410d073e518f94b6bbc4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Jun 2019 10:40:41 -0400
Subject: [PATCH 148/377] yoda: 1.7.4 -> 1.7.7

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

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 7a89d61753d..08afe6d6452 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
-  version = "1.7.4";
+  version = "1.7.7";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "0w9s3qv87hrmpq4dkrxcrl2hn2vcsbvy8ml99w85404wksw1dwrx";
+    sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng";
   };
 
   pythonPath = []; # python wrapper support

From ccb9fefb1e685c74c5e4fc3ab8677582740a046e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Jun 2019 10:45:49 -0400
Subject: [PATCH 149/377] rivet: 2.7.0 -> 2.7.2

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

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 40ccd8cfd20..c8dae0c2b51 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.7.0";
+  version = "2.7.2";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";

From 700bab5b803c6a35e4d712e7b19f2597a77001f1 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 27 Jun 2019 15:50:38 +0200
Subject: [PATCH 150/377] pulseaudio-modules-bt: Patch default settings for AAC
 encoding

The upstream defaults result in audibly worse quality than simply
relying on the builtin SBC codec, making it somewhat useless. Attempt
to fix this by setting saner defaults.
---
 .../audio/pulseaudio-modules-bt/default.nix       |  1 +
 .../pulseaudio-modules-bt/fix-aac-defaults.patch  | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 8a0762d5176..f63b828a0a8 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -35,6 +35,7 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./fix-install-path.patch
+    ./fix-aac-defaults.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
new file mode 100644
index 00000000000..c94c5dd61f2
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch
@@ -0,0 +1,15 @@
+diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c
+index 394a7a0..cf5abaf 100644
+--- a/src/modules/bluetooth/a2dp/a2dp_aac.c
++++ b/src/modules/bluetooth/a2dp/a2dp_aac.c
+@@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr
+     info->read_pcm = read_cb;
+     info->read_buf_free = free_cb;
+     info->aacenc_handle_opened = false;
+-    info->aac_enc_bitrate_mode = 5;
+-    info->aac_afterburner = false;
++    info->aac_enc_bitrate_mode = 0;
++    info->aac_afterburner = true;
+     info->force_pa_fmt = PA_SAMPLE_INVALID;
+     return true;
+ }

From 4b2e7c40c4911ea5cdee901c74f7937dec93f0f4 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Thu, 27 Jun 2019 20:23:17 +0200
Subject: [PATCH 151/377] psrecord: init at 1.1

---
 pkgs/tools/misc/psrecord/default.nix | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/psrecord/default.nix

diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix
new file mode 100644
index 00000000000..7df2b47497f
--- /dev/null
+++ b/pkgs/tools/misc/psrecord/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonApplication, fetchPypi, psutil, matplotlib, pytest }:
+buildPythonApplication rec {
+  pname = "psrecord";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "151rynca97v5wq1drl2yfrqmqil1km72cizn3159c2ip14626mp6";
+  };
+
+  propagatedBuildInputs = [
+    psutil matplotlib
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    pytest psrecord
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Record the CPU and memory activity of a process";
+    homepage = "https://github.com/astrofrog/psrecord";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50ff45cd0b5..41bcd400e0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1784,6 +1784,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
+
   scour = with python3Packages; toPythonApplication scour;
 
   s2png = callPackage ../tools/graphics/s2png { };

From 54645ce43a1cd2ecde5f1b6d035366b0311117cf Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 27 Jun 2019 20:38:28 +0200
Subject: [PATCH 152/377] nixos/phpfpm: Remove usage of undefined variable
 fpmCfg

---
 nixos/modules/services/web-servers/phpfpm/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index e424080ab1f..5c650210f9f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -65,8 +65,8 @@ in {
 
             phpPackage = mkOption {
               type = types.package;
-              default = fpmCfg.phpPackage;
-              defaultText = "config.services.phpfpm.phpPackage";
+              default = pkgs.php;
+              defaultText = "pkgs.php";
               description = ''
                 The PHP package to use for running this PHP-FPM pool.
               '';
@@ -74,10 +74,9 @@ in {
 
             phpOptions = mkOption {
               type = types.lines;
-              default = fpmCfg.phpOptions;
-              defaultText = "config.services.phpfpm.phpOptions";
+              default = "";
               description = ''
-                "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool."
+                Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool.
               '';
             };
 

From 46ecda4a33f8d765c31c19d1e91e63e027c35598 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 27 Jun 2019 22:46:11 +0300
Subject: [PATCH 153/377] viking: 1.6.2 -> 1.7

---
 pkgs/applications/misc/viking/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index b7d0b330e85..50f2012d34a 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,19 +1,21 @@
 { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
 , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme
+, geoclue2, liboauth }:
 
 stdenv.mkDerivation rec {
   name = "viking-${version}";
-  version = "1.6.2";
+  version = "1.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
-    sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
+    sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme
+    geoclue2 liboauth
   ];
 
   configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];

From 1fba584898b6e4ea963663c8a35910d7016d6ff0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 27 Jun 2019 21:41:08 +0200
Subject: [PATCH 154/377] androidStudioPackages.beta: 3.5.0.16 -> 3.5.0.17

I'll skip the Android Studio 3.6 Canary 4 update due to this problem:
https://issuetracker.google.com/issues/136077720#comment9
---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index db51b3feebe..abb949bf5fd 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";
   };
   betaVersion = {
-    version = "3.5.0.16"; # "Android Studio 3.5 Beta 4"
-    build = "191.5619324";
-    sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z";
+    version = "3.5.0.17"; # "Android Studio 3.5 Beta 5"
+    build = "191.5675373";
+    sha256Hash = "0iw9v2rzr32dhs3z4vgz93zvxcv111q4cvwzi2cb83hn8kl050ip";
   };
   latestVersion = { # canary & dev
     version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"

From 21c1ab6776dbb43ba31d5d07a8673ded3573e0d4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 18 Apr 2019 22:54:25 +0200
Subject: [PATCH 155/377] sage: 8.7 -> 8.8.beta2

---
 .../sphinx-docbuild-subprocesses.patch        | 57 +++++++++++++++++++
 .../science/math/sage/sage-src.nix            | 42 +++-----------
 2 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch

diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
new file mode 100644
index 00000000000..933344aa559
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -0,0 +1,57 @@
+diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
+index 0f2700168a..60f71357d2 100644
+--- a/src/sage_setup/docbuild/__init__.py
++++ b/src/sage_setup/docbuild/__init__.py
+@@ -86,26 +86,6 @@ def builder_helper(type):
+     """
+     Returns a function which builds the documentation for
+     output type ``type``.
+-
+-    TESTS:
+-
+-    Check that :trac:`25161` has been resolved::
+-
+-        sage: from sage_setup.docbuild import DocBuilder, setup_parser
+-        sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set
+-
+-        sage: import sage_setup.docbuild.sphinxbuild
+-        sage: def raiseBaseException():
+-        ....:     raise BaseException("abort pool operation")
+-        sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
+-
+-        sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc
+-        sage: helper = builder_helper("html")
+-        sage: try:
+-        ....:     build_many(build_ref_doc, [("docname", "en", "html", {})])
+-        ....: except Exception as E:
+-        ....:     "Non-exception during docbuild: abort pool operation" in str(E)
+-        True
+     """
+     def f(self, *args, **kwds):
+         output_dir = self._output_dir(type)
+@@ -127,10 +107,9 @@ def builder_helper(type):
+         logger.debug(build_command)
+ 
+         # Run Sphinx with Sage's special logger
+-        sys.argv = ["sphinx-build"] + build_command.split()
+-        from .sphinxbuild import runsphinx
++        args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split()
+         try:
+-            runsphinx()
++            subprocess.check_call(args)
+         except Exception:
+             if ABORT_ON_ERROR:
+                 raise
+diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
+index 9a2fba79bc..77c8ed3592 100644
+--- a/src/sage_setup/docbuild/sphinxbuild.py
++++ b/src/sage_setup/docbuild/sphinxbuild.py
+@@ -318,3 +318,8 @@ def runsphinx():
+         sys.stderr = saved_stderr
+         sys.stdout.flush()
+         sys.stderr.flush()
++
++if __name__ == '__main__':
++    import sys
++    sys.argv[0] = "sphinx-build"
++    runsphinx()
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 013b1bca930..9bfe453150c 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.7";
+  version = "8.8.beta2";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "05vvrd6syh0hlmrk6kzjrwd0hpmvxp8vr8p3mkjb0jh5p2kjdd27";
+    sha256 = "1avrxhhcd1hy4hm9sgma430hvxg36f10kr9p3himj6kl4m9pyflv";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -45,15 +45,6 @@ stdenv.mkDerivation rec {
     # Fixes a potential race condition which can lead to transient doctest failures.
     ./patches/fix-ecl-race.patch
 
-    # Parallelize docubuild using subprocesses, fixing an isolation issue. See
-    # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
-    (fetchpatch {
-      name = "sphinx-docbuild-subprocesses.patch";
-      url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch";
-      sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n";
-      stripLen = 1;
-    })
-
     # Part of the build system. Should become unnecessary with sage 8.8.
     # Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33
     ./patches/do-not-test-package-manifests.patch
@@ -71,20 +62,16 @@ stdenv.mkDerivation rec {
 
     # https://trac.sagemath.org/ticket/28007
     ./patches/threejs-offline.patch
+
+    # Parallelize docubuild using subprocesses, fixing an isolation issue. See
+    # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
+    ./patches/sphinx-docbuild-subprocesses.patch
   ];
 
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
-  bugfixPatches = [
-    # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py
-    # https://trac.sagemath.org/ticket/27477
-    (fetchpatch {
-      name = "sig_on_in_matrix_sparce.patch";
-      url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54";
-      sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17";
-    })
-  ];
+  bugfixPatches = [ ];
 
   # Patches needed because of package updates. We could just pin the versions of
   # dependencies, but that would lead to rebuilds, confusion and the burdons of
@@ -116,14 +103,6 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     })
 
-    # https://trac.sagemath.org/ticket/26451
-    (fetchSageDiff {
-      name = "sphinx-1.8.patch";
-      base = "8.7";
-      rev = "737afd8f314bd1e16feaec562bb4b5efa2effa8b";
-      sha256 = "0n56ss88ds662bp49j23z5c2i6hsn3jynxw13wv76hyl0h7l1hjh";
-    })
-
     # https://trac.sagemath.org/ticket/27653
     (fetchpatch {
       name = "sympy-1.4.patch";
@@ -131,13 +110,6 @@ stdenv.mkDerivation rec {
       sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";
     })
 
-    # https://trac.sagemath.org/ticket/27094
-    (fetchpatch {
-      name = "gap-4.10.1.patch";
-      url = "https://git.sagemath.org/sage.git/patch?id=d3483110474591ea6cc8e3210cd884f3e0018b3e";
-      sha256 = "028i6h8l8npwzx5z0ax0rcywl85gc83qw1jf93zf523msdfcsk0n";
-    })
-
     # https://trac.sagemath.org/ticket/27738
     (fetchpatch {
       name = "R-3.6.0.patch";

From 608948e3e9aec7f6b33ae17f176d8de214f3a5bf Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 21 Apr 2019 22:52:58 +0200
Subject: [PATCH 156/377] sage: 8.8.beta2 -> 8.8.beta3

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 9bfe453150c..286c69ec037 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta2";
+  version = "8.8.beta3";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1avrxhhcd1hy4hm9sgma430hvxg36f10kr9p3himj6kl4m9pyflv";
+    sha256 = "0cb95n1h5g9vaf4a6wczhwddj4xvx2a4ky8d7sp7cnxyd5a8618l";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.

From 240d4c31d25237db1f78036f41953d435dea97e1 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 5 May 2019 22:17:44 +0200
Subject: [PATCH 157/377] sage: 8.8.beta3 -> 8.8.beta4

---
 .../do-not-test-package-manifests.patch       | 26 -------------------
 .../science/math/sage/sage-src.nix            | 16 +++++-------
 2 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch

diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch b/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch
deleted file mode 100644
index 9e3f0f5ae88..00000000000
--- a/pkgs/applications/science/math/sage/patches/do-not-test-package-manifests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
-index 3bca15d53b..7cf04ff8d1 100644
---- a/src/sage/misc/package.py
-+++ b/src/sage/misc/package.py
-@@ -478,16 +478,16 @@ def package_manifest(package):
- 
-     EXAMPLES::
- 
--        sage: from sage.misc.package import package_manifest
--        sage: sagetex_manifest = package_manifest('sagetex')
--        sage: sagetex_manifest['package_name'] == 'sagetex'
-+        sage: from sage.misc.package import package_manifest # optional - buildsystem
-+        sage: sagetex_manifest = package_manifest('sagetex') # optional - buildsystem
-+        sage: sagetex_manifest['package_name'] == 'sagetex' # optional - buildsystem
-         True
--        sage: 'files' in sagetex_manifest
-+        sage: 'files' in sagetex_manifest # optional - buildsystem
-         True
- 
-     Test a nonexistent package::
- 
--        sage: package_manifest('dummy-package')
-+        sage: package_manifest('dummy-package') # optional - buildsystem
-         Traceback (most recent call last):
-         ...
-         KeyError: 'dummy-package'
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 286c69ec037..df4db0e6b54 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta3";
+  version = "8.8.beta4";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0cb95n1h5g9vaf4a6wczhwddj4xvx2a4ky8d7sp7cnxyd5a8618l";
+    sha256 = "01c1aj70kp4m20ga80mp09lks7p2pgp0g6ggs9nin0zvq5nhcpsx";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -45,19 +45,15 @@ stdenv.mkDerivation rec {
     # Fixes a potential race condition which can lead to transient doctest failures.
     ./patches/fix-ecl-race.patch
 
-    # Part of the build system. Should become unnecessary with sage 8.8.
-    # Upstream discussion here: https://trac.sagemath.org/ticket/27124#comment:33
-    ./patches/do-not-test-package-manifests.patch
-
     # Not necessary since library location is set explicitly
     # https://trac.sagemath.org/ticket/27660#ticket
     ./patches/do-not-test-find-library.patch
 
-    # https://trac.sagemath.org/ticket/27697#ticket
+    # https://trac.sagemath.org/ticket/27766
     (fetchpatch {
-      name = "pplpy-doc-location-configurable.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=c4d966e7cb0c7b87c55d52dc6f46518433a2a0a2";
-      sha256 = "0pqbbsx8mriwny422s9mp3z5d095cnam32sm62q4mxk8g8jb9vm9";
+      name = "more-optional-build-tags.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=a6deff761da469fad57eae498e639d6166fd78ed";
+      sha256 = "02qb9r3p0vgb9q5hhrp41mcgrk1gxrl02fmp486gnrym3cqnw5n1";
     })
 
     # https://trac.sagemath.org/ticket/28007

From 325a5037bf16de81266c4f0e0b9673eeba8622dc Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 11 May 2019 17:36:52 +0200
Subject: [PATCH 158/377] sage: 8.8.beta4 -> 8.8.beta5

---
 .../science/math/sage/sage-src.nix            | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index df4db0e6b54..c8d817564f9 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta4";
+  version = "8.8.beta5";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "01c1aj70kp4m20ga80mp09lks7p2pgp0g6ggs9nin0zvq5nhcpsx";
+    sha256 = "1c1ckabvi1mi0vaj9iahlgi1d5ss5ld442pzbg2n2vqbv7bfjfqd";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -49,12 +49,6 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/27660#ticket
     ./patches/do-not-test-find-library.patch
 
-    # https://trac.sagemath.org/ticket/27766
-    (fetchpatch {
-      name = "more-optional-build-tags.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?id=a6deff761da469fad57eae498e639d6166fd78ed";
-      sha256 = "02qb9r3p0vgb9q5hhrp41mcgrk1gxrl02fmp486gnrym3cqnw5n1";
-    })
 
     # https://trac.sagemath.org/ticket/28007
     ./patches/threejs-offline.patch
@@ -99,13 +93,6 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     })
 
-    # https://trac.sagemath.org/ticket/27653
-    (fetchpatch {
-      name = "sympy-1.4.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d";
-      sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";
-    })
-
     # https://trac.sagemath.org/ticket/27738
     (fetchpatch {
       name = "R-3.6.0.patch";
@@ -120,13 +107,6 @@ stdenv.mkDerivation rec {
       rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
       sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
     })
-
-    # https://trac.sagemath.org/ticket/26718
-    (fetchpatch {
-      name = "threejs-r100.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=86c5bb000259e6de5d7c60afc608a4b0d010b690";
-      sha256 = "0sgqqd4df2bxsq19b6kfy7dvgyxprlpg7f3xx7g3fs8ij937m352";
-    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From 9f434d70803c1cca7c3ef0bedb891cdfe92e7134 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 25 May 2019 12:59:38 +0200
Subject: [PATCH 159/377] sage: 8.8.beta5 -> 8.8.beta6

---
 pkgs/applications/science/math/sage/sage-src.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index c8d817564f9..7300e20da5e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta5";
+  version = "8.8.beta6";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1c1ckabvi1mi0vaj9iahlgi1d5ss5ld442pzbg2n2vqbv7bfjfqd";
+    sha256 = "0n0mpsxnl5kg02k0jlpd34vgk5f162pd3hd5jn821rphffsbzk5j";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -93,13 +93,6 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     })
 
-    # https://trac.sagemath.org/ticket/27738
-    (fetchpatch {
-      name = "R-3.6.0.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=8b7dbd0805d02d0e8674a272e161ceb24a637966";
-      sha256 = "1c81f13z1w62s06yvp43gz6vkp8mxcs289n6l4gj9xj10slimzff";
-    })
-
     # https://trac.sagemath.org/ticket/26932
     (fetchSageDiff {
       name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";

From c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 31 May 2019 15:32:31 +0200
Subject: [PATCH 160/377] sage: 8.8.beta6 -> 8.8.beta7

---
 pkgs/applications/science/math/sage/default.nix  |  2 +-
 pkgs/applications/science/math/sage/sage-src.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                  |  6 ------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 061b3beeb3f..caf51c3da25 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -130,7 +130,7 @@ let
   singular = pkgs.singular.override { inherit flint; };
 
   # https://trac.sagemath.org/ticket/26625
-  maxima-ecl = pkgs.maxima-ecl-5_41;
+  maxima-ecl = pkgs.maxima-ecl;
 
   # *not* to confuse with the python package "pynac"
   pynac = pkgs.pynac.override { inherit singular flint; };
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 7300e20da5e..d88f3aa6b05 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta6";
+  version = "8.8.beta7";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "0n0mpsxnl5kg02k0jlpd34vgk5f162pd3hd5jn821rphffsbzk5j";
+    sha256 = "08ss24xswnfcyncagqx3g7lvx536nk2qddq7nbpyvbgnc3z3i3r3";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -61,7 +61,14 @@ stdenv.mkDerivation rec {
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
-  bugfixPatches = [ ];
+  bugfixPatches = [
+    # https://trac.sagemath.org/ticket/28036
+    (fetchpatch {
+      name = "fix-infinite-loop.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=4d1cf508f9fc19f73e2ec3c82258400009e27dcf";
+      sha256 = "0pdnzsmr3c38x2i4b2pj81lmqrw5bmd24n2gkmg7bpq5jmf7kpb4";
+    })
+  ];
 
   # Patches needed because of package updates. We could just pin the versions of
   # dependencies, but that would lead to rebuilds, confusion and the burdons of
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c92c3f57b83..893ceecb024 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22952,12 +22952,6 @@ in
     ecl-fasl = true;
     sbcl = null;
   };
-  # old version temporarily kept for sage
-  maxima-ecl-5_41 = callPackage ../applications/science/math/maxima/5.41.nix {
-    ecl = ecl_16_1_2;
-    ecl-fasl = true;
-    sbcl = null;
-  };
 
   mxnet = callPackage ../applications/science/math/mxnet {
     inherit (linuxPackages) nvidia_x11;

From 409bee28b64081e3a7ec46be5e1a42f8228a3991 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 9 Jun 2019 20:15:23 +0200
Subject: [PATCH 161/377] sage: 8.8.beta7 -> 8.8.rc0

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index d88f3aa6b05..1cee1d295ea 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.beta7";
+  version = "8.8.rc0";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "08ss24xswnfcyncagqx3g7lvx536nk2qddq7nbpyvbgnc3z3i3r3";
+    sha256 = "1y1d71z5a9shhfjf9kqp4ji80mb6jxsz447hs025y444g1qjhbv8";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.

From 218fd843a34c173fdbc11bcce99349702c6e108f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 14 Jun 2019 16:10:21 +0200
Subject: [PATCH 162/377] sage: 8.8.rc0 -> 8.8.rc1

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 1cee1d295ea..25733cec2c1 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.rc0";
+  version = "8.8.rc1";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1y1d71z5a9shhfjf9kqp4ji80mb6jxsz447hs025y444g1qjhbv8";
+    sha256 = "09cdw473x95baqbdyc87wmdldiwihds45hcijyqy3d24icm4ba8h";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.

From e7d4386e0ea19572ee21d6e1fab1c411e388e608 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 20 Jun 2019 15:28:51 +0200
Subject: [PATCH 163/377] sage: 8.8.rc1 -> 8.8.rc2

---
 pkgs/applications/science/math/sage/sage-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 25733cec2c1..73134553c18 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.rc1";
+  version = "8.8.rc2";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "09cdw473x95baqbdyc87wmdldiwihds45hcijyqy3d24icm4ba8h";
+    sha256 = "1xga7brq2wql0d8klpn4wi1iciifnvkyz44vhkr6ihjv44qr169g";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.

From 5b2db39c497cad67be759c0f731abf45ec017b2b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 27 Jun 2019 22:04:25 +0200
Subject: [PATCH 164/377] sage: 8.8.rc2 -> 8.8

---
 pkgs/applications/science/math/sage/sage-src.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 73134553c18..51460154c5d 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,14 +10,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "8.8.rc2";
+  version = "8.8";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "1xga7brq2wql0d8klpn4wi1iciifnvkyz44vhkr6ihjv44qr169g";
+    sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -61,14 +61,7 @@ stdenv.mkDerivation rec {
   # Since sage unfortunately does not release bugfix releases, packagers must
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
-  bugfixPatches = [
-    # https://trac.sagemath.org/ticket/28036
-    (fetchpatch {
-      name = "fix-infinite-loop.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?id=4d1cf508f9fc19f73e2ec3c82258400009e27dcf";
-      sha256 = "0pdnzsmr3c38x2i4b2pj81lmqrw5bmd24n2gkmg7bpq5jmf7kpb4";
-    })
-  ];
+  bugfixPatches = [ ];
 
   # Patches needed because of package updates. We could just pin the versions of
   # dependencies, but that would lead to rebuilds, confusion and the burdons of

From 377a60f902ca4a941208b086a81353479b7c6116 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 22 Jun 2019 13:43:06 +0200
Subject: [PATCH 165/377] python: tensorflow: 1.13.1 -> 1.14.0,
 tensorflow-tensorboard: 1.13.0 -> 1.14.0, tensorflow-estimator: 1.13.0 ->
 1.14.0

All in one commit because the packages are all interdependent and have
to be upgraded together.
---
 .../tensorflow-estimator/default.nix          |  4 +-
 .../tensorflow-tensorboard/default.nix        |  6 +--
 .../python-modules/tensorflow/bin.nix         | 24 +++++++++--
 .../python-modules/tensorflow/prefetcher.sh   |  2 +-
 .../tensorflow/tf1.13.1-hashes.nix            | 42 -------------------
 .../tensorflow/tf1.14.0-hashes.nix            | 42 +++++++++++++++++++
 6 files changed, 68 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix
 create mode 100644 pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix

diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 3b33ac413ba..127e7560679 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "1.13.0";
+  version = "1.14.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    sha256 = "068l4w0w7dj9gqkf8avjclq9zsp7ifwzw4rpf4qjylz3hczamzbw";
+    sha256 = "14irpsyj14vn2dpwr601f54058wywci1pv0hss8s01rl0rk3y1ya";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index 7840e6de009..fa1759119c9 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "1.13.0";
+  version = "1.14.0";
   format = "wheel";
 
   src = fetchPypi ({
@@ -23,10 +23,10 @@ buildPythonPackage rec {
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2";
+    sha256 = "1z631614jk5zgasgmwfr33gz8bwv11p9f5llzlwvx3a8rnyv3q2h";
   } else {
     python = "py2";
-    sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf";
+    sha256 = "1clv29yy942l3mfar2z6wkkk6l18fz7j6mi2dfz24j9dln0scny3";
   }));
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index e4372fc2ec4..d02a4e1b9f2 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -5,6 +5,8 @@
 , isPy3k, pythonOlder
 , astor
 , gast
+, google-pasta
+, wrapt
 , numpy
 , six
 , termcolor
@@ -41,7 +43,7 @@ let
 
 in buildPythonPackage rec {
   pname = "tensorflow";
-  version = "1.13.1";
+  version = "1.14.0";
   format = "wheel";
 
   src = let
@@ -53,9 +55,23 @@ in buildPythonPackage rec {
     dls = import (./. + "/tf${version}-hashes.nix");
   in fetchurl dls.${key};
 
-  propagatedBuildInputs = [  protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]
-                 ++ lib.optional (!isPy3k) mock
-                 ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
+  propagatedBuildInputs = [
+    protobuf
+    numpy
+    termcolor
+    grpcio
+    six
+    astor
+    absl-py
+    gast
+    google-pasta
+    wrapt
+    tensorflow-estimator
+    tensorflow-tensorboard
+    keras-applications
+    keras-preprocessing
+  ] ++ lib.optional (!isPy3k) mock
+    ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
   # and the propageted input tensorflow-tensorboard which causes environment collisions.
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh
index d4ec2e757b2..3059340d127 100644
--- a/pkgs/development/python-modules/tensorflow/prefetcher.sh
+++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh
@@ -1,4 +1,4 @@
-version=1.13.1
+version=1.14.0
 hashfile=tf${version}-hashes.nix
 rm -f $hashfile
 echo "{" >> $hashfile
diff --git a/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix
deleted file mode 100644
index bbfb0632c3c..00000000000
--- a/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-linux_py_27_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp27-none-linux_x86_64.whl";
-  sha256 = "0y1vd3y5fxcjj5d35qbk8482b0s642nyp0c2sm068vx5wd4sjpcg";
-};
-linux_py_35_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "0b27swk4c2vaimwzbzl4c7xnccr9cfak5a3848lfqlcavcmbp94j";
-};
-linux_py_36_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "087jwjby3bym09z55cjhc587aasf01y6l009p1q2vcpfq7s7ljmk";
-};
-linux_py_37_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "0as68dp87lh7ffcccb149km6vws15ap04604irxwz35fq9h7grxg";
-};
-linux_py_27_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp27-none-linux_x86_64.whl";
-  sha256 = "0bf239f2bnsbqs3qh4xdql9pgbsm0zk7j8q1hg0wn0wrq440n0ds";
-};
-linux_py_35_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "1cqav22a8yz6fzk46z6kv1ha2i28h5wccbd7k66drrfxibmb93j0";
-};
-linux_py_36_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "1xnbiz36z7nicqrv0cmymfnwb8mdz2hifcv71gh6gnyi1962f2d7";
-};
-linux_py_37_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "10gcrmd9y5a89wpi4rpp9scc9l2krijv8yjp7iphlykmn54ps74k";
-};
-mac_py_2_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py2-none-any.whl";
-  sha256 = "1a6y5xj2wqkd8qmabn2xjg3q7x2jfixwrz351dgcxlhy8qy5yc0g";
-};
-mac_py_3_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py3-none-any.whl";
-  sha256 = "1klsv18k0isfd61z1wirfz1lnqmx8k73ga8g9s18yand65iycads";
-};
-}
diff --git a/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix
new file mode 100644
index 00000000000..f6b367aea38
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/tf1.14.0-hashes.nix
@@ -0,0 +1,42 @@
+{
+linux_py_27_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl";
+  sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k";
+};
+linux_py_35_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj";
+};
+linux_py_36_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44";
+};
+linux_py_37_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl";
+  sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5";
+};
+linux_py_27_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl";
+  sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5";
+};
+linux_py_35_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx";
+};
+linux_py_36_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd";
+};
+linux_py_37_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl";
+  sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2";
+};
+mac_py_2_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";
+  sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";
+};
+mac_py_3_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";
+  sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";
+};
+}

From 9a9e1fa462a28141ded55027fbeeb8f2901d6771 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 27 Jun 2019 00:21:39 +0300
Subject: [PATCH 166/377] qmapshack: 1.12.3 -> 1.13.0

---
 pkgs/applications/misc/qmapshack/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index f4983ad9442..b38369babe8 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 stdenv.mkDerivation rec {
   name = "qmapshack-${version}";
-  version = "1.12.3";
+  version = "1.13.0";
 
   src = fetchurl {
     url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
-    sha256 = "1yp5gw4q4gwiwr9w4dz19am0bhsla9n2l3bdlk98a7f46kxgnkrx";
+    sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -15,12 +15,23 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DROUTINO_XML_PATH=${routino}/share/routino"
-    "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"
+    "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"
     "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
   ];
 
   enableParallelBuilding = true;
 
+  patches = [
+    (fetchpatch {
+      url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch";
+      sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99";
+    })
+    (fetchpatch {
+      url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch";
+      sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
     description = "Plan your next outdoor trip";

From 63e6881290d04f966f2d185e8365ccdfbf30c4e7 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Thu, 27 Jun 2019 18:03:16 -0600
Subject: [PATCH 167/377] plex-media-player: 2.23.0 -> 2.36.0

---
 .../video/plex-media-player/default.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 20684354d09..9f5401fc69c 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -9,41 +9,41 @@ let
   # plex-media-player is updated, the versions for these files are changed,
   # so the build IDs (and SHAs) below will need to be updated!
   depSrcs = rec {
-    webClientBuildId = "85-88b3ac67015f76";
-    webClientDesktopBuildId = "3.77.2-7015f76";
-    webClientTvBuildId = "3.78.0-88b3ac6";
+    webClientBuildId = "129-669a5eed7ae231";
+    webClientDesktopBuildId = "3.100.1-d7ae231";
+    webClientTvBuildId = "3.105.0-669a5ee";
 
     webClient = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
-      sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
+      sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";
     };
     webClientDesktopHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
-      sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
+      sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";
     };
     webClientDesktop = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
-      sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
+      sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";
     };
     webClientTvHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
-      sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
+      sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";
     };
     webClientTv = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
-      sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
+      sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";
     };
   };
 in stdenv.mkDerivation rec {
   name = "plex-media-player-${version}";
-  version = "2.23.0.920";
-  vsnHash = "5bc1a2e5";
+  version = "2.36.0.988";
+  vsnHash = "0150ae52";
 
   src = fetchFromGitHub {
     owner = "plexinc";
     repo = "plex-media-player";
     rev = "v${version}-${vsnHash}";
-    sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
+    sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3 ];

From 072a7558708c9d37607d7383738bc6ef2584ac90 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 14:19:43 -0400
Subject: [PATCH 168/377] deepin.dde-control-center: init at 4.10.11

---
 .../deepin/dde-control-center/default.nix     | 112 ++++++++++++++++++
 .../deepin/dde-control-center/fix-paths.patch |  65 ++++++++++
 pkgs/desktops/deepin/default.nix              |   1 +
 3 files changed, 178 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dde-control-center/default.nix
 create mode 100644 pkgs/desktops/deepin/dde-control-center/fix-paths.patch

diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
new file mode 100644
index 00000000000..906812cf98b
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -0,0 +1,112 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative,
+ networkmanager, qtsvg, qtx11extras,  dtkcore, dtkwidget, geoip, gsettings-qt,
+ dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api,
+ dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus,
+ systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which,
+ substituteAll, wrapGAppsHook, tzdata
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dde-control-center";
+  version = "4.10.11";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1ip8wjwf0n9q8xnqymzh8lz0j5gcnns976n291np6k5kdh2wqhr5";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    deepin.setupHook
+    pkgconfig
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dde-api
+    dde-daemon
+    dde-network-utils
+    dde-qt-dbus-factory
+    deepin-desktop-base
+    deepin-desktop-schemas
+    dtkcore
+    dtkwidget
+    fontconfig
+    freetype
+    geoip
+    glib
+    gnome3.networkmanager-l2tp
+    gnome3.networkmanager-openconnect
+    gnome3.networkmanager-openvpn
+    gnome3.networkmanager-vpnc
+    gsettings-qt
+    mtdev
+    networkmanager-qt
+    qt5integration
+    qtbase
+    qtdeclarative
+    qtmultimedia
+    qtsvg
+    qttools
+    qtx11extras
+    xorg.libX11
+    xorg.libXext
+    xorg.libXrandr
+    xorg.libxcb
+  ];
+
+  cmakeFlags = [
+    "-DDISABLE_SYS_UPDATE=YES"
+    "-DDCC_DISABLE_GRUB=YES"
+  ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      nmcli = "${networkmanager}/bin/nmcli";
+      which = "${which}/bin/which";
+      # not packaged
+      # dman = "${deepin-manual}/bin/dman";
+      inherit tzdata;
+      # exclusive to deepin linux?
+      # allows to synchronize configuration files to cloud networks
+      # deepin_sync = "${deepin-sync}";
+    })
+  ];
+
+  postPatch = ''
+    searchHardCodedPaths
+
+    patchShebangs translate_ts2desktop.sh
+    patchShebangs translate_generation.sh
+    patchShebangs translate_desktop2ts.sh
+
+    fixPath $out /usr dde-control-center-autostart.desktop \
+      com.deepin.dde.ControlCenter.service \
+      src/frame/widgets/utils.h
+
+    substituteInPlace dde-control-center.desktop \
+      --replace "dbus-send" "${dbus}/bin/dbus-send"
+    substituteInPlace com.deepin.controlcenter.addomain.policy \
+      --replace "/bin/systemctl" "${systemd}/bin/systemctl"
+  '';
+
+  postFixup = ''
+    # debuging
+    searchForUnresolvedDLL $out
+    searchHardCodedPaths $out
+  '';
+
+  passthru.updateScript = deepin.updateScript { inherit name; };
+
+  meta = with stdenv.lib; {
+    description = "Control panel of Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/dde-control-center;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo worldofpeace ];
+  };
+}
diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
new file mode 100644
index 00000000000..2c6e204d343
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch
@@ -0,0 +1,65 @@
+diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp
+index 90d06f8..7cdad04 100644
+--- a/src/frame/frame.cpp
++++ b/src/frame/frame.cpp
+@@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e)
+ #ifdef QT_DEBUG
+     case Qt::Key_Escape:        qApp->quit();                               break;
+ #endif
+-    case Qt::Key_F1:            QProcess::startDetached("dman", QStringList("dde"));  break;
++    case Qt::Key_F1:            QProcess::startDetached("@dman@", QStringList("dde"));  break;
+     default:;
+     }
+ }
+diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp
+index 3dd4aad..5f1b363 100644
+--- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp
++++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp
+@@ -46,7 +46,7 @@ namespace installer {
+ namespace {
+ 
+ // Absolute path to zone.tab file.
+-const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab";
++const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab";
+ 
+ // Absolute path to backward timezone file.
+ const char kTimezoneAliasFile[] = "/timezone_alias";
+diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp
+index e292865..95c5a2b 100644
+--- a/src/frame/modules/network/connectionvpneditpage.cpp
++++ b/src/frame/modules/network/connectionvpneditpage.cpp
+@@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig()
+     qDebug() << Q_FUNC_INFO << args;
+ 
+     QProcess p;
+-    p.start("nmcli", args);
++    p.start("@nmcli@", args);
+     p.waitForFinished();
+     qDebug() << p.readAllStandardOutput();
+     qDebug() << p.readAllStandardError();
+diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp
+index 521a603..450d1a6 100644
+--- a/src/frame/modules/network/vpnpage.cpp
++++ b/src/frame/modules/network/vpnpage.cpp
+@@ -224,7 +224,7 @@ void VpnPage::importVPN()
+     qDebug() << args;
+ 
+     QProcess p;
+-    p.start("nmcli", args);
++    p.start("@nmcli@", args);
+     p.waitForFinished();
+     const auto stat = p.exitCode();
+     const QString output = p.readAllStandardOutput();
+diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp
+index 3f929bf..6f240d9 100644
+--- a/src/frame/modules/sync/syncworker.cpp
++++ b/src/frame/modules/sync/syncworker.cpp
+@@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent)
+ 
+     m_model->setSyncIsValid(
+         QProcess::execute(
+-            "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") ==
++            "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") ==
+             0 &&
+         valueByQSettings<bool>(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false));
+ }
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 6077591bb4f..346b0fa1ee6 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -9,6 +9,7 @@ let
     dbus-factory = callPackage ./dbus-factory { };
     dde-api = callPackage ./dde-api { };
     dde-calendar = callPackage ./dde-calendar { };
+    dde-control-center = callPackage ./dde-control-center { };
     dde-daemon = callPackage ./dde-daemon { };
     dde-dock = callPackage ./dde-dock { };
     dde-file-manager = callPackage ./dde-file-manager { };

From 8c2bcb181e9394b0b5980402eb1a6ddd1bd9e9b1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 26 Jun 2019 14:19:54 -0400
Subject: [PATCH 169/377] nixos/deepin: add dde-control-center

---
 nixos/modules/services/desktops/deepin/deepin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix
index 1e46ad83299..931bac58ace 100644
--- a/nixos/modules/services/desktops/deepin/deepin.nix
+++ b/nixos/modules/services/desktops/deepin/deepin.nix
@@ -33,6 +33,7 @@
       environment.systemPackages = [
         pkgs.deepin.dde-api
         pkgs.deepin.dde-calendar
+        pkgs.deepin.dde-control-center
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
         pkgs.deepin.dde-launcher
@@ -46,6 +47,7 @@
       services.dbus.packages = [
         pkgs.deepin.dde-api
         pkgs.deepin.dde-calendar
+        pkgs.deepin.dde-control-center
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
         pkgs.deepin.dde-launcher

From bfc789118b8ff4a973d5c8aacc763fb9e345455e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 28 Jun 2019 03:24:10 +0000
Subject: [PATCH 170/377] openmpi: fix segfault in btl vader at MPI_Finalize

The fix is scheduled for release in OpenMPI 4.0.2.

Upstream issue: https://github.com/open-mpi/ompi/issues/6524
---
 pkgs/development/libraries/openmpi/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 61d42e4452f..e597a26dad9 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl, libnl
+{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
 , rdma-core, zlib, numactl, libevent, hwloc
 
 # Enable the Sun Grid Engine bindings
@@ -19,6 +19,14 @@ in stdenv.mkDerivation rec {
     sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "openmpi-mca_btl_vader_component_close-segfault.patch";
+      url = "https://github.com/open-mpi/ompi/pull/6526.patch";
+      sha256 = "0s7ac9rkcj3fi6ampkvy76njlj478yyr4zvypjc7licy6dgr595x";
+    })
+  ];
+
   postPatch = ''
     patchShebangs ./
   '';

From 02d750348ad7bae0dc1cc42469c1066c4fa1ba6c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 28 Jun 2019 03:38:28 +0000
Subject: [PATCH 171/377] pythonPackages.mpi4py: 3.0.1 -> 3.0.2

---
 pkgs/development/python-modules/mpi4py/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index f003a04e55e..e2028d9332b 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,24 +1,18 @@
-{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
+{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
 
 buildPythonPackage rec {
   pname = "mpi4py";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5";
+    sha256 = "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq";
   };
 
   passthru = {
     inherit mpi;
   };
 
-  patches = [ ( fetchpatch {
-    # Upstream patch to ensure compatibility with openmpi-4.0.1
-    url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch";
-    sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72";
-  })];
-
   postPatch = ''
     substituteInPlace test/test_spawn.py --replace \
                       "unittest.skipMPI('openmpi(<3.0.0)')" \

From 5ba41e5940a4c72cfa9b085e3be84a629ca02cac Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 28 Jun 2019 01:31:41 -0500
Subject: [PATCH 172/377] nodejs-12_x: 12.4.0 -> 12.5.0

---
 pkgs/development/web/nodejs/v12.nix | 4 ++--
 pkgs/top-level/all-packages.nix     | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index 1ad8b3206d2..ae74764384c 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.4.0";
-    sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90";
+    version = "12.5.0";
+    sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7";
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b2f881fc1e..f0d94f1b873 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4240,12 +4240,10 @@ in
   };
   nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
     openssl = openssl_1_1;
-    icu = icu63;
   };
   nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
     enableNpm = false;
     openssl = openssl_1_1;
-    icu = icu63;
   };
 
   # Update this when adding the newest nodejs major version!

From 8a1c8e6158d6c056e3eeec4b37bff72e3712ca42 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 26 Jun 2019 12:48:12 +0100
Subject: [PATCH 173/377] conda: Remove version suffix

Currently the `conda-shell` binary is installed as
`conda-shell-4.6.14` which is not very friendly to type.

With this change the binary is simply installed as `conda-shell`.
---
 pkgs/tools/package-management/conda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix
index ecc520b6e42..5ddcee6d1d3 100644
--- a/pkgs/tools/package-management/conda/default.nix
+++ b/pkgs/tools/package-management/conda/default.nix
@@ -48,7 +48,7 @@ let
     '';
 in
   buildFHSUserEnv {
-    name = "conda-shell-${version}";
+    name = "conda-shell";
     targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]);
     profile = ''
       # Add conda to PATH

From 74e217e6af5ea11a72a129dc4fd11e86f46b8a91 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 28 Jun 2019 11:34:45 +0100
Subject: [PATCH 174/377] pythonPackages.datadog: 0.26.0 -> 0.29.3

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

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 2c3cd4a3e01..fa0ac9dd7b4 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.26.0";
+  version = "0.29.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";
+    sha256 = "0p47hy1p2hf233blalyz0yr6nf13iwk9ndkqdk428dmf8b8m2plr";
   };
 
   postPatch = ''

From 866bfbc3a3f2f170c866e9e9a9a7c1f194a6ee7d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jun 2019 07:52:12 -0400
Subject: [PATCH 175/377] linux: 4.14.130 -> 4.14.131

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 91fdf0421aa..d62669cc4cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.130";
+  version = "4.14.131";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0najfj0m8s61hjyag4ll6bvv1y4d03dbgm137fmvfq4szx891ji9";
+    sha256 = "1xcg7ij3r6271qmcymaxprqa8qvdddkh5f8m6gza3agl61641xhr";
   };
 } // (args.argsOverride or {}))

From 8e1c89a62d824c3ae9cd2144f60979fcc260e50d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jun 2019 07:52:38 -0400
Subject: [PATCH 176/377] linux: 4.4.183 -> 4.4.184

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7b5943b87f2..a80e578c75b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.183";
+  version = "4.4.184";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "10ic3ldn3p95y0qrl91j5kjqjp18k30xvpgw7mmc1g7lgi2r8j2h";
+    sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5";
   };
 } // (args.argsOverride or {}))

From 7fc5ecf9a2c2ba7fbf2b9444c29c88ba21ca82a2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jun 2019 07:52:58 -0400
Subject: [PATCH 177/377] linux: 4.9.183 -> 4.9.184

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index bf1f00f71c8..4f054dcc665 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.183";
+  version = "4.9.184";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1wv753a9z99nvvw881j6fxd6imk88xm3aq626gly5x6v3jcv0mzx";
+    sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83";
   };
 } // (args.argsOverride or {}))

From 2cbaf5b75c10cc2c1442fc34314ca5621bc87ec6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jun 2019 07:57:58 -0400
Subject: [PATCH 178/377] oh-my-zsh: 2019-06-15 -> 2019-06-27

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 9f8d9e07ad1..d51ee1982fa 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-06-15";
+  version = "2019-06-27";
   name = "oh-my-zsh-${version}";
-  rev = "c105c04b6b1ddb917c12eadacb26c252f44ddfad";
+  rev = "7b2c4327e7d40ec17b72fe7fce3031dfc92fb165";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0b3mdiygqvxgikaa95ixhnr6rib3wllls54hv7h50g4f86jhj62b";
+    sha256 = "13k5jnr4i227b2ipfaslax2yr7r8scd50mrsywfnzidsxcq13096";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 91afe56e92c98a94c485dcb62237a3bda479122d Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@satoshilabs.com>
Date: Fri, 28 Jun 2019 14:17:55 +0200
Subject: [PATCH 179/377] gomuks: 2018-07-10 -> 2019-06-28

---
 .../instant-messengers/gomuks/default.nix      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 8e85be831a0..5e6e2f9b8d8 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, buildGo110Package, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGo110Package rec {
-  name = "gomuks-${version}";
-  version = "2018-07-10";
+buildGoModule rec {
+  pname = "gomuks";
+  version = "2019-06-28";
 
   goPackagePath = "maunium.net/go/gomuks";
 
   src = fetchFromGitHub {
     owner = "tulir";
-    repo = "gomuks";
-    rev = "68db26bcace31297471641fe95f8882e301f5699";
-    sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6";
+    repo = pname;
+    rev = "37df8eb454088e61db7a14f382851205bc1806ad";
+    sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g";
   };
 
+  modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws";
+
   meta = with stdenv.lib; {
-    homepage = https://maunium.net/go/gomuks/;
+    homepage = "https://maunium.net/go/gomuks/";
     description = "A terminal based Matrix client written in Go";
     license = licenses.gpl3;
     maintainers = with maintainers; [ tilpner ];

From 9d9eb87c196e7164201e9cc96f0c16bdc41859fb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 20 Jun 2019 18:09:58 +0300
Subject: [PATCH 180/377] openjfx11: init at 11.0.3+1

---
 pkgs/development/compilers/openjdk/11.nix     |   2 +
 .../compilers/openjdk/openjfx/11.nix          | 110 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   9 ++
 3 files changed, 121 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/openjfx/11.nix

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 415dacc662a..3f593dbcd6d 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -4,6 +4,7 @@
 , libjpeg, giflib
 , setJavaClassPath
 , minimal ? false
+, enableJavaFX ? true, openjfx
 , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
 }:
 
@@ -68,6 +69,7 @@ let
     ''
     + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
     + lib.optionalString minimal " \"--enable-headless-only\""
+    + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
     + ");"
     # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
     # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
new file mode 100644
index 00000000000..4ee007281e2
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -0,0 +1,110 @@
+{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
+, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+
+let
+  major = "11";
+  update = ".0.3";
+  build = "1";
+  repover = "${major}${update}+${build}";
+  gradle_ = (gradleGen.override {
+    jdk = bootjdk;
+  }).gradle_4_10;
+
+  makePackage = args: stdenv.mkDerivation ({
+    version = "${major}${update}-${repover}";
+
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
+      sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
+    };
+
+    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+    nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
+
+    dontUseCmakeConfigure = true;
+
+    config = writeText "gradle.properties" (''
+      CONF = Release
+      JDK_HOME = ${bootjdk}/lib/openjdk
+    '' + args.gradleProperties or "");
+
+    buildPhase = ''
+      runHook preBuild
+
+      export GRADLE_USER_HOME=$(mktemp -d)
+      ln -s $config gradle.properties
+      export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
+      gradle --no-daemon $gradleFlags sdk
+
+      runHook postBuild
+    '';
+  } // args);
+
+  # Fake build to pre-download deps into fixed-output derivation.
+  # We run nearly full build because I see no other way to download everything that's needed.
+  # Anyone who knows a better way?
+  deps = makePackage {
+    pname = "openjfx-deps";
+
+    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+    installPhase = ''
+      find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+      rm -rf $out/tmp
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash =
+      # Downloaded AWT jars differ by platform.
+      if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"
+      else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"
+      else throw "Unsupported platform";
+  };
+
+in makePackage {
+  pname = "openjfx-modular-sdk";
+
+  gradleProperties = ''
+    COMPILE_MEDIA = true
+    COMPILE_WEBKIT = true
+  '';
+
+  preBuild = ''
+    swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
+    substituteInPlace build.gradle \
+      --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
+      --replace 'name: SWT_FILE_NAME' "files('$swtJar')"
+  '';
+
+  installPhase = ''
+    cp -r build/modular-sdk $out
+  '';
+
+  stripDebugList = [ "." ];
+
+  postFixup = ''
+    # Remove references to bootstrap.
+    find "$out" -name \*.so | while read lib; do
+      new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+      patchelf --set-rpath "$new_refs" "$lib"
+    done
+
+    # Test to make sure that we don't depend on the bootstrap
+    if grep -q -r '${bootjdk}' "$out"; then
+      echo "Extraneous references to ${bootjdk} detected" >&2
+      exit 1
+    fi
+  '';
+
+  passthru.deps = deps;
+
+  meta = with stdenv.lib; {
+    homepage = http://openjdk.java.net/projects/openjfx/;
+    license = openjdk.meta.license;
+    description = "The next-generation Java client toolkit.";
+    maintainers = with maintainers; [ abbradar ];
+    platforms = openjdk.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d62b689218f..e8e4beac924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7679,6 +7679,14 @@ in
 
   bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
 
+  openjfx11 =
+    if stdenv.isDarwin then
+      null
+    else
+      callPackage ../development/compilers/openjdk/openjfx/11.nix {
+        openjdk = openjdk11;
+      };
+
   openjdk8 =
     if stdenv.isDarwin then
       callPackage ../development/compilers/openjdk/darwin/8.nix { }
@@ -7693,6 +7701,7 @@ in
       callPackage ../development/compilers/openjdk/darwin/11.nix { }
     else
       callPackage ../development/compilers/openjdk/11.nix {
+        openjfx = openjfx11;
         inherit (gnome2) GConf gnome_vfs;
       };
 

From 5a5245ed8d5a4ca7508e81466366a4f247fbf2b2 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Fri, 28 Jun 2019 10:46:31 +0800
Subject: [PATCH 181/377] youtube-dl: 2019.06.21 -> 2019.06.27

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 866401d562c..aedefcc54b0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2019.06.21";
+  version = "2019.06.27";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "03a729198zzhixbn7xixi9bprmk3qqh5dsyh3dqhji6lmlijx1w5";
+    sha256 = "1kxqiyhhgv0n85jc02kai5i6wdjs1696k88q1phq7ik2y6ky3c7y";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 62ef555a967723fe76b20fc11edf3de3c35d0c59 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 28 Jun 2019 15:56:58 +0300
Subject: [PATCH 182/377] lutris: use wineWowPackages

They are built by Hydra.
---
 pkgs/applications/misc/lutris/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 1009c2e6506..5a74bd931c0 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -103,7 +103,7 @@ let
     perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
     samba4 sane-backends openldap opencl-headers ocl-icd utillinux
 
-    (wine.override { wineBuild = "wineWow"; })
+    wineWowPackages.staging
 
     # ZDOOM
     soundfont-fluid bzip2 game-music-emu

From 67ea4fcd3b4c06216951778c004371a3186512b7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 28 Jun 2019 16:54:01 +0300
Subject: [PATCH 183/377] intel-media-driver: disable tests

Works only on hosts with suitable CPUs.

Fixes Hydra failures:
https://hydra.nixos.org/build/95442132
---
 pkgs/development/libraries/intel-media-driver/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index a362b1ac634..0ee66c9050c 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DINSTALL_DRIVER_SYSCONF=OFF"
     "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"
+    # Works only on hosts with suitable CPUs.
+    "-DMEDIA_RUN_TEST_SUITE=OFF"
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];

From d24aefd52f75f0854a417c3adf02c9d310c23157 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Jun 2019 15:33:06 +0200
Subject: [PATCH 184/377] jekyll: Improve the "jekyll new" experience

See https://github.com/NixOS/nixpkgs/issues/58126 for more details.

This will instruct the user how to manually finish the setup instead of
failing with error messages (unfortunately it is quite a bit hacky
though...).

Extra note:
We cannot use "bundle config --local" due to BUNDLE_GEMFILE (would
attempt to create .bundle/config in the Nix store) and manually creating
.bundle/config doesn't work either as these configuration variables are
still overwritten by the environment variables, even though this
shouldn't be the case [0].

[0]: https://bundler.io/v2.0/man/bundle-config.1.html
---
 pkgs/applications/misc/jekyll/default.nix | 27 ++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 34cf0e21db7..9ae9ab254e8 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,8 +1,27 @@
 { lib, bundlerApp, ruby
+, writeShellScriptBin, makeWrapper
 , withOptionalDependencies ? false
 }:
 
-bundlerApp rec {
+let
+  rubyWrapper = writeShellScriptBin "ruby" ''
+    if [[ "$#" -eq 2 ]]; then
+      if [[ "''${1##*/}" == "bundle" && "$2" == "install" ]]; then
+        # See https://github.com/NixOS/nixpkgs/issues/58126 for more details.
+        echo 'Skipping "bundle install" as it fails due to the Nix wrapper.'
+        echo 'Please enter the new directory and run the following commands to serve the page:'
+        echo 'nix-shell -p bundler --run "bundle install --gemfile=Gemfile --path vendor/cache"'
+        echo 'nix-shell -p bundler --run "bundle exec jekyll serve"'
+        exit 0
+        # The following nearly works:
+        unset BUNDLE_FROZEN
+        exec ${ruby}/bin/ruby "$@" --gemfile=Gemfile --path=vendor/cache
+      fi
+    fi
+    # Else: Don't modify the arguments:
+    exec ${ruby}/bin/ruby "$@"
+  '';
+in bundlerApp rec {
   pname = "jekyll";
   exes = [ "jekyll" ];
 
@@ -11,6 +30,12 @@ bundlerApp rec {
     then ./full
     else ./basic;
 
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin
+  '';
+
   meta = with lib; {
     description = "A blog-aware, static site generator, written in Ruby";
     longDescription = ''

From 6f0b781bc1c87c908407ff31c2cb30e6429b2795 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 28 Jun 2019 17:46:23 +0300
Subject: [PATCH 185/377] virtualbox: enable Java bindings

Almost doesn't affect closure size:

Before:
/nix/store/0l23ahih0wzm39q7vgch9v86pw28shdh-virtualbox-6.0.8	 545.9M

After:
/nix/store/s7c6jgf6p0w64fxxh9iik9yi1rsmf2jz-virtualbox-6.0.8	 546.6M
---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 63957eab974..b36d918a803 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -4,7 +4,7 @@
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, nettools, dbus
 , makeself, perl
-, javaBindings ? false, jdk ? null
+, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
 , pythonBindings ? false, python3 ? null
 , extensionPack ? null, fakeroot ? null
 , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null

From 241ffca67dbc48ec0ad089384dda3e360a2264ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 28 Jun 2019 17:23:12 +0200
Subject: [PATCH 186/377] linux_testing_hardened: fix modDirVersion

and bring the linux-testing expression closer to the other versions.
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 095b63b968b..bf0161ab033 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,10 +1,14 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
 
 buildLinux (args // rec {
   version = "5.2-rc6";
-  modDirVersion = "5.2.0-rc6";
   extraMeta.branch = "5.2";
 
+  # modDirVersion needs to be x.y.z, will always add .0
+  modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
+
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
     sha256 = "15lwy9596v5sw8c6mhpl9ilfcmm39snvvyajg08ycsg61i2s58v0";

From 255686e8fc327e9a56cbdb27f6d65f180cb168a8 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 15:15:38 +0200
Subject: [PATCH 187/377] bzildBazelPackage: fix fetch with no markers

Previously the installPhase of the fixed ouput derivation would fail for
a package that has no markers, since `sed` would complain about having
no input files. If we use `find` instead of bash globs, that problem
goes away.
---
 pkgs/build-support/build-bazel-package/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 1004a7ce3f9..c0ad4a6a38e 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -51,8 +51,10 @@ in stdenv.mkDerivation (fBuildAttrs // {
       rm -rf $bazelOut/external/{local_*,\@local_*}
 
       # Patching markers to make them deterministic
-      sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker
-      sed -i '/^ENV:TMP.*/d' $bazelOut/external/\@*.marker
+      find $bazelOut/external -name '@*\.marker' -exec sed -i \
+        -e 's, -\?[0-9][0-9]*$, 1,' \
+        -e '/^ENV:TMP.*/d' \
+        '{}' \;
 
       # Remove all vcs files
       rm -rf $(find $bazelOut/external -type d -name .git)

From 34387bcf5bc41042b3b08fadafd009d37aac2e5f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 15:23:50 +0200
Subject: [PATCH 188/377] buildBazelPackage: fix preConfigure without
 dependencies

---
 pkgs/build-support/build-bazel-package/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index c0ad4a6a38e..7c9fc83e0f1 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -88,8 +88,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
   '';
 
   preConfigure = ''
-    mkdir -p $bazelOut/external
-    cp -r $deps/* $bazelOut/external
+    mkdir -p "$bazelOut"
+    cp -r $deps $bazelOut/external
     chmod -R +w $bazelOut
     find $bazelOut -type l | while read symlink; do
       ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"

From 43c62fd3c9bced13aafd228e85a3eb234cfaa382 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 17:03:01 +0200
Subject: [PATCH 189/377] python.pkgs.tensorflow-probability: use bazel

Fixes the tensorflow-probability built by first building the wheel with
bazel. This actually creates the dist-info folder, allowing the package
to be picked up as a pip dependency.
---
 .../tensorflow-probability/default.nix        | 62 ++++++++++++++++---
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 4b0e6e7722f..0f03adfccf5 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -1,8 +1,13 @@
 { lib
 , fetchFromGitHub
+, buildBazelPackage
 , buildPythonPackage
 , python
+, setuptools
+, wheel
 , tensorflow
+, six
+, numpy
 , decorator
 , cloudpickle
 , hypothesis
@@ -12,19 +17,62 @@
 , pytest
 }:
 
-buildPythonPackage rec {
-  pname = "tensorflow-probability";
+let
   version = "0.7";
+  pname = "tensorflow_probability";
 
-  src = fetchFromGitHub {
-    owner = "tensorflow";
-    repo = "probability";
-    rev = "v${version}";
-    sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
+  # first build all binaries and generate setup.py using bazel
+  bazel-wheel = buildBazelPackage {
+    name = "${pname}-${version}-py2.py3-none-any.whl";
+
+    src = fetchFromGitHub {
+      owner = "tensorflow";
+      repo = "probability";
+      rev = "v${version}";
+      sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
+    };
+
+    nativeBuildInputs = [
+      # needed to create the output wheel in installPhase
+      python
+      setuptools
+      wheel
+    ];
+
+    bazelTarget = ":pip_pkg";
+
+    fetchAttrs = {
+      sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+    };
+
+    buildAttrs = {
+      preBuild = ''
+        patchShebangs .
+      '';
+
+      installPhase = ''
+        # work around timestamp issues
+        # https://github.com/NixOS/nixpkgs/issues/270#issuecomment-467583872
+        export SOURCE_DATE_EPOCH=315532800
+
+        # First build, then move. Otherwise pip_pkg would create the dir $out
+        # and then put the wheel in that directory. However we want $out to
+        # point directly to the wheel file.
+        ./bazel-bin/pip_pkg . --release
+        mv *.whl "$out"
+      '';
+    };
   };
+in buildPythonPackage rec {
+  inherit version pname;
+  format = "wheel";
+
+  src = bazel-wheel;
 
   propagatedBuildInputs = [
     tensorflow
+    six
+    numpy
     decorator
     cloudpickle
   ];

From 79c5510f521f3f7eada826a7b13967bb3e67d381 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 26 Jun 2019 12:26:39 +0200
Subject: [PATCH 190/377] python.pkgs.dm-sonnet: 1.30 -> 1.33

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

diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 41dc30e4719..c10dafdabc6 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  version = "1.30";
+  version = "1.33";
 
   # first build all binaries and generate setup.py using bazel
   bazel-build = buildBazelPackage rec {
@@ -25,7 +25,7 @@ let
       owner = "deepmind";
       repo = "sonnet";
       rev = "v${version}";
-      sha256 = "1dli4a4arx2gmb4p676pfibvnpag9f13znisrk9381g7xpqqmaw6";
+      sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc";
     };
 
     nativeBuildInputs = [

From d973aa931ee63be9635c7c4bd40ca5bf3ad55817 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 28 Jun 2019 23:23:38 +0200
Subject: [PATCH 191/377] python.pkgs.baselines: 0.1.5 -> 0.1.6 (#63903)

---
 .../python-modules/baselines/default.nix      | 25 +++++++++++--------
 .../baselines/fix-dep-names.patch             | 18 -------------
 2 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/baselines/fix-dep-names.patch

diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index 2fd58010f5a..a210b5b44aa 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , gym
 , scipy
@@ -17,18 +17,16 @@
 
 buildPythonPackage rec {
   pname = "baselines";
-  version = "0.1.5";
+  version = "0.1.6"; # remember to manually adjust the rev
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";
+  src = fetchFromGitHub {
+    owner = "openai";
+    repo = "baselines";
+    # Unfortunately releases are not tagged. This commit bumps the version in setup.py
+    rev = "2bca7901f51c88cdef3ca0666c6a87c454a4dbe8";
+    sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";
   };
 
-  patches = [
-    # already fixed upstream
-    ./fix-dep-names.patch
-  ];
-
   propagatedBuildInputs = [
     gym
     scipy
@@ -43,6 +41,13 @@ buildPythonPackage rec {
     click
   ];
 
+  postPatch = ''
+    # Needed for the atari wrapper, but the gym-atari package is not supported
+    # in nixos anyways. Since opencv-python is not currently packaged, we
+    # disable it.
+    sed -ie '/opencv-python/d' setup.py
+  '';
+
   # fails to create a daemon, probably because of sandboxing
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/baselines/fix-dep-names.patch b/pkgs/development/python-modules/baselines/fix-dep-names.patch
deleted file mode 100644
index 5b0de29247a..00000000000
--- a/pkgs/development/python-modules/baselines/fix-dep-names.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index bf8badc..570be20 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,11 +10,11 @@ setup(name='baselines',
-       packages=[package for package in find_packages()
-                 if package.startswith('baselines')],
-       install_requires=[
--          'gym[mujoco,atari,classic_control,robotics]',
-+          'gym',
-           'scipy',
-           'tqdm',
-           'joblib',
--          'zmq',
-+          'pyzmq',
-           'dill',
-           'progressbar2',
-           'mpi4py',

From 1b019ba91d6c0f4d8d5877ad932f8a91cc92950a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Jun 2019 23:24:11 +0200
Subject: [PATCH 192/377] stellarium: 0.19.0 -> 0.19.1

https://github.com/Stellarium/stellarium/releases/tag/v0.19.1
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index fb796341616..2480b80316e 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   name = "stellarium-${version}";
-  version = "0.19.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${version}";
-    sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c";
+    sha256 = "0hf1wv2bb5j7ny2xh29mj9m4hjblhn02zylay8gl85w7xlqs7s5r";
   };
 
   nativeBuildInputs = [ cmake perl ];

From 50b70f8797d091eef50b860c213b8316124ed82f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Jun 2019 17:42:17 -0400
Subject: [PATCH 193/377] fractal: fix build with gstreamer 1.16.0

---
 .../networking/instant-messengers/fractal/default.nix  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 69580245fa9..bb8b721a8ac 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
-, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
+, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:
 
 rustPlatform.buildRustPackage rec {
   version = "4.0.0";
@@ -21,6 +21,14 @@ rustPlatform.buildRustPackage rec {
     gtksourceview hicolor-icon-theme libsecret
   ];
 
+  patches = [
+    # Fixes build with >= gstreamer 1.15.1
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";
+      sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";
+    })
+  ];
+
   postPatch = ''
     patchShebangs scripts/meson_post_install.py
   '';

From 33a6fceefafdd14291f93342f369d24fbca09730 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 28 Jun 2019 23:46:27 +0200
Subject: [PATCH 194/377] maintainers: add betaboon

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c5ab50ba5e3..2929ed5a571 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -681,6 +681,11 @@
     github = "bergey";
     name = "Daniel Bergey";
   };
+  betaboon = {
+    email = "betaboon@0x80.ninja";
+    github = "betaboon";
+    name = "betaboon";
+  };
   bfortz = {
     email = "bernard.fortz@gmail.com";
     github = "bfortz";

From e0e865f7874f72de979b5d1af53c17487947e613 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 28 Jun 2019 23:48:13 +0200
Subject: [PATCH 195/377] vivaldi-ffmpeg-codecs: 72.0.3626.122 -> 74.0.3729.169

---
 .../networking/browsers/vivaldi/default.nix   |  4 +-
 .../browsers/vivaldi/ffmpeg-codecs.nix        | 43 +++++--------------
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d58231efcd4..26ab2d8c411 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -50,8 +50,8 @@ in stdenv.mkDerivation rec {
       --set-rpath "${libPath}" \
       opt/${vivaldiName}/vivaldi-bin
   '' + stdenv.lib.optionalString proprietaryCodecs ''
-    sed -i '/^VIVALDI_FFMPEG_FOUND/ a \
-    checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/${vivaldiName}/vivaldi
+    sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \
+      VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/vivaldi
   '' + ''
     echo "Finished patching Vivaldi binaries"
   '';
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index ec2646440b3..3207409a6ba 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,53 +1,32 @@
 { stdenv, fetchurl
-, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
-, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
+, dpkg
 }:
 
 stdenv.mkDerivation rec {
-  name = "${product}-${version}";
-  product = "vivaldi-ffmpeg-codecs";
-  version = "72.0.3626.122";
+  name = "chromium-codecs-ffmpeg";
+  version = "74.0.3729.169";
 
   src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf";
+    url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb";
+    sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc";
   };
 
-  buildInputs = [ ];
+  buildInputs = [ dpkg ];
 
-  nativeBuildInputs = [
-    gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
-    pkgconfig dbus-glib at-spi2-core.dev
-  ];
-
-  patches = [
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
-    gn gen out/Release -v --args="$args"
-
-    runHook postConfigure
+  unpackPhase = ''
+    dpkg-deb -x $src .
+    find .
   '';
 
-  buildPhase = ''
-    ninja -C out/Release -v libffmpeg.so
-  '';
-
-  dontStrip = true;
-
   installPhase = ''
-    mkdir -p "$out/lib"
-    cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"
+    install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so
   '';
 
   meta = with stdenv.lib; {
     description = "Additional support for proprietary codecs for Vivaldi";
     homepage    = "https://ffmpeg.org/";
     license     = licenses.lgpl21;
-    maintainers = with maintainers; [ lluchs ];
+    maintainers = with maintainers; [ betaboon lluchs ];
     platforms   = [ "x86_64-linux" ];
   };
 }

From 1ab2e927a6398822e9888347237b2a178326258e Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Fri, 28 Jun 2019 23:52:03 +0200
Subject: [PATCH 196/377] vivaldi-widevine: init at 4.10.1196.0

---
 .../networking/browsers/vivaldi/default.nix   |  9 ++++--
 .../networking/browsers/vivaldi/widevine.nix  | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/vivaldi/widevine.nix

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 26ab2d8c411..ee477af8d49 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -9,6 +9,7 @@
 , patchelf, makeWrapper
 , isSnapshot ? false
 , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
+, enableWidevine ? false, vivaldi-widevine ? null
 }:
 
 let
@@ -51,7 +52,7 @@ in stdenv.mkDerivation rec {
       opt/${vivaldiName}/vivaldi-bin
   '' + stdenv.lib.optionalString proprietaryCodecs ''
     sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \
-      VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/vivaldi
+      VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}
   '' + ''
     echo "Finished patching Vivaldi binaries"
   '';
@@ -76,7 +77,11 @@ in stdenv.mkDerivation rec {
         "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
     done
     wrapProgram "$out/bin/vivaldi" \
-      --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
+      --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
+      ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
+  '' + stdenv.lib.optionalString enableWidevine ''
+    rm $out/opt/${vivaldiName}/libwidevinecdm.so
+    ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
new file mode 100644
index 00000000000..a21de1acad2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+  name = "widevine";
+  version = "4.10.1196.0";
+
+  src = fetchurl {
+    url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
+    sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y";
+  };
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    unzip $src libwidevinecdm.so
+    find .
+  '';
+
+  installPhase = ''
+    install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Widevine support for Vivaldi";
+    homepage = "https://www.widevine.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ betaboon ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07cf31e9d8e..54f2cab11d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19536,6 +19536,8 @@ in
 
   vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
 
+  vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { };
+
   openmpt123 = callPackage ../applications/audio/openmpt123 { };
 
   opusfile = callPackage ../applications/audio/opusfile { };

From 8ac0f575d9a7f9420bcc1994b5dbb204cff819bf Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 29 Jun 2019 01:06:32 +0100
Subject: [PATCH 197/377] libvirt: 5.3.0 -> 5.4.0

including parallel bumps of pythonPackages.libvirt and perlPackages.SysVirt

also include patches for CVE-2019-10161, CVE-2019-10166, CVE-2019-10167
and CVE-2019-10168
---
 .../development/libraries/libvirt/default.nix | 32 ++++++++++++++++---
 .../python-modules/libvirt/default.nix        |  4 +--
 pkgs/top-level/perl-packages.nix              |  6 ++--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 181fad05a0b..c559d3f8407 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit
-, pkgconfig, makeWrapper, libtool, autoconf, automake
+, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -17,22 +17,46 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "00f1blazv589cbfc85p4347x68kr45mz1r37z9bkjyw10vavsr45";
+        sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "10amj2aibc1cywiwn989n09sdngiw8ghp5jvdr7lwh9wdb0a3r57";
+        sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
         fetchSubmodules = true;
       };
 
+  patches = optionals (!stdenv.isDarwin) [
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10161.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
+      sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
+    })
+  ] ++ [
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10166.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
+      sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
+    })
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10167.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
+      sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
+    })
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10168.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
+      sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
+    })
+  ];
+
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index c1386085f36..f4a07b9635f 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "1l2a0gxmf071rd198c1z0ls3idr30i0aarf04bi9v705zdv90sxa";
+    sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aedef3cee00..0f3f93e790b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14674,12 +14674,12 @@ let
   };
 
   SysVirt = buildPerlModule rec {
-    version = "5.3.0";
+    version = "5.4.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
-      rev = "a1e85f96e3897f56e8686e9312c69de764f5a48c"; # there is no "v5.3.0" tag
-      sha256 = "1w80bhsdpcrk99cv355jyhl510a0nawnn9adffwj50a59ka77ihw";
+      rev = "v${version}";
+      sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From c936d5975b6cd2d4405c0b21cd9d4f6ac9f94e46 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Jun 2019 09:45:55 -0500
Subject: [PATCH 198/377] tflint: 0.8.3 -> 0.9.0 (#63910)

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

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 7c320c3ea03..aab6869ecb8 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0kqlwncsxssi1jchmrg1wmv7dknp0shx33j7kkryy12wdxxcbwyb";
+    sha256 = "1k050kcgvy21jk01mkgscfl7hlfgaa1621920w111fghqxibssan";
   };
 
-  modSha256 = "1j5hjr4l4ivvhrywk286zczsn9balaaq5l5qx4ga4v0llwspmygm";
+  modSha256 = "17pm6v34gya8bgz8g5hh1cijjldk78j53x9yvsjpcjnqm7l0clcd";
 
   subPackages = [ "." ];
 

From 92453c4bcc908894f68fa10905644a56a6f24b7c Mon Sep 17 00:00:00 2001
From: bricewge <brice.wge@gmail.com>
Date: Sat, 29 Jun 2019 16:46:31 +0200
Subject: [PATCH 199/377] stow: 2.2.2 -> 2.3.0 (#63917)

---
 pkgs/tools/misc/stow/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index 0a460b3c476..a4d322ae184 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchurl, perl, perlPackages }:
+{ stdenv, fetchurl, perl, perlPackages, makeWrapper }:
 
 let
-  version = "2.2.2";
+  pname = "stow";
+  version = "2.3.0";
 in
 stdenv.mkDerivation {
-  name = "stow-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/stow/stow-${version}.tar.bz2";
-    sha256 = "1zd6g9cm3whvy5f87j81j4npl7q6kxl25f7z7p9ahiqfjqs200m0";
+    sha256 = "1fnn83wwx3yaxpqkq8xyya3aiibz19fwrfj30nsiikm7igmwgiv5";
   };
 
-  buildInputs = with perlPackages; [ perl IOStringy TestOutput ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = with perlPackages; [ perl IOStringy TestOutput HashMerge Clone CloneChoose ];
+
+  postFixup = ''
+    wrapProgram "$out"/bin/stow \
+    --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; makePerlPath [
+      HashMerge Clone CloneChoose
+    ]}"
+  '';
 
   doCheck = true;
 

From 72508487c9e1e6ae15c55e19f2e5760f8fb14bb6 Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <izorkin@elven.pw>
Date: Sat, 29 Jun 2019 17:47:21 +0300
Subject: [PATCH 200/377] syslog-ng: 3.21.1 -> 3.22.1 (#63902)

---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 6999be1c92f..dcc9942a061 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.21.1";
+  version = "3.22.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld";
+    sha256 = "1j3l9pn3lf9w87vvwbnxk098gprbqzmfpfw1rch46mgsfqvl8mh6";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From 138c2cb7b164cc1e55e08b850ce10d6c5f57acdd Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <izorkin@elven.pw>
Date: Sat, 29 Jun 2019 17:47:54 +0300
Subject: [PATCH 201/377] znc: 1.7.3 -> 1.7.4 (#63901)

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

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index deb768e6feb..08fa53a6e38 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y";
+    sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 4e5b10d98c98a3c1baee664c37896057ee12e7c0 Mon Sep 17 00:00:00 2001
From: Erik Nygren <dev@erik.work>
Date: Sat, 29 Jun 2019 16:50:02 +0200
Subject: [PATCH 202/377] trivial-builders: Fix writeShellScript example
 (#63888)

---
 pkgs/build-support/trivial-builders.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index b66c1d9e4d1..5706a98f600 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -143,7 +143,7 @@ rec {
    * Automatically includes interpreter above the contents passed.
    *
    * Example:
-   * # Writes my-file to /nix/store/<store path>/my-file and makes executable.
+   * # Writes my-file to /nix/store/<store path> and makes executable.
    * writeShellScript "my-file"
    *   ''
    *   Contents of File

From fe6bb17872a3b22ca9ce35b0fafd5acb3bab2e3a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 29 Jun 2019 17:52:22 +0200
Subject: [PATCH 203/377] Add missing semicolon (#63919)

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 nixos/doc/manual/configuration/ipv6-config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index e9ab7cce4eb..675a5d9a260 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -39,7 +39,7 @@
 <xref linkend="opt-networking.defaultGateway6"/> = {
   address = "fe00::1";
   interface = "enp0s3";
-}
+};
 </programlisting>
  </para>
 

From e231b5849029431a4f7b3b68ba3f86c8d3cc9c93 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <stoile@anderedomain.de>
Date: Sat, 29 Jun 2019 18:24:59 +0200
Subject: [PATCH 204/377] factorio: experimental 0.17.32 -> 0.17.52 (#63890)

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index abc384e2c46..40df1b83cbc 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -53,11 +53,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
-        experimental  = bdist { sha256 = "0xgvvmyh49992y2r8yhafi80j3j4pcsp7pf0fg3rbc6zi1ariwsr"; version = "0.17.32"; withAuth = true; };
+        experimental  = bdist { sha256 = "1q66chnxsdlaz1bj3al62iikyxvknj1vkwh5bcc46favy4wpqpzz"; version = "0.17.52"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
-        experimental  = bdist { sha256 = "1jfjbb0v7yiqpn7nxkr4fcd1rsz59s8k6qcl82d1j320l3y7nl9w"; version = "0.17.32"; };
+        experimental  = bdist { sha256 = "03nv0qagv5pmqqbisf0hq6cb5rg2ih37lzkvcxihnnw72r78li94"; version = "0.17.52"; };
       };
       demo = {
         stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };

From 26479845013719c82126fcddd698cd23bd900ce4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 29 Jun 2019 19:25:35 +0300
Subject: [PATCH 205/377] openjk: 2018-09-17 -> 2019-06-24 (#63915)

---
 pkgs/games/openjk/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index a03599b5089..1da23a98f71 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -20,13 +20,14 @@ let
     categories = "Game;";
   };
 in stdenv.mkDerivation rec {
-  name = "OpenJK-2018-09-17";
+  pname = "OpenJK";
+  version = "2019-06-24";
 
   src = fetchFromGitHub {
     owner = "JACoders";
     repo = "OpenJK";
-    rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f";
-    sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk";
+    rev = "e8b5c135eccb05ddae67e00ff944001f373fddd4";
+    sha256 = "0qkbn59swhnb0anvy9gq945rkb58j6axlcfgb7sff0m4swqw2394";
   };
 
   dontAddPrefix = true;

From 95165e03f0e9ddce9d56ba6a2090d70df4eaa75a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 29 Jun 2019 19:00:36 +0200
Subject: [PATCH 206/377] vimPlugins: update (#63925)

---
 pkgs/misc/vim-plugins/generated.nix | 184 ++++++++++++++--------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 36bc422f1c0..0947deb6e6c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -182,12 +182,12 @@ let
 
   camelcasemotion = buildVimPluginFrom2Nix {
     pname = "camelcasemotion";
-    version = "2019-06-06";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "bkad";
       repo = "camelcasemotion";
-      rev = "2a62526721b6a4324bec3408e4ed9f8eebf96f3b";
-      sha256 = "1pj7q0ic6hs6niflp64izk5v3kdw951ram035v3xv1gjsp1aa5a6";
+      rev = "406368dea50303884aa321d2cdff714e010f951e";
+      sha256 = "0a1grafg05cb9mpk69j2y433ifm27ksy29wzlxlm5798dmb473mw";
     };
   };
 
@@ -248,12 +248,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2019-06-24";
+    version = "2019-06-29";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "5e9594d9da22e4eb840cb102513bebc77bab7300";
-      sha256 = "036ig6902vwrqnj052s6631lx4k4m0p5y2238287p8qmxgj7x9d6";
+      rev = "6ed2171e13431dce82cda26dba30d671514d649b";
+      sha256 = "042d2dv4mbfgj5s49d55k5nm8cw7xab715qnk0jssi03cwh6j7c8";
     };
   };
 
@@ -270,12 +270,12 @@ let
 
   command-t = buildVimPluginFrom2Nix {
     pname = "command-t";
-    version = "2019-05-12";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "57e112c12c99185e062a4330896cfaf422d1ea64";
-      sha256 = "19ajaxga54kij9ii68cd38frq4y7lr7896wqa5xgs5qq83wh1b1z";
+      rev = "4f86fcb812b07a3d691d4b617e093b001a6ad839";
+      sha256 = "06i02632q6rkq7xljfn70shlfb301l31sv8pd738anshf8qwkfff";
       fetchSubmodules = true;
     };
   };
@@ -425,23 +425,23 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-06-23";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "9a5e321ced689771c052f68a8125c0a44ad3389a";
-      sha256 = "16l85820490h1l44idk3jsz5xyckyvcyi42a88bw0ms70nnh2569";
+      rev = "2b884d5d990539fe25b44398146645dafc8ffa49";
+      sha256 = "0dfmd71vkk5wlz47jzvv6j5agjc39lrx7hmlhk9ssq3apj848sfl";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol-nvim";
-    version = "2019-06-19";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "ed807a398fd5120a5dfbff7877517b25cd801bea";
-      sha256 = "131wzadip0d0wgn32vy38w02mx199kvcg62ldfwr68nyad48j98l";
+      rev = "85f0e6dde132c670eda32eb98c6a6f3d7b31a984";
+      sha256 = "154cdczdwzwx24c8ggasll3yf86y1r4z5hb3rld42m2dpbnhcrns";
     };
   };
 
@@ -594,12 +594,12 @@ let
 
   emmet-vim = buildVimPluginFrom2Nix {
     pname = "emmet-vim";
-    version = "2019-06-19";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
-      rev = "5a7c7930c675220121e62d8eecfdbee653e95bac";
-      sha256 = "0ippqmdw2mhi34yvnpfh0v08v59zvn2nq815b8zfq1ci0j2q7smy";
+      rev = "15ef997d4d683afb4b1ee641d47980972445b61f";
+      sha256 = "09cm7wzl4gkb6whlfsprap1jd22f1yfp9wykw1aygj0zc5k6a106";
       fetchSubmodules = true;
     };
   };
@@ -949,12 +949,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2019-05-21";
+    version = "2019-06-26";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "6468c3d4f9ee9c32c9e84c5a8743bff8cb429f45";
-      sha256 = "18qn0xdxf2ax9qnzib5gbpws1h0gmwfmwalhpismkbwnm8cswipk";
+      rev = "072e4861412e841d308aabc928112ccaedf07135";
+      sha256 = "1250a011mib5na5c769x2djjyz3rwhcdw80rmkvzv1xy7crxf5xn";
     };
   };
 
@@ -1202,12 +1202,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2019-06-18";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "17f199f69fc9c4f93672293fdc2713e5c33987c2";
-      sha256 = "1mvk3v0z7xffn2rigzj8fab4rdvlj9chfwmrshri0i9hza8kp1za";
+      rev = "43007dac3e4c761caee7a5d8c74172da2af08ea6";
+      sha256 = "1bxz0czckmc2cw7kh8cd1rcg0sg2pj7vjdlgwd0bmqr6x9xarp0d";
     };
   };
 
@@ -1301,12 +1301,12 @@ let
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-06-20";
+    version = "2019-06-27";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "33fe2fdf16a95c12e8284364c780ed405dbaad17";
-      sha256 = "01w3a6wkfjg55n27flsv3v0z0aav09nhwm70n2wfb25hgbqkcqxd";
+      rev = "1c803b36f632c151c755456b68101153f407ec5e";
+      sha256 = "1393xzf1j05rspyajbb8k91wp4v23xlj6lzjjqb9rjj032z1i1d1";
     };
   };
 
@@ -1400,12 +1400,12 @@ let
 
   onehalf = buildVimPluginFrom2Nix {
     pname = "onehalf";
-    version = "2019-06-21";
+    version = "2019-06-26";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
-      rev = "da0ca0b0036f2e9afe1a25592cd1ac41cce61112";
-      sha256 = "0mrv6gmqfqc6lwnwhw788n6lpf36lwbwksbzw0l87rwj104ima9d";
+      rev = "408104a30ae4f220096e591350a72e60cc15f9b3";
+      sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2";
     };
   };
 
@@ -1631,12 +1631,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-06-06";
+    version = "2019-06-29";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "6d6c410d5997bda6b9de065049636be4ad3682f4";
-      sha256 = "1aq66v5j8fckq1bszs793z43fgkrss4w1p44k0x98zx7prx5z5lw";
+      rev = "de998a2014c997d6f8f749a9be195f1cd51aa9c0";
+      sha256 = "0fx9j0l8fjb54c7b1pzwypkmvr3sx39x5wpjbxkwa8a916nlylq2";
     };
   };
 
@@ -1686,12 +1686,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2019-06-13";
+    version = "2019-06-26";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "e2503139a55f4c2631cca64feb596b44d5b88f73";
-      sha256 = "0zaa2dcgynwbhybyq3i3i9pxdz4hk2q3g0s48vm27sywr2kdzw63";
+      rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8";
+      sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c";
     };
   };
 
@@ -2489,12 +2489,12 @@ let
 
   vim-cursorword = buildVimPluginFrom2Nix {
     pname = "vim-cursorword";
-    version = "2017-10-19";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
-      rev = "4878d6185b99131c5f610cc6ad0e223439ac4601";
-      sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf";
+      rev = "c35c5e686769db02bb9ccf30cc21fc13786f7f14";
+      sha256 = "1115j8ch1p6q5x3y85pmdgib7ya0m0j8j52gblh0mlw823zf3lrf";
     };
   };
 
@@ -2511,12 +2511,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-06-23";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "793fda61101f02fed05d30d606671f9b933452fb";
-      sha256 = "0x04rh5jy82g7q7im4lvlh1akz4jl3l5swc3xv82saxymzycpgyw";
+      rev = "959586bf254b2e593aa783c4551d57d17be7d3f0";
+      sha256 = "0b4224dnsmvfl30wil91j8dzj5hvsps5sr9l09y19psjxrxwyjzx";
     };
   };
 
@@ -2544,12 +2544,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-06-21";
+    version = "2019-06-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "219df23e822206a25e7c40bf4329774aa19f7732";
-      sha256 = "1f7dvdl8wz6g4ikz5gx6rdhxyvcf4z9y0axzlkljs2ixmr48sxbr";
+      rev = "b59859e4487fc14bfc6ee7cf3551fe4711ee32a8";
+      sha256 = "0bsdwzvhrqfkvl2rxgxj7agnq8zbjw0zawp2bqmglf9260als74x";
     };
   };
 
@@ -2621,12 +2621,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2019-05-14";
+    version = "2019-06-27";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "38e8bbfd0019033ae53d623e3fd1d9cf6ec2d335";
-      sha256 = "1mbgks1460vm8sl2hkag6hrsvbf9gfvdlswqr5hh8hy3laylh6qf";
+      rev = "a219dc1f702e581878f51746c4c31b8b4805aa4e";
+      sha256 = "1bw8i3nvqwrb8d0dbsz53jy3pvcx7kwz48xy7b9sslrhkf4llwpn";
     };
   };
 
@@ -2665,12 +2665,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-06-23";
+    version = "2019-06-26";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "e78995b7fc93357c86f66d78b65803e473b8e356";
-      sha256 = "05wbnpqpd65vyvaq5maxaq06dcc5k6z5hc7hbk82slm52avk92lm";
+      rev = "db3b2f7d49c11731b19b5952afdd7329bf52814b";
+      sha256 = "0ljp4yw320xjy4xp4hcqd03n9k2iyglwd6v83ww4bwklljd2zr7q";
     };
   };
 
@@ -2720,12 +2720,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-06-08";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "6d42c7df44aa20252e5dac747c3ac9fa7450b21b";
-      sha256 = "002s7jsn8m4h98hpbcblhmxywsyxgajz23wm3w96awqqz4chrp0i";
+      rev = "9c195de61bac489dfd88a55eb457113a07a21729";
+      sha256 = "195d94my65znrkkl7hxbqjrb7sqdxnk1rv7icv7di3qdm9dy106p";
     };
   };
 
@@ -2786,12 +2786,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-06-13";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "b6a0bde7d4c64a063ea1b6365e3dd24e2d4f4df1";
-      sha256 = "1lnwp4qqbzl6cwy75hhkafnppv2pgbaw2lf5fpbprwyd5aa5qh1q";
+      rev = "7aa035a7d2eaa47c472c24f810225e949f3cd90d";
+      sha256 = "1hcafb6lmnffiblr3wgg0ddsk5104jacqzraa1cmzhzwyjhg27cb";
     };
   };
 
@@ -3017,12 +3017,12 @@ let
 
   vim-javascript = buildVimPluginFrom2Nix {
     pname = "vim-javascript";
-    version = "2019-04-16";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
-      rev = "ee445807a71ee6933cd6cbcd74940bc288815793";
-      sha256 = "0x4cscpfll8m7f9hvx4fjxff5vscz4kzvs14ai1sdg75b6dngxl0";
+      rev = "8a599c5e84bb064e2345867332ecbcc252e3b04a";
+      sha256 = "1hyn592812hav4n7g488ysmrqw0c2bjkwvfwkzz9xpwj1v25f2yl";
     };
   };
 
@@ -3183,12 +3183,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-06-23";
+    version = "2019-06-25";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "57f6e1aaed6a89054335b71aac89be9a607faad3";
-      sha256 = "04mfxpszngmqw052h3yb9iq0xj95fg38jr8x7jqxdpgr3i5c5z9r";
+      rev = "c491351fcfdb58d36da739912701d7132a33110e";
+      sha256 = "1wvz493dk011kk113ml82vysr76zfarqrlk0v03hh9la33h23mh6";
     };
   };
 
@@ -3238,12 +3238,12 @@ let
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     pname = "vim-multiple-cursors";
-    version = "2019-03-25";
+    version = "2019-06-26";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
-      rev = "8cb8e83ffb040f25cefa597f21608ca6a64aed70";
-      sha256 = "1mdi0kbc1k4q8mw8f4anl819mgsll1sj38dd2w1a1lscg179j062";
+      rev = "730a11cee6deedc6f4ccc02e2c1d990f8629da25";
+      sha256 = "1m21bjdkah5b7pw5nl5r6lvj1dl4l7yhz05hwzhy43a31nbba2y3";
     };
   };
 
@@ -3381,12 +3381,12 @@ let
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
     pname = "vim-pandoc-syntax";
-    version = "2019-05-16";
+    version = "2019-06-25";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
-      rev = "14c778e5bf069a1f13a4645aa8a34e1b46c980a8";
-      sha256 = "1a66f0shycqkl1329lgbvrbbzwdv8pgi9d8zaybw9jddn64rx9r7";
+      rev = "6710d46c8b772f77248f30d650c83f90c68f37ab";
+      sha256 = "1dir9h6s63lr10ffaxlpjar0xfmmjr3nhhgijsaa0vgnghc00r7x";
     };
   };
 
@@ -3557,12 +3557,12 @@ let
 
   vim-rhubarb = buildVimPluginFrom2Nix {
     pname = "vim-rhubarb";
-    version = "2019-04-24";
+    version = "2019-06-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "70713ca031f882bd13ac7ffb163fb7e7a0a52b0c";
-      sha256 = "10x1n5jrrmw01rqh0qnyyx7f9l5qmzhfby8gkd5vpjx84kpabzqs";
+      rev = "c509c7eedeea641f5b0bdae708581ff610fbff5b";
+      sha256 = "19zhhnlrnkgsxacykck9q19rhk4gj31qjj6i4sl6bzi086kmf0z9";
     };
   };
 
@@ -3601,12 +3601,12 @@ let
 
   vim-scala = buildVimPluginFrom2Nix {
     pname = "vim-scala";
-    version = "2019-01-21";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "derekwyatt";
       repo = "vim-scala";
-      rev = "971ac9ab3fe945105ef88587cfe5273fa2c8e988";
-      sha256 = "0n28k3c2jyb4af0ql2sm3ngkcyvd4684c95j5yfvs7jjsvjibqcb";
+      rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413";
+      sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb";
     };
   };
 
@@ -3865,12 +3865,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2019-06-01";
+    version = "2019-06-25";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "965704531f09988c7cde6e572741b408015ef4ff";
-      sha256 = "1y4ypg39fh8ys2mqmm2d7xqvq5zjs5x4xjyrn5nazmn5snbvgi86";
+      rev = "3507d31dccde27ea27e2858e00784d5be18565f4";
+      sha256 = "0ap9bbk0qa3cz1rxykgrd5hv582av2n36x6s52awg90d4hx37inp";
     };
   };
 
@@ -3942,12 +3942,12 @@ let
 
   vim-unimpaired = buildVimPluginFrom2Nix {
     pname = "vim-unimpaired";
-    version = "2019-03-21";
+    version = "2019-06-29";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-unimpaired";
-      rev = "e77923053fbce11323194ed04113b8d966be959c";
-      sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak";
+      rev = "a49c4f2bf05f18a6e4f6572a19763ba7abba52b1";
+      sha256 = "0ivybshm1dvlqsbh153a3fq3dhwj144x049l78ss7zrqnbb70jsw";
     };
   };
 
@@ -3968,8 +3968,8 @@ let
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "8b1db5d83f1bc04f9e08fd5c57d84323e9007435";
-      sha256 = "0g6b9grd7j1p9rhbb56lvwvv90j9l0cqfsslxyrn9fwxwgkbiis0";
+      rev = "c91e356a33569bc39bb01392362b8747355b356e";
+      sha256 = "07xm2289932j7lrxaf1gx3rxbzx4f059mkx78chj915pndx72q33";
     };
   };
 
@@ -3997,12 +3997,12 @@ let
 
   vim-wakatime = buildVimPluginFrom2Nix {
     pname = "vim-wakatime";
-    version = "2019-05-08";
+    version = "2019-06-24";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "40dbc1643088c0b677857cf7eae9354540b5e955";
-      sha256 = "17df8h7jgkl1q6p2g3328mnd21gvfcjks7zpbr8r5qzbyrm1pl5v";
+      rev = "7a544c979ed52042c67a4189687ac53c853f109c";
+      sha256 = "04n2hgyyiq4q9abcj867q30m4vhfz50gxwdvjj3844ppn104smsa";
     };
   };
 
@@ -4118,12 +4118,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-06-22";
+    version = "2019-06-28";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "4240669fbb31f9bab15abe5e41a8d5a11f3d4ccb";
-      sha256 = "1yldk7pms48d6f82q547r2vy6xb8fa0c2s6f8mp0riwiypiaqj6l";
+      rev = "c8341a748340eb3b57fd11fbf9e401c06d5db60e";
+      sha256 = "1bfqj6x4awd6jsn9arc281xfjalgp0bjnsmh1vyjhpa21ij79wk2";
     };
   };
 
@@ -4262,12 +4262,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2019-06-02";
+    version = "2019-06-29";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "59eea79da8acaf4cd01631b15d6c762f9b9bdb14";
-      sha256 = "1v8ich33j2rxifilpzzgj4pw6wnj3ra4rd8mc3m0yy7jrnhzcr13";
+      rev = "d556a43c1af6a4e4075e875934e250f589df0dee";
+      sha256 = "05vl8gri43k8psjmhaybhm27ycm8hdgrdaqcy89sznpww5lm1nx8";
       fetchSubmodules = true;
     };
   };

From c49b7f64d15dfd6f68e7bd1dd1f1f862f8840ff8 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 29 Jun 2019 11:07:21 -0700
Subject: [PATCH 207/377] bazel: fix the compilation of .proto on Darwin
 (#63879)

On Darwin, the last argument to GCC is coming up as an empty string.
This is breaking the build of proto_library targets. However, I was not
able to reproduce with the example cpp project[0].

This commit patches the cc_wrapper of Bazel that gets installed on
Darwin to remove the last argument if it's an empty string. This is
not a probem on Linux.

[0]: https://github.com/bazelbuild/examples/tree/master/cpp-tutorial/stage3
---
 .../tools/build-managers/bazel/cpp-test.nix   |  49 ++++++
 .../tools/build-managers/bazel/default.nix    |  27 +++-
 .../build-managers/bazel/protobuf-test.nix    | 144 ++++++++++++++++++
 .../bazel/python-bin-path-test.nix            |   1 -
 .../trim-last-argument-to-gcc-if-empty.patch  |  37 +++++
 5 files changed, 252 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/bazel/cpp-test.nix
 create mode 100644 pkgs/development/tools/build-managers/bazel/protobuf-test.nix
 create mode 100644 pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch

diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
new file mode 100644
index 00000000000..2b59bd3c433
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -0,0 +1,49 @@
+{
+  bazel
+, bazelTest
+, bazel-examples
+, gccStdenv
+, lib
+, runLocal
+, runtimeShell
+, writeScript
+, writeText
+}:
+
+let
+
+  toolsBazel = writeScript "bazel" ''
+    #! ${runtimeShell}
+
+    export CXX='${gccStdenv.cc}/bin/g++'
+    export LD='${gccStdenv.cc}/bin/ld'
+    export CC='${gccStdenv.cc}/bin/gcc'
+
+    # XXX: hack for macosX, this flags disable bazel usage of xcode
+    # See: https://github.com/bazelbuild/bazel/issues/4231
+    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+    exec "$BAZEL_REAL" "$@"
+  '';
+
+  workspaceDir = runLocal "our_workspace" {} (''
+    cp -r ${bazel-examples}/cpp-tutorial/stage3 $out
+    find $out -type d -exec chmod 755 {} \;
+  ''
+  + (lib.optionalString gccStdenv.isDarwin ''
+    mkdir $out/tools
+    cp ${toolsBazel} $out/tools/bazel
+  ''));
+
+  testBazel = bazelTest {
+    name = "bazel-test-cpp";
+    inherit workspaceDir;
+    bazelPkg = bazel;
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        build --verbose_failures \
+          //...
+    '';
+  };
+
+in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 8edc7fe9a8e..8aac432d3bb 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, fetchurl, runCommand, runCommandCC, makeWrapper
+{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, runCommand, runCommandCC, makeWrapper
 # this package (through the fixpoint glass)
 , bazel
 , lr, xe, zip, unzip, bash, writeCBin, coreutils
@@ -133,6 +133,11 @@ stdenv.mkDerivation rec {
   sourceRoot = ".";
 
   patches = [
+    # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
+    # This is breaking the build of any C target. This patch removes the last
+    # argument if it's found to be an empty string.
+    ./trim-last-argument-to-gcc-if-empty.patch
+
     ./python-stub-path-fix.patch
   ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
 
@@ -198,12 +203,24 @@ stdenv.mkDerivation rec {
           '');
 
       bazelWithNixHacks = bazel.override { enableNixHacks = true; };
-    in {
-      pythonBinPathWithoutNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };
-      bashToolsWithoutNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
 
-      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      bazel-examples = fetchFromGitHub {
+        owner = "bazelbuild";
+        repo = "examples";
+        rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc";
+        sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8";
+      };
+
+    in {
+      bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
+      cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; };
+      protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; };
+      pythonBinPath = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };
+
       bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
+      protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
     };
 
   # update the list of workspace dependencies
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
new file mode 100644
index 00000000000..c4120f2fc03
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -0,0 +1,144 @@
+{
+  bazel
+, bazelTest
+, fetchFromGitHub
+, fetchurl
+, gccStdenv
+, lib
+, runLocal
+, runtimeShell
+, writeScript
+, writeText
+}:
+
+let
+  com_google_protobuf = fetchFromGitHub {
+    owner = "protocolbuffers";
+    repo = "protobuf";
+    rev = "v3.7.0";
+    sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh";
+  };
+
+  bazel_skylib = fetchFromGitHub {
+    owner = "bazelbuild";
+    repo = "bazel-skylib";
+    rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c";
+    sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l";
+  };
+
+  net_zlib = fetchurl rec {
+    url = "https://zlib.net/zlib-1.2.11.tar.gz";
+    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
+
+    passthru.sha256 = sha256;
+  };
+
+  WORKSPACE = writeText "WORKSPACE" ''
+    workspace(name = "our_workspace")
+
+    load("//:proto-support.bzl", "protobuf_deps")
+    protobuf_deps()
+  '';
+
+  protoSupport = writeText "proto-support.bzl" ''
+    """Load dependencies needed to compile the protobuf library as a 3rd-party consumer."""
+
+    load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+    def protobuf_deps():
+        """Loads common dependencies needed to compile the protobuf library."""
+
+        if "zlib" not in native.existing_rules():
+            # proto_library, cc_proto_library, and java_proto_library rules implicitly
+            # depend on @com_google_protobuf for protoc and proto runtimes.
+            # This statement defines the @com_google_protobuf repo.
+            native.local_repository(
+                name = "com_google_protobuf",
+                path = "${com_google_protobuf}",
+            )
+            native.local_repository(
+                name = "bazel_skylib",
+                path = "${bazel_skylib}",
+            )
+
+            native.bind(
+                name = "zlib",
+                actual = "@net_zlib//:zlib",
+            )
+            http_archive(
+                name = "net_zlib",
+                build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+                sha256 = "${net_zlib.sha256}",
+                strip_prefix = "zlib-1.2.11",
+                urls = ["file://${net_zlib}"],
+            )
+  '';
+
+  personProto = writeText "person.proto" ''
+    syntax = "proto3";
+
+    message Person {
+      string name = 1;
+      int32 id = 2;
+      string email = 3;
+    }
+  '';
+
+  personBUILD = writeText "BUILD" ''
+    proto_library(
+        name = "person_proto",
+        srcs = ["person.proto"],
+        visibility = ["//visibility:public"],
+    )
+
+    java_proto_library(
+        name = "person_java_proto",
+        deps = [":person_proto"],
+    )
+
+    cc_proto_library(
+        name = "person_cc_proto",
+        deps = [":person_proto"],
+    )
+  '';
+
+  toolsBazel = writeScript "bazel" ''
+    #! ${runtimeShell}
+
+    export CXX='${gccStdenv.cc}/bin/g++'
+    export LD='${gccStdenv.cc}/bin/ld'
+    export CC='${gccStdenv.cc}/bin/gcc'
+
+    # XXX: hack for macosX, this flags disable bazel usage of xcode
+    # See: https://github.com/bazelbuild/bazel/issues/4231
+    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+    exec "$BAZEL_REAL" "$@"
+  '';
+
+  workspaceDir = runLocal "our_workspace" {} (''
+    mkdir $out
+    cp ${WORKSPACE} $out/WORKSPACE
+    touch $out/BUILD.bazel
+    cp ${protoSupport} $out/proto-support.bzl
+    mkdir $out/person
+    cp ${personProto} $out/person/person.proto
+    cp ${personBUILD} $out/person/BUILD.bazel
+  ''
+  + (lib.optionalString gccStdenv.isDarwin ''
+    mkdir $out/tools
+    cp ${toolsBazel} $out/tools/bazel
+  ''));
+
+  testBazel = bazelTest {
+    name = "bazel-test-protocol-buffers";
+    inherit workspaceDir;
+    bazelPkg = bazel;
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        build --verbose_failures \
+          //person:person_proto
+    '';
+  };
+
+in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index 17d5697a81e..ff921b395da 100644
--- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -45,7 +45,6 @@ let
     bazelScript = ''
       ${bazel}/bin/bazel \
         run \
-          --host_javabase='@local_jdk//:jdk' \
           //python:bin
     '';
   };
diff --git a/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch b/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch
new file mode 100644
index 00000000000..b93b252f363
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch
@@ -0,0 +1,37 @@
+From 177b4720d6fbaa7fdd17e5e11b2c79ac8f246786 Mon Sep 17 00:00:00 2001
+From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
+Date: Thu, 27 Jun 2019 21:08:51 -0700
+Subject: [PATCH] Trim last argument to gcc if empty, on Darwin
+
+On Darwin, the last argument to GCC is coming up as an empty string.
+This is breaking the build of proto_library targets. However, I was not
+able to reproduce with the example cpp project[0].
+
+This commit removes the last argument if it's an empty string. This is
+not a problem on Linux.
+
+[0]: https://github.com/bazelbuild/examples/tree/master/cpp-tutorial/stage3
+---
+ tools/cpp/osx_cc_wrapper.sh.tpl | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tools/cpp/osx_cc_wrapper.sh.tpl b/tools/cpp/osx_cc_wrapper.sh.tpl
+index 4c85cd9b6b..6c611e3d25 100644
+--- a/tools/cpp/osx_cc_wrapper.sh.tpl
++++ b/tools/cpp/osx_cc_wrapper.sh.tpl
+@@ -53,7 +53,11 @@ done
+ %{env}
+ 
+ # Call the C++ compiler
+-%{cc} "$@"
++if [[ ${*: -1} = "" ]]; then
++    %{cc} "${@:0:$#}"
++else
++    %{cc} "$@"
++fi
+ 
+ function get_library_path() {
+     for libdir in ${LIB_DIRS}; do
+-- 
+2.19.2
+

From 06b7c4abcc64eec34900a320d2f88e1371968b57 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 29 Jun 2019 20:51:00 +0200
Subject: [PATCH 208/377] systemd: point to commit id instead of branch name

branch names are mutable, and with
https://github.com/NixOS/systemd/pull/29 being merged in, the nixos-v242
branch advanced from 5c20aab77900f478fd380ab189787d80e4a35963 to
40eb070cb309ec09def0ecdeaf7514c702200835, causing systemd's
fetchFromGitHub to fail with a sha256sum mismatch (when not relying on
the cache).

Fix this, by pointing systemd.src to the commit id before the branch
advancement. This won't cause a rebuild, as the sha256 stayed the same.

Fast-forwarding systemd to 40eb070cb309ec09def0ecdeaf7514c702200835 will
be done in https://github.com/NixOS/nixpkgs/pull/63784 , which also uses
the commit id, and not a branch name for rev.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 1485d060281..8e2864b4be1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "nixos-v${version}";
+    rev = "5c20aab77900f478fd380ab189787d80e4a35963";
     sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8";
   };
 

From 7d62e4b024835f631c07acf1ae08e2184dfb4862 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 29 Jun 2019 14:51:34 -0400
Subject: [PATCH 209/377] llvm_7,8: disable libpfm on aarch64

See https://github.com/nixos/nixpkgs/issues/56245

Testing: 0 ..
FAIL: LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest (2933 of 27000)
******************** TEST 'LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest' FAILED ********************
Note: Google Test filter = PerfHelperTest.FunctionalTest
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from PerfHelperTest
[ RUN      ] PerfHelperTest.FunctionalTest
/build/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp:37: Failure
      Expected: CallbackEventName
            Which is: ""
            To be equal to: "CYCLES:u"
            /build/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp:38: Failure
            Value of: CallbackEventNameFullyQualifed
            Expected: isn't empty
              Actual: ""
              [  FAILED  ] PerfHelperTest.FunctionalTest (3 ms)
              [----------] 1 test from PerfHelperTest (3 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (3 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] PerfHelperTest.FunctionalTest

 1 FAILED TEST
 invalid event attribute - cannot create event CYCLES:u

********************
Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90..

1 warning(s) in tests.
Testing Time: 108.19s
********************
Failing Tests (1):
    LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest

  Expected Passes    : 25609
    Expected Failures  : 141
      Unsupported Tests  : 1249
        Unexpected Failures: 1
        make[3]: *** [CMakeFiles/check-all.dir/build.make:58: CMakeFiles/check-all] Error 1
        make[3]: Leaving directory '/build/llvm/build'
        make[2]: *** [CMakeFiles/Makefile2:365: CMakeFiles/check-all.dir/all] Error 2
        make[2]: Leaving directory '/build/llvm/build'
        make[1]: *** [CMakeFiles/Makefile2:372: CMakeFiles/check-all.dir/rule] Error 2
        make[1]: Leaving directory '/build/llvm/build'
        make: *** [Makefile:251: check-all] Error 2
        builder for '/nix/store/4kq72x6ahrigryr6yjjj7c7ayqy8z2sl-llvm-7.0.1.drv' failed with exit code 2Testing: 0 ..
        FAIL: LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest (2933 of 27000)
        ******************** TEST 'LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest' FAILED ********************
        Note: Google Test filter = PerfHelperTest.FunctionalTest
        [==========] Running 1 test from 1 test case.
        [----------] Global test environment set-up.
        [----------] 1 test from PerfHelperTest
        [ RUN      ] PerfHelperTest.FunctionalTest
        /build/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp:37: Failure
              Expected: CallbackEventName
                    Which is: ""
                    To be equal to: "CYCLES:u"
                    /build/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp:38: Failure
                    Value of: CallbackEventNameFullyQualifed
                    Expected: isn't empty
                      Actual: ""
                      [  FAILED  ] PerfHelperTest.FunctionalTest (3 ms)
                      [----------] 1 test from PerfHelperTest (3 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (3 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] PerfHelperTest.FunctionalTest

 1 FAILED TEST
 invalid event attribute - cannot create event CYCLES:u

********************
Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90..

1 warning(s) in tests.
Testing Time: 108.19s
********************
Failing Tests (1):
    LLVM-Unit :: tools/llvm-exegesis/./LLVMExegesisTests/PerfHelperTest.FunctionalTest

  Expected Passes    : 25609
    Expected Failures  : 141
      Unsupported Tests  : 1249
        Unexpected Failures: 1
        make[3]: *** [CMakeFiles/check-all.dir/build.make:58: CMakeFiles/check-all] Error 1
        make[3]: Leaving directory '/build/llvm/build'
        make[2]: *** [CMakeFiles/Makefile2:365: CMakeFiles/check-all.dir/all] Error 2
        make[2]: Leaving directory '/build/llvm/build'
        make[1]: *** [CMakeFiles/Makefile2:372: CMakeFiles/check-all.dir/rule] Error 2
        make[1]: Leaving directory '/build/llvm/build'
        make: *** [Makefile:251: check-all] Error 2
        builder for '/nix/store/4kq72x6ahrigryr6yjjj7c7ayqy8z2sl-llvm-7.0.1.drv' failed with exit code 2
---
 pkgs/development/compilers/llvm/7/llvm.nix | 4 +++-
 pkgs/development/compilers/llvm/8/llvm.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index d3d9a4c506d..dc10de26ba1 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -15,7 +15,9 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, enablePFM ? !stdenv.isDarwin
+, enablePFM ? !(stdenv.isDarwin
+  || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+  )
 , enablePolly ? false
 }:
 
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 4ff6cc995a0..18013a9cfad 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -14,7 +14,9 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, enablePFM ? !stdenv.isDarwin
+, enablePFM ? !(stdenv.isDarwin
+  || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
 , enablePolly ? false
 }:
 

From 1707911f972bae8cb5240cde6d4bd7261b693577 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Jun 2019 01:11:24 +0200
Subject: [PATCH 210/377] signal-desktop: 1.25.2 -> 1.25.3

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index fec394b27b4..e0cb977d5c2 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -57,11 +57,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.25.2";
+  version = "1.25.3";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0kbvanq5hvxbabs6p8qlsv3bcyh4cjb51n74nn0sa0qjyrp7lndq";
+    sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 5b7e3718ee3dc1c6f0bebd4c76816a0003e8f295 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Jun 2019 18:48:16 -0500
Subject: [PATCH 211/377] go-tools: 2019.2 -> 2019.2.1 (#63885)

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

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index a5a81cd98c4..b55a38d2748 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -5,7 +5,7 @@
 
 buildGoModule rec {
   pname = "go-tools";
-  version = "2019.2";
+  version = "2019.2.1";
 
   goPackagePath = "honnef.co/go/tools";
   excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "dominikh";
     repo = "go-tools";
     rev = version;
-    sha256 = "0gxvrxahfgrx630fq4j629jl177qqw1kyip805k4lw607ph8m7h6";
+    sha256 = "1frpy4pl9yp6j00mjj2yss3k8hip0cc7b5i5mz61n3dlw0kga9z1";
   };
 
   modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";

From 147422082327a03f2a2d29e062077217a1218559 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Sat, 29 Jun 2019 22:22:02 -0700
Subject: [PATCH 212/377] buildGoModule: add ./ to all sub-packages (#63936)

When $subPackages has more than one item, the build was failing because
./ was added only to the first subPackage. This commit adds ./ to all
specified subPackages.
---
 pkgs/development/go-modules/generic/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index ca1bab1e087..cd98aa1fa9a 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -125,7 +125,7 @@ let
         local type;
         type="$1"
         if [ -n "$subPackages" ]; then
-          echo "./$subPackages"
+          echo "$subPackages" | sed "s,\(^\| \),\1./,g"
         else
           find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
         fi
@@ -144,6 +144,7 @@ let
           export NIX_BUILD_CORES=1
       fi
       for pkg in $(getGoDirs ""); do
+        echo "Building subPackage $pkg"
         buildGoDir install "$pkg"
       done
     '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

From 75dd222252a86edc642184d84a5f20971b115ac0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Jun 2019 04:20:00 -0500
Subject: [PATCH 213/377] 1password: 0.5.6-003 -> 0.5.7

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

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 607ef2eaf10..79c3a6d7302 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.5.6-003";
+  version = "0.5.7";
   src =
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-        sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj";
+        sha256 = "1193lq6cvqkv2cy07l6wzb25gb5vb3s3pxm534q3izhzrrz6lisz";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-        sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9";
+        sha256 = "0hlw1jasxzg31293d2n3ydzj62q7ji7nig7aaighcvzi3c9j7v51";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
-        sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g";
+        sha256 = "05z5k63fza6v0vhydyiq4sh9xhxnd9rcfxyym7jihv6b3fv3fnx3";
         stripRoot = false;
       }
     else throw "Architecture not supported";

From 17e0f36f7221b864ba978ebf47760864648787e3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 11:44:43 +0200
Subject: [PATCH 214/377] electron-cash: 4.0.2 -> 4.0.7

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

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 788ff9b638b..cc7b9cf27c2 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "electron-cash";
-  version = "4.0.2";
+  version = "4.0.7";
 
   src = fetchurl {
     url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
     # Verified using official SHA-1 and signature from
     # https://github.com/fyookball/keys-n-hashes
-    sha256 = "6255cd0493442ec57c10ae70ca2e84c6a29497f90a1393e6ac5772afe7572acf";
+    sha256 = "d63ef2d52cff0b821b745067d752fd0c7f2902fa23eaf8e9392c54864cae5c77";
   };
 
   propagatedBuildInputs = with python3Packages; [

From a1eec05a0ce97bd6f26a935072c0419857103176 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 11:52:41 +0200
Subject: [PATCH 215/377] radarr: 0.2.0.1344 -> 0.2.0.1358

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

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 49621e8b9b6..a293643a6f6 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.1344";
+  version = "0.2.0.1358";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0zh1p92i61s6mx26s3fvzg1ihsx433b398wsl5p8zafwqq3zfrla";
+    sha256 = "0lyd9gcrfdp7nc4myg22ardsig30lgkvma03zzdjrwvsngqclmv7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e295fd81370929a4268e94ba95d86f3f296d610c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sun, 30 Jun 2019 11:41:06 +0200
Subject: [PATCH 216/377] git-recent: 1.1.0 -> 1.1.1

---
 .../version-management/git-and-tools/git-recent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index c52a78ff007..628c7dbac7f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-recent-${version}";
-  version = "1.1.0";
+  pname = "git-recent";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
     rev = "v${version}";
-    sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";
+    sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";
   };
 
   buildInputs = [ makeWrapper ];

From c727083e6565293c0e38f033fc1db07b187bddb0 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 30 Jun 2019 14:04:22 +0000
Subject: [PATCH 217/377] gnupg: change default keyserver to non-SKS

See https://gist.github.com/rjhansen/67ab921ffb4084c865b3618d6955275f.

The SKS network is vulnerable to certificate poisoning, which can
destroy GnuPG installations. keys.openpgp.org is a new non-SKS keyserver
that is resistant to this type of attack.

With such an attack being possible, it is unsafe to use SKS keyservers
for almost anything, and so we should protect our users from a now
unsafe default. keys.openpgp.org offers some (but not all) functionality
of SKS, and is better than nothing.

This default is only present in gnupg22. gnupg20 and gnupg1orig are not
affected.
---
 pkgs/tools/security/gnupg/22.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index b360992c6be..978bf1d4e4b 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -33,7 +33,10 @@ stdenv.mkDerivation rec {
   patches = [
     ./fix-libusb-include-path.patch
   ];
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = ''
+    sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \
+        configure doc/dirmngr.texi doc/gnupg.info-1
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
 

From 76a9a0c246038de68e69c7a86e814d459dc73857 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Jun 2019 11:04:09 -0500
Subject: [PATCH 218/377] gitAndTools.hub: 2.12.0 -> 2.12.1

---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 86ead4fea42..44e4b5de956 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "hub";
-  version = "2.12.0";
+  version = "2.12.1";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wv0s0bhl7akyshzcsqlk8ws84cjdjizfpn6m9674lw9vs9rj2sj";
+    sha256 = "0i9bqcgdidl5zawkpq2fjrimzbb37i1m2fisvj32d27fsp1824bk";
   };
 
   nativeBuildInputs = [ groff utillinux ];

From fc8ed43af67bb19acb87fd12d9a5bc8611e6ea62 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 27 Jun 2019 10:58:53 -0400
Subject: [PATCH 219/377] nvidia_x11: 418.74 -> 430.26

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 934a7a10033..de6efdb0c2d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -16,21 +16,16 @@ let
 in
 rec {
   # Policy: use the highest stable version as the default (on our master).
-  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_418 else legacy_390;
+  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390;
 
   # No active beta right now
-  beta = generic {
-    version = "430.14";
-    sha256_64bit = "05qgakc0sqv9zr6j4i49iqrd271nris8pmnv3l431r71ygx6zm00";
-    settingsSha256 = "1hh07258a6z0g8dl6mxrizdxqcgswv58r4rbamfhhwh9i42fpdgg";
-    persistencedSha256 = "1wmwmg9ma9rfx03s2qa249f0p7yf0lxdpiadab0raajk1lzlrrc8";
-  };
+  beta = stable;
 
-  stable_418 = generic {
-    version = "418.74";
-    sha256_64bit = "03qj42ppzkc9nphdr9zc12968bb8fc9cpcx5f66y29wnrgg3d1yw";
-    settingsSha256 = "15mbqdx5wyk7iq13kl2vd99lykpil618izwpi1kfldlabxdxsi9d";
-    persistencedSha256 = "0442qbby0r1b6l72wyw0b3iwvln6k20s6dn0zqlpxafnia9bvc8c";
+  stable_430 = generic {
+    version = "430.26";
+    sha256_64bit = "1rnfxl4dxa3jjidfdvfjmg1a8nc787ss15cakrp2wwrn8jlr9av6";
+    settingsSha256 = "0rjsj697s9jfls7iz1hs7aqp36ihf3l82yz1x1w9wdvlw94a3nym";
+    persistencedSha256 = "1n554i4g37hs49bb631x692ygfncn7a5hzb6mh9kx7hmv69yzazh";
   };
 
   # Last one supporting x86

From ba23c14b842e50cb9d8a228a6007207f2c28c1fe Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 30 Jun 2019 19:05:31 +0000
Subject: [PATCH 220/377] gnupg: apply default server CA verification patch

See discussion at
https://github.com/NixOS/nixpkgs/pull/63952#issuecomment-507048690.

Upstream commit:

commit 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254
Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date:   Sun Jun 30 11:54:35 2019 -0400

    dirmngr: Only use SKS pool CA for SKS pool

    * dirmngr/http.c (http_session_new): when checking whether the
    keyserver is the HKPS pool, check specifically against the pool name,
    as ./configure might have been used to select a different default
    keyserver.  It makes no sense to apply Kristian's certificate
    authority to anything other than the literal host
    hkps.pool.sks-keyservers.net.

    Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
    GnuPG-Bug-Id: 4593
---
 pkgs/tools/security/gnupg/22.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 978bf1d4e4b..359432791b7 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
-, libiconv, npth, gettext, texinfo, pcsclite, sqlite
+{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
+, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite
 , buildPackages
 
 # Each of the dependencies below are optional.
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./fix-libusb-include-path.patch
+    (fetchpatch {
+      url = https://files.gnupg.net/file/data/qmxjhc6kuja3orybj7st/PHID-FILE-vvzlnw36427pdnug2amc/file;
+      sha256 = "13snxkmlgmvn0rgxh5k2sgxkp5mbxqiznzm45sw649nvs3ccghq8";
+    })
   ];
   postPatch = ''
     sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \

From ae20c6836b27a2b4a0d716803728bc85f7de9eee Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Sun, 30 Jun 2019 13:36:13 -0700
Subject: [PATCH 221/377] scalafmt: 2.0.0-RC7 -> 2.0.0

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index a9f8a4cd4b3..0190283e791 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "scalafmt";
-  version = "2.0.0-RC7";
+  version = "2.0.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -13,7 +13,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0scz3pp63z6xfj69kvsfr8l3ll9rq95j4xlhlyrzg1vfl1gf41ig";
+    outputHash     = "18mf23ssy4lwvsi4pg6m4b003paz5yds5vs7nhl0bfcq57xg6qj1";
   };
 in
 stdenv.mkDerivation rec {

From c75653b015901c82d0ea427f93ea62f8d4c5ea27 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Mon, 24 Jun 2019 15:27:08 -0700
Subject: [PATCH 222/377] cargo-outdated: fix darwin build

---
 pkgs/tools/package-management/cargo-outdated/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index b54f67b0fd4..71567df9403 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libiconv, curl, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
@@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
   ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
+    libiconv
+    curl
   ];
 
   meta = with stdenv.lib; {

From 26a0e5f94226d64d790f89cb88b2367cfee4f038 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 23:24:18 +0200
Subject: [PATCH 223/377] riot-web: 1.2.1 -> 1.2.2

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ed6cc7abfa3..61a581e834c 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -6,11 +6,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840";
+    sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x";
   };
 
   installPhase = ''

From f38d3ee12c890a1ac7d8daca3fbfe9ebe1a6bfbb Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 23:24:48 +0200
Subject: [PATCH 224/377] riot-desktop: 1.2.1 -> 1.2.2

---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index b6107559e7b..7c348b88c8a 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index f7a7615171f..d6dcd0ee2ef 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });
 
 let
   executableName = "riot-desktop";
-  version = "1.2.1";
+  version = "1.2.2";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "0l50swqzdzbzbnrlkvwi133d54jgj15cj3awmlc1qdhnfdc3wxbb";
+    sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb";
   };
 
 in mkYarnPackage rec {

From 8b3dc7a3a0633aaa293d994921be925d6d703334 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 1 Jul 2019 00:27:59 +0100
Subject: [PATCH 225/377] powerdns: fix build by supplying libressl_2_8 instead
 of the new default 2.9

this is a bit of a temporary fix to get powerdns back in a buildable state
because there's the added urgency of powerdns security issues forcing a
version bump
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f2cab11d4..914d638052e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15879,7 +15879,7 @@ in
 
   semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
 
-  powerdns = callPackage ../servers/dns/powerdns { };
+  powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; };
 
   dnsdist = callPackage ../servers/dns/dnsdist { };
 

From 46dfe2bab95eeebd069f90e9bfdfff41e1a64c43 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 1 Jul 2019 01:07:22 +0100
Subject: [PATCH 226/377] powerdns: 4.1.7 -> 4.1.9

fixing CVE-2019-10162, CVE-2019-10163
---
 pkgs/servers/dns/powerdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 722ae26b166..4d840462f79 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.1.7";
+  version = "4.1.9";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "11c4r0mbq6ybbihm0jbl9hspb01pj1gi6x3m374liw9jij7dw8b4";
+    sha256 = "1dmx37xzg7qckq166jr7swcnw3m9wjh5169844ad59qhspfzflnk";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e0590da81322f9b8d496fcc6663d97c921690c2a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 30 Jun 2019 21:58:27 -0400
Subject: [PATCH 227/377] nixos/mysql: turn ExecStartPost into a shell script
 and simplify code

---
 nixos/modules/services/databases/mysql.nix | 179 ++++++++++-----------
 1 file changed, 89 insertions(+), 90 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 02f40683313..c36aa96adf7 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -317,104 +317,103 @@ in
           RuntimeDirectoryMode = "0755";
           # The last two environment variables are used for starting Galera clusters
           ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION";
-        };
+          ExecStartPost =
+            let
+              setupScript = pkgs.writeShellScript "mysql-setup" ''
+                ${optionalString (!hasNotify) ''
+                  # Wait until the MySQL server is available for use
+                  count=0
+                  while [ ! -e /run/mysqld/mysqld.sock ]
+                  do
+                      if [ $count -eq 30 ]
+                      then
+                          echo "Tried 30 times, giving up..."
+                          exit 1
+                      fi
 
-        postStart =
-          let
-            cmdWatchForMysqlSocket = ''
-              # Wait until the MySQL server is available for use
-              count=0
-              while [ ! -e /run/mysqld/mysqld.sock ]
-              do
-                  if [ $count -eq 30 ]
-                  then
-                      echo "Tried 30 times, giving up..."
-                      exit 1
-                  fi
+                      echo "MySQL daemon not yet started. Waiting for 1 second..."
+                      count=$((count++))
+                      sleep 1
+                  done
+                ''}
 
-                  echo "MySQL daemon not yet started. Waiting for 1 second..."
-                  count=$((count++))
-                  sleep 1
-              done
-            '';
-            cmdInitialDatabases = concatMapStrings (database: ''
-              # Create initial databases
-              if ! test -e "${cfg.dataDir}/${database.name}"; then
-                  echo "Creating initial database: ${database.name}"
-                  ( echo 'create database `${database.name}`;'
+                if [ -f /tmp/mysql_init ]
+                then
+                    ${concatMapStrings (database: ''
+                      # Create initial databases
+                      if ! test -e "${cfg.dataDir}/${database.name}"; then
+                          echo "Creating initial database: ${database.name}"
+                          ( echo 'create database `${database.name}`;'
 
-                    ${optionalString (database.schema != null) ''
-                    echo 'use `${database.name}`;'
+                            ${optionalString (database.schema != null) ''
+                            echo 'use `${database.name}`;'
 
-                    # TODO: this silently falls through if database.schema does not exist,
-                    # we should catch this somehow and exit, but can't do it here because we're in a subshell.
-                    if [ -f "${database.schema}" ]
-                    then
-                        cat ${database.schema}
-                    elif [ -d "${database.schema}" ]
-                    then
-                        cat ${database.schema}/mysql-databases/*.sql
-                    fi
-                    ''}
+                            # TODO: this silently falls through if database.schema does not exist,
+                            # we should catch this somehow and exit, but can't do it here because we're in a subshell.
+                            if [ -f "${database.schema}" ]
+                            then
+                                cat ${database.schema}
+                            elif [ -d "${database.schema}" ]
+                            then
+                                cat ${database.schema}/mysql-databases/*.sql
+                            fi
+                            ''}
+                          ) | ${mysql}/bin/mysql -u root -N
+                      fi
+                    '') cfg.initialDatabases}
+
+                    ${optionalString (cfg.replication.role == "master")
+                      ''
+                        # Set up the replication master
+
+                        ( echo "use mysql;"
+                          echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
+                          echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
+                          echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
+                        ) | ${mysql}/bin/mysql -u root -N
+                      ''}
+
+                    ${optionalString (cfg.replication.role == "slave")
+                      ''
+                        # Set up the replication slave
+
+                        ( echo "stop slave;"
+                          echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
+                          echo "start slave;"
+                        ) | ${mysql}/bin/mysql -u root -N
+                      ''}
+
+                    ${optionalString (cfg.initialScript != null)
+                      ''
+                        # Execute initial script
+                        # using toString to avoid copying the file to nix store if given as path instead of string,
+                        # as it might contain credentials
+                        cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N
+                      ''}
+
+                    rm /tmp/mysql_init
+                fi
+
+                ${optionalString (cfg.ensureDatabases != []) ''
+                  (
+                  ${concatMapStrings (database: ''
+                    echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"
+                  '') cfg.ensureDatabases}
                   ) | ${mysql}/bin/mysql -u root -N
-              fi
-            '') cfg.initialDatabases;
-          in
+                ''}
 
-          lib.optionalString (!hasNotify) cmdWatchForMysqlSocket + ''
-            if [ -f /tmp/mysql_init ]
-            then
-                ${cmdInitialDatabases}
-                ${optionalString (cfg.replication.role == "master")
+                ${concatMapStrings (user:
                   ''
-                    # Set up the replication master
-
-                    ( echo "use mysql;"
-                      echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
-                      echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
-                      echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
+                    ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
+                      ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
+                        echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"
+                      '') user.ensurePermissions)}
                     ) | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-                ${optionalString (cfg.replication.role == "slave")
-                  ''
-                    # Set up the replication slave
-
-                    ( echo "stop slave;"
-                      echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
-                      echo "start slave;"
-                    ) | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-                ${optionalString (cfg.initialScript != null)
-                  ''
-                    # Execute initial script
-                    # using toString to avoid copying the file to nix store if given as path instead of string,
-                    # as it might contain credentials
-                    cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-              rm /tmp/mysql_init
-            fi
-
-            ${optionalString (cfg.ensureDatabases != []) ''
-              (
-              ${concatMapStrings (database: ''
-                echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"
-              '') cfg.ensureDatabases}
-              ) | ${mysql}/bin/mysql -u root -N
-            ''}
-
-            ${concatMapStrings (user:
-              ''
-                ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
-                  ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
-                  echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"
-                  '') user.ensurePermissions)}
-                ) | ${mysql}/bin/mysql -u root -N
-              '') cfg.ensureUsers}
-
-          ''; # */
+                  '') cfg.ensureUsers}
+              '';
+            in
+              setupScript;
+        };
       };
 
   };

From d0a147e841c84b83fd3f7ceed68c0c1a660b81e9 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 30 Jun 2019 21:59:47 -0400
Subject: [PATCH 228/377] nixos/mysql: run ExecStartPost as root (again) to
 preserve compatibility with installs that have been secured

---
 nixos/modules/services/databases/mysql.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index c36aa96adf7..177e742d65e 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -412,7 +412,9 @@ in
                   '') cfg.ensureUsers}
               '';
             in
-              setupScript;
+              # ensureDatbases & ensureUsers depends on this script being run as root
+              # when the user has secured their mysql install
+              "+${setupScript}";
         };
       };
 

From d9193f9edab2383c7f9285baf6b11007938b0d64 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 30 Jun 2019 22:01:02 -0400
Subject: [PATCH 229/377] nixos/mysql: secure access to database in one of the
 nixos tests

---
 nixos/tests/mysql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index cfe10bc41b0..f712357b9ff 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -28,6 +28,12 @@ import ./make-test.nix ({ pkgs, ...} : {
       {
         users.users.testuser = { };
         services.mysql.enable = true;
+        services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
+          echo "ALTER USER root@localhost IDENTIFIED WITH unix_socket;"
+          echo "DELETE FROM mysql.user WHERE password = ''' AND plugin = ''';"
+          echo "DELETE FROM mysql.user WHERE user = ''';"
+          echo "FLUSH PRIVILEGES;"
+        '';
         services.mysql.ensureDatabases = [ "testdb" ];
         services.mysql.ensureUsers = [{
           name = "testuser";

From f7710fdd8e8fb49618ddbac75ce133313042f1a7 Mon Sep 17 00:00:00 2001
From: Nathan Yong <nathyong@users.noreply.github.com>
Date: Mon, 1 Jul 2019 11:46:08 +1000
Subject: [PATCH 230/377] watson: 1.5.2 -> 1.7.0

---
 maintainers/maintainer-list.nix             |  5 +++++
 pkgs/applications/office/watson/default.nix | 13 +++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2929ed5a571..7301197ea43 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3564,6 +3564,11 @@
     github = "nathan-gs";
     name = "Nathan Bijnens";
   };
+  nathyong = {
+    email = "nathyong@noreply.github.com";
+    github = "nathyong";
+    name = "Nathan Yong";
+  };
   nckx = {
     email = "github@tobias.gr";
     github = "nckx";
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index e0f0c58b450..3c3e238eab8 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -4,11 +4,11 @@ with pythonPackages;
 
 buildPythonApplication rec {
   pname = "td-watson";
-  version = "1.5.2";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
+    sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
   };
 
   # uses tox, test invocation fails
@@ -17,13 +17,6 @@ buildPythonApplication rec {
     py.test -vs tests
  '';
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;
-      sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";
-    })
-  ];
-
   checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
   propagatedBuildInputs = [ requests click arrow ];
 
@@ -31,6 +24,6 @@ buildPythonApplication rec {
     homepage = https://tailordev.github.io/Watson/;
     description = "A wonderful CLI to track your time!";
     license = licenses.mit;
-    maintainers = with maintainers; [ mguentner ] ;
+    maintainers = with maintainers; [ mguentner nathyong ] ;
   };
 }

From 50855c5141d2f2d3ffc0c32dd457f7717e5b271b Mon Sep 17 00:00:00 2001
From: Nathan Yong <nathyong@users.noreply.github.com>
Date: Mon, 1 Jul 2019 13:18:56 +1000
Subject: [PATCH 231/377] watson: use expected pname in NixOS package

---
 pkgs/applications/office/watson/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index 3c3e238eab8..cf23171ba1e 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -3,11 +3,12 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  pname = "td-watson";
+  pname = "watson";
   version = "1.7.0";
 
   src = fetchPypi {
-    inherit version pname;
+    inherit version;
+    pname = "td-watson";
     sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
   };
 

From 4976d7ec3f1126618f2c312002811157406fc2ee Mon Sep 17 00:00:00 2001
From: Nathan Yong <nathyong@users.noreply.github.com>
Date: Mon, 1 Jul 2019 13:20:13 +1000
Subject: [PATCH 232/377] watson: use pytest for testing

---
 pkgs/applications/office/watson/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index cf23171ba1e..16df0b294c1 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -12,10 +12,8 @@ buildPythonApplication rec {
     sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
   };
 
-  # uses tox, test invocation fails
-  doCheck = true;
   checkPhase = ''
-    py.test -vs tests
+    pytest -vs tests
  '';
 
   checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];

From e117e6dd268c54f9a40deac74015a5a66a401e28 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Jun 2019 22:50:51 -0500
Subject: [PATCH 233/377] prototool: init at 1.8.0 (#63887)

---
 pkgs/development/tools/prototool/default.nix | 33 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/tools/prototool/default.nix

diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix
new file mode 100644
index 00000000000..27794448893
--- /dev/null
+++ b/pkgs/development/tools/prototool/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }:
+
+buildGoModule rec {
+  pname = "prototool";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "uber";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0m6g5p3jyf0ja5j9rqmw8mhipdqxk7rcxm0plmh65bxk1n22fzjc";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  modSha256 = "0l4nqb1c1lqqk70l9qwib1azavxlwghi2fv5siwrr5zw4jysz5ml";
+
+  postInstall = ''
+    wrapProgram "$out/bin/prototool" \
+      --prefix PROTOTOOL_PROTOC_BIN_PATH : "${protobuf}/bin/protoc" \
+      --prefix PROTOTOOL_PROTOC_WKT_PATH : "${protobuf}/include"
+  '';
+
+  subPackages = [ "cmd/prototool" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/uber/prototool";
+    description = "Your Swiss Army Knife for Protocol Buffers";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f2cab11d4..8f52ae24911 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15896,6 +15896,8 @@ in
 
   procdump = callPackage ../os-specific/linux/procdump { };
 
+  prototool = callPackage ../development/tools/prototool { };
+
   qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
 
   # See `xenPackages` source for explanations.

From cef41b96f667ee784625731936a516517b14206f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Jun 2019 22:40:53 -0700
Subject: [PATCH 234/377] atlassian-confluence: 6.15.4 -> 6.15.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/atlassian-confluence/versions
---
 pkgs/servers/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 6a64b0bc399..2f7a7c80cb6 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.15.4";
+  version = "6.15.6";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";
-    sha256 = "0br51h8i99v6xc15280ra447c7fkiwf8nqgyzni0llhy1g1qcnmv";
+    sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m";
   };
 
   buildPhase = ''

From 40e6036813ff753e3b93de20cfc67d81e75c30be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Jun 2019 22:47:00 -0700
Subject: [PATCH 235/377] atlassian-jira: 8.2.1 -> 8.2.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/atlassian-jira/versions
---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 9b83a7e4c3a..4300ee8e7ec 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "8.2.1";
+  version = "8.2.2";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "1556hliywjiz6977249mlgxaq5xzpzq3xm9bcg9vk57s1hsv175i";
+    sha256 = "1azis5jxrdfviyvvbpzlrpqaayvzs9kggmj4rv9gbsn7ji96i781";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From da1845781073bd8d14e7de6c4da595919fd3e6a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Jun 2019 22:57:52 -0700
Subject: [PATCH 236/377] avfs: 1.0.6 -> 1.1.0

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

diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 5c44ef23963..5fc614de4a7 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "avfs-${version}";
-  version = "1.0.6";
+  version = "1.1.0";
   src = fetchurl {
     url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
-    sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc";
+    sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9194d0f925d7f5a55d1ea0f8de3c67d748323e56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Jun 2019 23:13:29 -0700
Subject: [PATCH 237/377] baresip: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 8d9df407cdd..75e1791644b 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.6.2";
+  version = "0.6.3";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1qi8im5sc3jbpic1sn46mmd98y0pckpnngf4n8dqdp76m4gf3yp1";
+    sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123

From 4f4eaf5805db28f70b54f6ea452b768095b90fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 1 Jul 2019 08:44:38 +0200
Subject: [PATCH 238/377] trompeloeil: init at 34

Trompeloeil is a header only C++14 mocking framework.
---
 .../libraries/trompeloeil/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/trompeloeil/default.nix

diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
new file mode 100644
index 00000000000..552bd4c1c51
--- /dev/null
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "trompeloeil-${version}";
+  version = "34";
+
+  src = fetchFromGitHub {
+    owner = "rollbear";
+    repo = "trompeloeil";
+    rev = "v${version}";
+    sha256 = "0mj3zni18kfm04jrqjaa1p6ii5q0dz6qdm3hi57z9lzygaxbdc97";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Header only C++14 mocking framework";
+    homepage = "https://github.com/rollbear/trompeloeil";
+    license = licenses.boost;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc99906f8f5..ac4068005e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2663,6 +2663,8 @@ in
 
   tridactyl-native = callPackage ../tools/networking/tridactyl-native { };
 
+  trompeloeil = callPackage ../development/libraries/trompeloeil { };
+
   uudeview = callPackage ../tools/misc/uudeview { };
 
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {

From dc08a411a8d17bf1c8e89d7a9913873831d66d0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 00:05:59 -0700
Subject: [PATCH 239/377] beanstalkd: 1.10 -> 1.11

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

diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index ef4621fb9a6..528dc8a48a0 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  version = "1.10";
+  version = "1.11";
   name = "beanstalkd-${version}";
 
   installPhase=''make install "PREFIX=$out"'';
 
   src = fetchurl {
     url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";
-    sha256 = "0n9dlmiddcfl7i0f1lwfhqiwyvf26493fxfcmn8jm30nbqciwfwj";
+    sha256 = "0i65d0pln1p6wxghzwziz2k8vafvdgjq6yc962ayzs80kpj18d2y";
   };
 
   hardeningDisable = [ "fortify" ];

From 5da7c72d2a3c354a175d15d9e7a5ffca9c6cb048 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 00:14:08 -0700
Subject: [PATCH 240/377] bfs: 1.4.1 -> 1.5

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

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index a0575067482..9c6f21009ee 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.4.1";
+  version = "1.5";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb";
+    sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

From c25430086acb46b2e9c93e8699d25a3dd331e880 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 30 Jun 2019 22:43:02 +0000
Subject: [PATCH 241/377] irssi: 1.2.0 -> 1.2.1

CVE-2019-13045
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 8aa599c09c4..347b7b28ca9 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.0";
+  version = "1.2.1";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m";
+    sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 232f9203c4fbdc1d975f61330a91011483d620dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 01:07:47 -0700
Subject: [PATCH 242/377] calcurse: 4.4.0 -> 4.5.0

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

diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index dc0460c2a23..a1581408201 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "calcurse-${version}";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "https://calcurse.org/files/${name}.tar.gz";
-    sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd";
+    sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3";
   };
 
   buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];

From 80dd8529364c78d0c95153d1789dc77dea832a38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 01:16:18 -0700
Subject: [PATCH 243/377] catimg: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix
index 1d85fdfd292..ac2f3f3411a 100644
--- a/pkgs/tools/misc/catimg/default.nix
+++ b/pkgs/tools/misc/catimg/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "catimg";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "posva";
     repo = pname;
     rev = version;
-    sha256 = "0n74iczzgxrcq3zpa7ndycb9rinm829yvf81c747q4ngv5q6pzcm";
+    sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz";
   };
 
   nativeBuildInputs = [ cmake ];

From ba189ee3b52db96cbd5d6ce4d66c247280ef0a68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 01:49:14 -0700
Subject: [PATCH 244/377] chicken: 5.0.0 -> 5.1.0

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

diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index ff0faf40839..a3b32ceee0c 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
 
 let
-  version = "5.0.0";
+  version = "5.1.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
-    sha256 = "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8";
+    sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw";
   };
 
   setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;

From 35efc84284c9b2ef674309846144d70d122edc0c Mon Sep 17 00:00:00 2001
From: N G <ngerstle+gitkraken@gmail.com>
Date: Mon, 1 Jul 2019 11:02:04 +0200
Subject: [PATCH 245/377] kub3d: init at v1.1.0

---
 .../networking/cluster/kube3d/default.nix     |  25 +++
 .../networking/cluster/kube3d/deps.nix        | 174 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 201 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kube3d/default.nix
 create mode 100644 pkgs/applications/networking/cluster/kube3d/deps.nix

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
new file mode 100644
index 00000000000..bc01055244c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "kube3d";
+  version = "1.1.0";
+
+  goPackagePath = "github.com/rancher/k3d";
+
+  src = fetchFromGitHub {
+    owner  = "rancher";
+    repo   = "k3d";
+    rev    = "v${version}";
+    sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/rancher/k3d";
+    description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kuznero ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/kube3d/deps.nix b/pkgs/applications/networking/cluster/kube3d/deps.nix
new file mode 100644
index 00000000000..4fb2936a40b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube3d/deps.nix
@@ -0,0 +1,174 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev = "v0.4.12";
+      sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.0";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev = "v2.7.1";
+      sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev = "v1.13.1";
+      sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev = "v0.4.0";
+      sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev = "v0.3.3";
+      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "v0.0.4";
+      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "v0.0.1";
+      sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
+    };
+  }
+  {
+    goPackagePath = "github.com/opencontainers/go-digest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/go-digest";
+      rev = "v1.0.0-rc1";
+      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.1";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.0";
+      sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.3.0";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "v1.20.0";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "c2843e01d9a2";
+      sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "b630fd6fe46b";
+      sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d0b11bdaac8a";
+      sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc99906f8f5..667df964d54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24326,4 +24326,6 @@ in
 
   dapper = callPackage ../development/tools/dapper { };
 
+  kube3d =  callPackage ../applications/networking/cluster/kube3d {};
+
 }

From dbf30c6d5f0eedb5fc54391cfe8fac319205db64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 02:46:16 -0700
Subject: [PATCH 246/377] cppcheck: 1.87 -> 1.88

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

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index f228cf7774c..09901afdd20 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.87";
+  version = "1.88";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1jl1qlr8la1rix1ffcvl6s4arv2n9fvx85sl4zgp29428xks9c73";
+    sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";
   };
 
   buildInputs = [ pcre ];

From d096030d07b59e84b3e9551bc64aa2442d23caf5 Mon Sep 17 00:00:00 2001
From: Craig Hall <gloaming@users.noreply.github.com>
Date: Mon, 1 Jul 2019 11:22:48 +0100
Subject: [PATCH 247/377] PULL_REQUEST_TEMPLATE: "Assured whether" -> "Ensured
 that"

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 834a2e81c13..5e8b84f3ce8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,7 +15,7 @@
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
-- [ ] Assured whether relevant documentation is up to date
+- [ ] Ensured that relevant documentation is up to date
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
 
 ---

From 30ccf0588aa12d840785f76d54217bd28d0fc273 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 04:08:37 -0700
Subject: [PATCH 248/377] drawpile: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 31a9fa57b50..eca3740f975 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -59,11 +59,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "drawpile-${version}";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchurl {
     url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
-    sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm";
+    sha256 = "00r5vzracvjk369rri2jxzgfaa1ll4qj5gdmzgflvidz8420bcvm";
   };
 
   nativeBuildInputs = [

From 31c3b76691ae5c26c028f07633818b2d171322af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 02:35:35 -0700
Subject: [PATCH 249/377] copyq: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index c77e47df34c..3ee357ce151 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0kbhgg0j6iqfrpixvwl1mk3m0bz5s8bd6npk5xqcgzp1giywdc4i";
+    sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3";
   };
 
   nativeBuildInputs = [ cmake ];

From df1d27ac31f71281c7745e12e3d32c79db351061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 1 Jul 2019 14:36:09 +0200
Subject: [PATCH 250/377] firefox: fix highly parallel make by upstream patch

---
 pkgs/applications/networking/browsers/firefox/common.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 6e39904d27b..29b12c9fec0 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -94,7 +94,14 @@ let
 
   browserPatches = [
     ./env_var_for_system_dir.patch
-  ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [
+  ]
+  ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69")
+    (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
+      name = "write_error-parallel_make.diff";
+      url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
+      sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";
+    })
+  ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [
     (fetchpatch {
       url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch";
       sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32";

From a7d9edab859af22b137e737393c772dc1c6e0990 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 05:55:58 -0700
Subject: [PATCH 251/377] f3: 7.1 -> 7.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/f3/versions
---
 pkgs/tools/filesystems/f3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 7fb9ed3c97a..598263c8895 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "f3";
-  version = "7.1";
+  version = "7.2";
 
   enableParallelBuilding = true;
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "AltraMayor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf";
+    sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy";
   };
 
   buildInputs = [ parted udev ];

From 52d5b7a14478a804313cb0736bf0b80cd7fda819 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Mon, 1 Jul 2019 09:15:33 -0400
Subject: [PATCH 252/377] pythonPackage.pip-tools: 3.3.2 -> 3.8.0 (#63632)

* pythonPackage.pip-tools: skip failing test
* pythonPackages.pip-tools: sort skipped tests
* pythonPackage.pip-tools: use fetchPypi
* pythonPackage.pip-tools: 3.3.2 -> 3.8.0
---
 .../python-modules/pip-tools/default.nix      | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 3c3183da273..a9054b2ed85 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first
+{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first
 , setuptools_scm, git, glibcLocales, mock }:
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "3.3.2";
-  name = pname + "-" + version;
+  version = "3.8.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
-    sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vwh3hx4jrzf51yj9h31nk9ji53lqaq63mlqd7n84hcmfwy3rwz4";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -17,13 +16,22 @@ buildPythonPackage rec {
 
   disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [
     # Depend on network tests:
+    "test_allow_unsafe_option" #paramaterized, but all fail
+    "test_annotate_option" #paramaterized, but all fail
     "test_editable_package_vcs"
-    "test_generate_hashes_all_platforms"
-    "test_generate_hashes_without_interfering_with_each_other"
-    "test_realistic_complex_sub_dependencies"
-    "test_generate_hashes_with_editable"
+    "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore
+    "test_filter_pip_markers"
     "test_filter_pip_markes"
+    "test_generate_hashes_all_platforms"
+    "test_generate_hashes_verbose"
+    "test_generate_hashes_with_editable"
+    "test_generate_hashes_with_url"
+    "test_generate_hashes_without_interfering_with_each_other"
     "test_get_hashes_local_repository_cache_miss"
+    "test_realistic_complex_sub_dependencies"
+    "test_stdin"
+    "test_upgrade_packages_option"
+    "test_url_package"
     # Expect specific version of "six":
     "test_editable_package"
     "test_input_file_without_extension"

From af56a8fd4528c5201bfab10d49ce936fd34137b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 01:37:44 -0700
Subject: [PATCH 253/377] checkstyle: 8.21 -> 8.22

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 5b80a5079b6..78033633b96 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.21";
+  version = "8.22";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "1jd6kbfmvgr3mr8kjhhr1fj1i3j36ysnfi14g5027ngwbq7klm7d";
+    sha256 = "0lnpzh4c5m8xkdx8dxywp33i3zrnwj1nhgpqnqgx31aw3x0drw40";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 80aadbec604245071e73d5db57a282b830e6b2a9 Mon Sep 17 00:00:00 2001
From: Erlend Hamberg <erlend@hamberg.no>
Date: Mon, 1 Jul 2019 16:18:03 +0200
Subject: [PATCH 254/377] Install postgresql extensions under
 `$out/share/postgresql`

This fixes extensions after #62271 moved files from `$out/share` to
`$out/share/postgresql`.
---
 pkgs/servers/sql/postgresql/ext/cstore_fdw.nix       | 4 ++--
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++--
 pkgs/servers/sql/postgresql/ext/pg_bigm.nix          | 4 ++--
 pkgs/servers/sql/postgresql/ext/pg_cron.nix          | 4 ++--
 pkgs/servers/sql/postgresql/ext/pg_hll.nix           | 4 ++--
 pkgs/servers/sql/postgresql/ext/pg_partman.nix       | 6 +++---
 pkgs/servers/sql/postgresql/ext/pg_repack.nix        | 2 +-
 pkgs/servers/sql/postgresql/ext/pg_similarity.nix    | 2 +-
 pkgs/servers/sql/postgresql/ext/pg_topn.nix          | 4 ++--
 pkgs/servers/sql/postgresql/ext/pgjwt.nix            | 4 ++--
 pkgs/servers/sql/postgresql/ext/pgroonga.nix         | 2 +-
 pkgs/servers/sql/postgresql/ext/pgrouting.nix        | 4 ++--
 pkgs/servers/sql/postgresql/ext/pgtap.nix            | 2 +-
 pkgs/servers/sql/postgresql/ext/pipelinedb.nix       | 2 +-
 pkgs/servers/sql/postgresql/ext/plv8.nix             | 2 +-
 pkgs/servers/sql/postgresql/ext/postgis.nix          | 4 ++--
 pkgs/servers/sql/postgresql/ext/tds_fdw.nix          | 4 ++--
 pkgs/servers/sql/postgresql/ext/temporal_tables.nix  | 4 ++--
 pkgs/servers/sql/postgresql/ext/timescaledb.nix      | 2 +-
 pkgs/servers/sql/postgresql/ext/tsearch_extras.nix   | 2 +-
 20 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 54fc891acec..f2e814543db 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index d241d2aa7db..87a54471eca 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl
     install -D -t $out/lib src/monitor/pgautofailover.so
-    install -D -t $out/share/extension src/monitor/*.sql
-    install -D -t $out/share/extension src/monitor/pgautofailover.control
+    install -D -t $out/share/postgresql/extension src/monitor/*.sql
+    install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index 2cc9d7060f6..a8e5a54bc29 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 494e6dbac4f..40fcaeb7cca 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 16104e66b73..bccec1107b9 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index b8ca074f662..38e86fbfd8d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp src/*.so      $out/lib
-    cp updates/*     $out/share/extension
-    cp -r sql/*      $out/share/extension
-    cp *.control     $out/share/extension
+    cp updates/*     $out/share/postgresql/extension
+    cp -r sql/*      $out/share/postgresql/extension
+    cp *.control     $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 14f71b1e2b3..381a174838e 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -D bin/pg_repack -t $out/bin/
     install -D lib/pg_repack.so -t $out/lib/
-    install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension
+    install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index ee50bee033b..85ff50e2eae 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out/bin   # for buildEnv to setup proper symlinks
     install -D pg_similarity.so -t $out/lib/
-    install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension
+    install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension
   '';
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 1c1f3dcb87e..1a5aa91ae6e 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index 65b9c052f63..69c7a4513b6 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   buildPhase = ":";
   installPhase = ''
     mkdir -p $out/bin  # current postgresql extension mechanism in nixos requires bin directory
-    mkdir -p $out/share/extension
-    cp pg*sql *.control $out/share/extension
+    mkdir -p $out/share/postgresql/extension
+    cp pg*sql *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index db9cafd7af5..9058c443e37 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     install -D pgroonga.so -t $out/lib/
-    install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension
+    install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 722c70b2e89..9f4eda2bde9 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653
     install -D lib/*.so                        -t $out/lib
-    install -D sql/pgrouting--${version}.sql   -t $out/share/extension
-    install -D sql/common/pgrouting.control    -t $out/share/extension
+    install -D sql/pgrouting--${version}.sql   -t $out/share/postgresql/extension
+    install -D sql/common/pgrouting.control    -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index e4030730bf3..7dd6a5882b2 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
 
   installPhase = ''
-    install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension
+    install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
index de3cde8120d..01dcd54d95e 100644
--- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
+++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     install -D -t $out/lib/ pipelinedb.so
-    install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control}
+    install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix
index b6446f292c6..4b7c1235ca9 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     install -D plv8*.so                                        -t $out/lib
-    install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension
+    install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 7308c8c9389..de9d7eb1305 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     sed -i 's@/usr/bin/file@${file}/bin/file@' configure
-    configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
+    configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
 
-    makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"
+    makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin"
   '';
   postConfigure = ''
     sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index 4b321bbbc4f..3a4e0cba602 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -D tds_fdw.so                  -t $out/lib
-    install -D sql/tds_fdw--${version}.sql -t $out/share/extension
-    install -D tds_fdw.control             -t $out/share/extension
+    install -D sql/tds_fdw--${version}.sql -t $out/share/postgresql/extension
+    install -D tds_fdw.control             -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
index b4f85c4c53f..ac0299208f8 100644
--- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
+++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,lib,share/extension}
 
     cp *.so      $out/lib
-    cp *.sql     $out/share/extension
-    cp *.control $out/share/extension
+    cp *.sql     $out/share/postgresql/extension
+    cp *.control $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index d77a4129dd3..5f2facf449e 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     for x in CMakeLists.txt sql/CMakeLists.txt; do
       substituteInPlace "$x" \
-        --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\""
+        --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\""
     done
 
     for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index b43a9c51be0..87c82dd8207 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     install -D tsearch_extras.so -t $out/lib/
-    install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension
+    install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension
   '';
 
   meta = with stdenv.lib; {

From f3ad4381bacecbe846a4c8238213ca64d5698d27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 09:01:51 -0700
Subject: [PATCH 255/377] gnomeExtensions.appindicator: 28 -> 29

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

diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index d8180096d2f..568a6cace72 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-appindicator-${version}";
-  version = "28";
+  version = "29";
 
   src = fetchFromGitHub {
     owner = "Ubuntu";
     repo = "gnome-shell-extension-appindicator";
     rev = "v${version}";
-    sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl";
+    sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";
   };
 
   # This package has a Makefile, but it's used for building a zip for

From 839a149f88cb6221b843f7949d139a47d28e28fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 09:09:02 -0700
Subject: [PATCH 256/377] gnucash: 3.5 -> 3.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/gnucash/versions
---
 pkgs/applications/office/gnucash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index a9578e6525d..e4a89b513e9 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gnucash-${version}";
-  version = "3.5";
+  version = "3.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp";
+    sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];

From 33c5f3cec7456a07ecfdab1a1fb05919701e1346 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Mon, 1 Jul 2019 13:13:22 -0400
Subject: [PATCH 257/377] olm: allow building on Darwin

---
 pkgs/development/libraries/olm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 4749efb5f00..49daff30e7b 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
     license = stdenv.lib.licenses.asl20;
     homepage = https://matrix.org/git/olm/about;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
   };
 
   src = fetchurl {
@@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
   # requires optimisation but memory operations are compiled with -O0
   hardeningDisable = ["fortify"];
 
+  makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null;
+
   installFlags = "PREFIX=$(out)";
 }

From 01f10d01632092b1dcea8dae643b93cea87a38a1 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Mon, 1 Jul 2019 13:13:41 -0400
Subject: [PATCH 258/377] weechat-matrix-bridge: mark package as broken as
 Darwin

All of the dependencies of this package are now available on Darwin, but
the package itself still fails to build on that platform.
---
 .../irc/weechat/scripts/weechat-matrix-bridge/default.nix     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 137a32f9364..233fe418df3 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -42,5 +42,9 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ ma27 ];
     license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
     platforms = platforms.unix;
+
+    # As of 2019-06-30, all of the dependencies are available on macOS but the
+    # package itself does not build.
+    broken = stdenv.isDarwin;
   };
 }

From 39aac077235f2000d4ccc4effcd8140a9901795e Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Mon, 1 Jul 2019 13:14:36 -0400
Subject: [PATCH 259/377] mtxclient: mark package as broken on Darwin

All of the dependencies of this package are now available on Darwin, but
the package itself still fails to build on that platform.
---
 pkgs/development/libraries/mtxclient/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index ee8c8f101a2..ef8525cf54d 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -27,5 +27,9 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.unix;
+
+    # As of 2019-06-30, all of the dependencies are available on macOS but the
+    # package itself does not build.
+    broken = stdenv.isDarwin;
   };
 }

From e7572af2ec5b71ddf83dc49997fe963305639d75 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 1 Jul 2019 13:37:22 -0400
Subject: [PATCH 260/377] emacs-irony: Remove server directory

This contains the build files and is not needed for irony-server.
Previously, the wrong directory was removed, adding elpa/ gets thje
correct one.
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 953c25de0e8..a2fa021a8c2 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -312,7 +312,7 @@ let
     postInstall = ''
       mkdir -p $out
       mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
-      rm -rf $out/share/emacs/site-lisp/*/server
+      rm -rf $out/share/emacs/site-lisp/elpa/*/server
     '';
     preCheck = ''
       cd source/server

From 526f12b8868f56cfd9f7380b0b8e04dcf678a055 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 11:06:42 -0700
Subject: [PATCH 261/377] gap: 4.10.1 -> 4.10.2 (#64026)

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

diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index 9b42bcd9f13..7eb10d1f952 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -61,11 +61,11 @@ in
 stdenv.mkDerivation rec {
   pname = "gap";
   # https://www.gap-system.org/Releases/
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchurl {
     url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
-    sha256 = "136s0zvhcw41fshj5zgsrjcy2kd58cdh2m3ddp5rdizi4rx54f10";
+    sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94";
   };
 
   # remove all non-essential packages (which take up a lot of space)

From 536617361497ad0badce015040ccd35d3d1fbf3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Kne=C5=BEevi=C4=87?= <knl@users.noreply.github.com>
Date: Mon, 1 Jul 2019 22:02:25 +0200
Subject: [PATCH 262/377] nomad: 0.8.7 -> 0.9.3 (#63854)

0.9 series require go 1.11.11+ so switching to default 1.12.
---
 pkgs/applications/networking/cluster/nomad/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                        | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 9e55c2f8a0f..63a127def7f 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.8.7";
+  version = "0.9.3";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,9 +12,13 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "0nkqiqkrccfmn7qkbhd48m9m56ix4xb0a3ar0z0pl4sbm25rlj0b";
+    sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr";
   };
 
+  # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+  # Ref: https://github.com/hashicorp/nomad/issues/5535
+  buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+
   meta = with stdenv.lib; {
     homepage = https://www.nomadproject.io/;
     description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71773a7ae60..13f13bf266b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4841,9 +4841,7 @@ in
 
   noip = callPackage ../tools/networking/noip { };
 
-  nomad = callPackage ../applications/networking/cluster/nomad {
-    buildGoPackage = buildGo110Package;
-  };
+  nomad = callPackage ../applications/networking/cluster/nomad { };
 
   notable = callPackage ../applications/misc/notable { };
 

From 17fafbb53165fd52f3294a06c38d360606427054 Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Thu, 27 Jun 2019 22:07:21 +0200
Subject: [PATCH 263/377] clipgrab: 3.8.2 -> 3.8.3

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

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index a94bb7ade33..9b29e18d0bc 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.8.2";
+  version = "3.8.3";
 
   src = fetchurl {
-    sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";
+    sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From f449ef7e0bbd6e8f1e8f0570d862d577184e306e Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Mon, 1 Jul 2019 12:46:05 +0200
Subject: [PATCH 264/377] clipgrab: add comment about backporting

---
 pkgs/applications/video/clipgrab/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 9b29e18d0bc..974dbd83a03 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,6 +5,9 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
+  # The websites clipgrab deals with are a very moving target. That means that
+  # downloads break constantly. Because of that, updates should always be backported
+  # to the latest stable release.
   version = "3.8.3";
 
   src = fetchurl {

From eb9eef12fc686f25fc559d7df2fa717b0f834eb0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 1 Jul 2019 16:35:01 -0400
Subject: [PATCH 265/377] Revert "clipgrab: add comment about backporting"

This reverts commit f449ef7e0bbd6e8f1e8f0570d862d577184e306e.
---
 pkgs/applications/video/clipgrab/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 974dbd83a03..9b29e18d0bc 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,9 +5,6 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  # The websites clipgrab deals with are a very moving target. That means that
-  # downloads break constantly. Because of that, updates should always be backported
-  # to the latest stable release.
   version = "3.8.3";
 
   src = fetchurl {

From f824fc8bf08db02bd3a9573efe3dd0a44f807c54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 13:45:31 -0700
Subject: [PATCH 266/377] languagetool: 4.4 -> 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/languagetool/versions
---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 00ccfceb31b..1ccba80cb3e 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "LanguageTool-${version}";
-  version = "4.4";
+  version = "4.6";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1";
+    sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From 58f7155da5203838722687c7305886e67e3a889d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20ANDR=C3=89-CHANG?= <nils.andre.chang@gmail.com>
Date: Mon, 1 Jul 2019 22:35:08 +0100
Subject: [PATCH 267/377] alacritty: build on i686-linux (#63199)

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

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index c69a523691f..490c83bed07 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -120,6 +120,6 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
   };
 }

From 90ceb64cd0dc4b319140f68511e378136d94c4bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 13:21:18 -0700
Subject: [PATCH 268/377] kotlin: 1.3.31 -> 1.3.40

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 87c798c8d38..f49d63168d4 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.31";
+  version = "1.3.40";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh";
+    sha256 = "14n3x0771d0a1yqncig97lk4bigkx2nvx20khpcnvf873c2b3h28";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 397bdcc4a124e3c6709b5d3c98003d7414d575c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 15:27:56 -0700
Subject: [PATCH 269/377] libsass: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 957201b83ab..2092d72c9f8 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsass";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
     rev = version;
-    sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a";
+    sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''

From ec846ecf71c9ab1dce7fb7804eb980bd8189cda9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 1 Jul 2019 18:26:11 -0400
Subject: [PATCH 270/377] oh-my-zsh: 2019-06-27 -> 2019-07-01

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d51ee1982fa..38439b4427c 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-06-27";
+  version = "2019-07-01";
   name = "oh-my-zsh-${version}";
-  rev = "7b2c4327e7d40ec17b72fe7fce3031dfc92fb165";
+  rev = "b259cdf7e71ad6c3cc1a66a48c6c79cf63f38590";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "13k5jnr4i227b2ipfaslax2yr7r8scd50mrsywfnzidsxcq13096";
+    sha256 = "1vk9misnvjs1lxlwzy4ld30vh67nhghzra1y5ckgxa019l9cvann";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 73392e79aa62e406683d6a732eb4f4101f4732be Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 1 Jul 2019 18:29:15 -0400
Subject: [PATCH 271/377] linux: 5.2-rc6 -> 5.2-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index bf0161ab033..59b406a91ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2-rc6";
+  version = "5.2-rc7";
   extraMeta.branch = "5.2";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "15lwy9596v5sw8c6mhpl9ilfcmm39snvvyajg08ycsg61i2s58v0";
+    sha256 = "1128jb1y4gia5icv614ycp3c5mkvrb2l2wn20765b3si256g68n4";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 767de5493811a4bceba920bd9fc096a2f39760b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 16:52:26 -0700
Subject: [PATCH 272/377] lynis: 2.7.4 -> 2.7.5

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

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 198e33c8500..7579636cfbf 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.7.4";
+  version = "2.7.5";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k";
+    sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 00f08c6c643bccb5b79a575f20cba720f7609090 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 19:27:34 -0700
Subject: [PATCH 273/377] nmon: 16j -> 16k

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

diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index bb00db9868e..bcb28995f0d 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nmon-${version}";
-  version = "16j";
+  version = "16k";
 
   src = fetchurl {
     url = "mirror://sourceforge/nmon/lmon${version}.c";
-    sha256 = "05a6yc1w421r30qg32a8j0wajjv2ff1mwwsrariv3fz3ng4phf5s";
+    sha256 = "17nbxrnl7kqiaaxn2hwyi65gphbl3wybbyp9vri2q5ifdis3ssib";
   };
 
   buildInputs = [ ncurses ];

From dc8740574cf17dc62d5359913dfe84fa87d68db9 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Mon, 1 Jul 2019 20:32:16 -0700
Subject: [PATCH 274/377] pre-commit: 1.16.1 -> 1.17.0 (#64091)

---
 .../version-management/git-and-tools/pre-commit/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index 496354971ee..ed44043eb9a 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,12 +1,12 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
   pname = "pre-commit";
-  version = "1.16.1";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit version;
     pname = "pre_commit";
-    sha256 = "6ca409d1f22d444af427fb023a33ca8b69625d508a50e1b7eaabd59247c93043";
+    sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c";
   };
 
   propagatedBuildInputs = [

From e2a407bb01b51b922c9fd4d2ff9a044dd773a36d Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Mon, 1 Jul 2019 21:34:52 -0600
Subject: [PATCH 275/377] discord-canary: 0.0.84 -> 0.0.85

---
 .../networking/instant-messengers/discord/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 047a833e163..c9dfc79d267 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
-    version = "0.0.84";
+    version = "0.0.85";
     src = fetchurl {
-      url = "https://dl-canary.discordapp.net/apps/linux/0.0.84/discord-canary-0.0.84.tar.gz";
-      sha256 = "1s4m7qvwyb0zglgdcixfnp5asachkybfafbmr74c7zrb0scl80s1";
+      url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz";
+      sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j";
     };
   };
 }.${branch}

From 80f39fb0c15d4ca06eead87452b22e0b181929cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 20:51:20 -0700
Subject: [PATCH 276/377] helmfile: 0.77.0 -> 0.79.3 (#64044)

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

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 6c5c281d039..1faa0988a66 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.77.0"; in
+let version = "0.79.3"; in
 
 buildGoModule {
   pname = "helmfile";
@@ -10,7 +10,7 @@ buildGoModule {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0nj8gs7aqkxpj6bd80ks7g34qqa4y53a8sim1znbxs6mb678c2x2";
+    sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v";
   };
 
   goPackagePath = "github.com/roboll/helmfile";

From 06d3491d2a3acbff4af34c2c5b14e7f8a2f5a0ae Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Mon, 1 Jul 2019 20:52:06 -0700
Subject: [PATCH 277/377] protoc-gen-doc: init unstable at 2019-04-22 (#64093)

---
 .../tools/protoc-gen-doc/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/tools/protoc-gen-doc/default.nix

diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
new file mode 100644
index 00000000000..559383f45fe
--- /dev/null
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  name = "protoc-gen-doc-unstable-${version}";
+  version = "2019-04-22";
+
+  src = fetchFromGitHub {
+    owner = "pseudomuto";
+    repo = "protoc-gen-doc";
+    rev = "f824a8908ce33f213b2dba1bf7be83384c5c51e8";
+    sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj";
+  };
+
+  modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd";
+
+  meta = with lib; {
+    description = "Documentation generator plugin for Google Protocol Buffers";
+    longDescription = ''
+      This is a documentation generator plugin for the Google Protocol Buffers
+      compiler (protoc). The plugin can generate HTML, JSON, DocBook and
+      Markdown documentation from comments in your .proto files.
+
+      It supports proto2 and proto3, and can handle having both in the same
+      context.
+    '';
+    homepage = "https://github.com/pseudomuto/protoc-gen-doc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 746c8819e7e..1424dd4be75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -163,6 +163,8 @@ in
 
   proto-contrib = callPackage ../development/tools/proto-contrib {};
 
+  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
+
   demoit = callPackage ../servers/demoit { };
 
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;

From 4c86deee99bd1d61b6a9de6d3dcabcc55051e15d Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@satoshilabs.com>
Date: Tue, 2 Jul 2019 06:01:13 +0200
Subject: [PATCH 278/377] packr: init at 2.5.1 (#63886)

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

diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
new file mode 100644
index 00000000000..c44695cb70a
--- /dev/null
+++ b/pkgs/development/libraries/packr/default.nix
@@ -0,0 +1,25 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "packr";
+  version = "2.5.1";
+
+  src = fetchFromGitHub {
+    owner = "gobuffalo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy";
+  };
+
+  modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn";
+
+  meta = with lib; {
+    description = "The simple and easy way to embed static files into Go binaries";
+    homepage = "https://github.com/gobuffalo/packr";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1424dd4be75..e3e4654c12f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -246,6 +246,8 @@ in
 
   packer = callPackage ../development/tools/packer { };
 
+  packr = callPackage ../development/libraries/packr { };
+
   pet = callPackage ../development/tools/pet { };
 
   mod = callPackage ../development/tools/mod { };

From 7c61b3b8929f81f79cdc5327d373289e03cf3345 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 1 Jul 2019 21:12:25 -0700
Subject: [PATCH 279/377] treewide: fix malformed homepage URLs

---
 pkgs/servers/headphones/default.nix | 2 +-
 pkgs/servers/sickbeard/default.nix  | 2 +-
 pkgs/servers/sickbeard/sickgear.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix
index eff1155fc20..aab651d5a4a 100644
--- a/pkgs/servers/headphones/default.nix
+++ b/pkgs/servers/headphones/default.nix
@@ -27,7 +27,7 @@ python2.pkgs.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "Automatic music downloader for SABnzbd";
     license     = licenses.gpl3;
-    homepage    = https:/github.com/rembo10/headphones;
+    homepage    = "https://github.com/rembo10/headphones";
     maintainers = with stdenv.lib.maintainers; [ rembo10 ];
   };
 }
diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix
index 20840a978c5..6dc044092ad 100644
--- a/pkgs/servers/sickbeard/default.nix
+++ b/pkgs/servers/sickbeard/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "PVR & episode guide that downloads and manages all your TV shows";
     license     = licenses.gpl3;
-    homepage    = https:/github.com/midgetspy/Sick-Beard;
+    homepage    = "https://github.com/midgetspy/Sick-Beard";
     maintainers = with stdenv.lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index b50c6b36acd..7a0994ef814 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation";
     license     = licenses.gpl3;
-    homepage    = https:/github.com/SickGear/SickGear;
+    homepage    = "https://github.com/SickGear/SickGear";
     maintainers = with stdenv.lib.maintainers; [ ];
   };
 }

From 7f69cab8a606f318efc21edde9da7b5389b2cb13 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Mon, 1 Jul 2019 21:18:02 -0700
Subject: [PATCH 280/377] bazel: add a test asserting java and java proto
 (#63927)

---
 .../tools/build-managers/bazel/default.nix    | 21 ++++---
 .../tools/build-managers/bazel/java-test.nix  | 56 +++++++++++++++++++
 .../build-managers/bazel/protobuf-test.nix    | 12 +++-
 3 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/bazel/java-test.nix

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 8aac432d3bb..bad0023eef3 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -94,8 +94,7 @@ let
   # however it contains prebuilt java binaries, with wrong interpreter
   # and libraries path.
   # We prefetch it, patch it, and override it in a global bazelrc.
-  system = if stdenv.hostPlatform.isDarwin
-           then "darwin" else "linux";
+  system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
 
   remote_java_tools = stdenv.mkDerivation {
     name = "remote_java_tools_${system}";
@@ -149,11 +148,16 @@ stdenv.mkDerivation rec {
   # in the nixpkgs checkout root to exercise them locally.
   passthru.tests =
     let
-      runLocal = name: attrs: script: runCommandCC name ({
+      runLocal = name: attrs: script:
+      let
+        attrs' = removeAttrs attrs [ "buildInputs" ];
+        buildInputs = [ python3 ] ++ (attrs.buildInputs or []);
+      in
+      runCommandCC name ({
+        inherit buildInputs;
         preferLocalBuild = true;
         meta.platforms = platforms;
-        buildInputs = [ python3 ];
-      } // attrs) script;
+      } // attrs') script;
 
       # bazel wants to extract itself into $install_dir/install every time it runs,
       # so let’s do that only once.
@@ -173,10 +177,10 @@ stdenv.mkDerivation rec {
             cp -R ${install_dir} $out
           '';
 
-      bazelTest = { name, bazelScript, workspaceDir, bazelPkg }:
+      bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
         let
           be = extracted bazelPkg;
-        in runLocal name {} (
+        in runLocal name { inherit buildInputs; } (
           # skip extraction caching on Darwin, because nobody knows how Darwin works
           (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
             # set up home with pre-unpacked bazel
@@ -214,11 +218,13 @@ stdenv.mkDerivation rec {
     in {
       bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
       cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; };
+      java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; };
       protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; };
       pythonBinPath = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };
 
       bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
       cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
+      javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
       protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
       pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
     };
@@ -237,7 +243,6 @@ stdenv.mkDerivation rec {
   __darwinAllowLocalNetworking = true;
 
   # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
-
   customBash = writeCBin "bash" ''
     #include <stdio.h>
     #include <stdlib.h>
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
new file mode 100644
index 00000000000..5f780a795e3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -0,0 +1,56 @@
+{
+  bazel
+, bazelTest
+, bazel-examples
+, gccStdenv
+, lib
+, openjdk8
+, runLocal
+, runtimeShell
+, writeScript
+, writeText
+}:
+
+let
+
+  toolsBazel = writeScript "bazel" ''
+    #! ${runtimeShell}
+
+    export CXX='${gccStdenv.cc}/bin/g++'
+    export LD='${gccStdenv.cc}/bin/ld'
+    export CC='${gccStdenv.cc}/bin/gcc'
+
+    # XXX: hack for macosX, this flags disable bazel usage of xcode
+    # See: https://github.com/bazelbuild/bazel/issues/4231
+    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+    exec "$BAZEL_REAL" "$@"
+  '';
+
+  workspaceDir = runLocal "our_workspace" {} (''
+    cp -r ${bazel-examples}/java-tutorial $out
+    find $out -type d -exec chmod 755 {} \;
+  ''
+  + (lib.optionalString gccStdenv.isDarwin ''
+    mkdir $out/tools
+    cp ${toolsBazel} $out/tools/bazel
+  ''));
+
+  testBazel = bazelTest {
+    name = "bazel-test-cpp";
+    inherit workspaceDir;
+    bazelPkg = bazel;
+    buildInputs = [ openjdk8 ];
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        run \
+          --host_javabase='@local_jdk//:jdk' \
+          --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+          --javabase='@local_jdk//:jdk' \
+          --verbose_failures \
+          //:ProjectRunner
+    '';
+  };
+
+in testBazel
+
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index c4120f2fc03..90065be67bc 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -5,6 +5,7 @@
 , fetchurl
 , gccStdenv
 , lib
+, openjdk8
 , runLocal
 , runtimeShell
 , writeScript
@@ -77,6 +78,8 @@ let
   personProto = writeText "person.proto" ''
     syntax = "proto3";
 
+    package person;
+
     message Person {
       string name = 1;
       int32 id = 2;
@@ -134,10 +137,15 @@ let
     name = "bazel-test-protocol-buffers";
     inherit workspaceDir;
     bazelPkg = bazel;
+    buildInputs = [ openjdk8 ];
     bazelScript = ''
       ${bazel}/bin/bazel \
-        build --verbose_failures \
-          //person:person_proto
+        build \
+          --host_javabase='@local_jdk//:jdk' \
+          --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+          --javabase='@local_jdk//:jdk' \
+          --verbose_failures \
+          //...
     '';
   };
 

From 3f691b4ae7f9bb0ce6a3f5474aa55007fd89bcb3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 21:24:16 -0700
Subject: [PATCH 281/377] ogre: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index a6de278a7a7..f1b6060e166 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   name = "ogre-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
      url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";
-     sha256 = "1hkkg5prixppiq1p5jz7wz1npm5s7kwm1s86079280waccvr2v6x";
+     sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
   };
 
   cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]

From f53fffc6dca546ec0b03fe9ce6cc1b4c46652fd4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 22:11:48 -0700
Subject: [PATCH 282/377] opensubdiv: 3.3.3 -> 3.4.0

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

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 57f1c9830a6..72e532ae782 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensubdiv-${version}";
-  version = "3.3.3";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     rev = "v${lib.replaceChars ["."] ["_"] version}";
-    sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z";
+    sha256 = "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12";
   };
 
   outputs = [ "out" "dev" ];

From e8d00113e232230d7f53e23342b13acb230cfb56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 15:37:13 -0700
Subject: [PATCH 283/377] liburcu: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 0cc1b0d08f9..90be7740114 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.11.0";
+  version = "0.11.1";
   name = "liburcu-${version}";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s";
+    sha256 = "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj";
   };
 
   checkInputs = [ perl ];

From 68c01eb0ece78ae245afe8014e4fb5a68660dc44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 22:47:51 -0700
Subject: [PATCH 284/377] papirus-icon-theme: 20190521 -> 20190615

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

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 590ca396bc6..fb659e1c22e 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20190521";
+  version = "20190615";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "192s14bf2ni46jkiifbsl82qy1miy8fnxs2fpqwf6s6jlv9x4zxs";
+    sha256 = "1999q6jw4ib8xrw3ydmprnq0mbmzqj8l92rx4rrh22lw9kdvig8w";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 81f6cc80e51242d375b0640ed71937a5db3709ef Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:10:15 -0700
Subject: [PATCH 285/377] Sort vim-plugin-names alphabetically,
 case-insensitive

---
 pkgs/misc/vim-plugins/generated.nix    | 88 +++++++++++++-------------
 pkgs/misc/vim-plugins/vim-plugin-names |  8 +--
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 0947deb6e6c..d3046ef180c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,11 +61,11 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-06-21";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "65ba4b85ec3011cccb9ea7135183e7fc8d7a0d69";
+      rev = "89f7292138087e1410b2430ae6d359d42e7fe31f";
       sha256 = "00g2yjrq7gbdc9wmj2bpcpx6frvsyk69bbi05a8b43lpdkj5yzz5";
     };
   };
@@ -248,12 +248,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2019-06-29";
+    version = "2019-07-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "6ed2171e13431dce82cda26dba30d671514d649b";
-      sha256 = "042d2dv4mbfgj5s49d55k5nm8cw7xab715qnk0jssi03cwh6j7c8";
+      rev = "ac3f1933e331b4170ad59223def8fb10b666cfa5";
+      sha256 = "0i5y2nciqy1lgl5jbhlry3qnasly8sf1wximf84dq937yk79bxjj";
     };
   };
 
@@ -425,12 +425,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-06-24";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "2b884d5d990539fe25b44398146645dafc8ffa49";
-      sha256 = "0dfmd71vkk5wlz47jzvv6j5agjc39lrx7hmlhk9ssq3apj848sfl";
+      rev = "90f8367cefbb443ba0d5b363c63be087a5937d43";
+      sha256 = "164sxi42yyqbj2v4vklmphhjqfq54ci9n21hcl3hwbrfgrh5i67i";
     };
   };
 
@@ -482,12 +482,12 @@ let
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     pname = "deoplete-jedi";
-    version = "2019-06-22";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "afd01dc2204d5003f89f6a93e1d3e1910d31fcd9";
-      sha256 = "0p70v03wjdvyy8g13m8b2r288262zz5yw3yap11id38npykb0pvv";
+      rev = "763c7befa7bbe44aa00a0c832916958a16e71254";
+      sha256 = "1dvw8l8f0k9hkfv4n791lgm1lipf5n2xhjyrwx1px92j1h94i8f1";
       fetchSubmodules = true;
     };
   };
@@ -527,12 +527,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-06-22";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "aebaec4adbb65339601063f1ee533eef09220145";
-      sha256 = "11kd4m3bwp8xn5i6am9am186rz8vw12zdissb3i86xa3dcgv856g";
+      rev = "2ac0da55367db0b9d8920bb7bcbc051f9b07b90c";
+      sha256 = "05j2s6332p7gbpwg2hfimvvmk0qaah9danl5d8brq1w34bs79vjd";
     };
   };
 
@@ -1213,12 +1213,12 @@ let
 
   neomru-vim = buildVimPluginFrom2Nix {
     pname = "neomru-vim";
-    version = "2019-05-30";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
-      rev = "57f89922ee03529b34334a82fa502be0e2a26d86";
-      sha256 = "0lx5g9wyjdq99lnmfm1hmi7n62m0gg5kx9m40x2kgx5x5fdnldhy";
+      rev = "53f9cd784b78839e865cabc43f6a7efacc4c8cad";
+      sha256 = "05xss5546n1pinhh1bpp4gmsxjbmdlp08lpzxrrq4gkyqddxdkqd";
     };
   };
 
@@ -2511,12 +2511,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-06-28";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "959586bf254b2e593aa783c4551d57d17be7d3f0";
-      sha256 = "0b4224dnsmvfl30wil91j8dzj5hvsps5sr9l09y19psjxrxwyjzx";
+      rev = "4ba84019a5d4c10e01eff62089c7385a39af3be5";
+      sha256 = "0i0wdkhzpmhk6x08xgybc4l0fmlqyqn0ximhyzcxxqafmkv448ap";
     };
   };
 
@@ -2544,12 +2544,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-06-27";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "b59859e4487fc14bfc6ee7cf3551fe4711ee32a8";
-      sha256 = "0bsdwzvhrqfkvl2rxgxj7agnq8zbjw0zawp2bqmglf9260als74x";
+      rev = "a625661cd1d35b454c9b2a9452dbfec46c4d3e17";
+      sha256 = "1v7qjslkyrrpbb780j1450piv5jb02qbidfh0863g615hz2mbnni";
     };
   };
 
@@ -2665,12 +2665,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-06-26";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "db3b2f7d49c11731b19b5952afdd7329bf52814b";
-      sha256 = "0ljp4yw320xjy4xp4hcqd03n9k2iyglwd6v83ww4bwklljd2zr7q";
+      rev = "7c8008bfb7d1b1d380252bd115368d4344aef804";
+      sha256 = "10z8xcrf7dx327kiyv6fxkw3fb72c7j5n7qaa8mcapmz9nb2ffz2";
     };
   };
 
@@ -2720,12 +2720,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-06-28";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "9c195de61bac489dfd88a55eb457113a07a21729";
-      sha256 = "195d94my65znrkkl7hxbqjrb7sqdxnk1rv7icv7di3qdm9dy106p";
+      rev = "17618402fa793d347d60540b9caf84210128ad49";
+      sha256 = "14algrw25l8fhvmk4lclpw3h1nklqmdkpwjsgci4775ihi9cdlyi";
     };
   };
 
@@ -2764,12 +2764,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-06-19";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "8aac968f1a617cc1c346707242af181e6b1f467e";
-      sha256 = "1vvixwlsnsxhrsz0dqg2i0s6a0xdpp60x0592gakjwihzplg4yp5";
+      rev = "91471746fe687ee867877508dfd809460dab5698";
+      sha256 = "0pbjvflhynzanb0hp5yyfiwpsnvv6ndnnrbmxdxk7iqjrc8765km";
     };
   };
 
@@ -2786,12 +2786,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-06-28";
+    version = "2019-06-30";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "7aa035a7d2eaa47c472c24f810225e949f3cd90d";
-      sha256 = "1hcafb6lmnffiblr3wgg0ddsk5104jacqzraa1cmzhzwyjhg27cb";
+      rev = "c67d72c476ff08bd631588429ef47d0aee75af27";
+      sha256 = "0x717yj7xmc2i8ahaxpzsnyx5ig012x70jysc73yrnwiasrhjim4";
     };
   };
 
@@ -3128,12 +3128,12 @@ let
 
   vim-ledger = buildVimPluginFrom2Nix {
     pname = "vim-ledger";
-    version = "2017-12-12";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
-      rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";
-      sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";
+      rev = "0068e6fd36fbb13b6a9852fc91514df21b5bfb8b";
+      sha256 = "0rff0fd93jlzfq8afjil4qqqg1sga3r7lwqhwgia7xl6mbg7swj8";
     };
   };
 
@@ -3458,12 +3458,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2019-06-16";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "d52700284984ada048ce325404dfa25237271ba1";
-      sha256 = "15ddnf9l9iqqwz8b0k6kpciv2qaqwr4s1k7klbc9qj8r254ys699";
+      rev = "3ddca5da461ebfaa82104f82e3cbf19d1c326ade";
+      sha256 = "0f3l0sknj4zbgmk7yx028f2qz72gdh1lnqra96c2n3xszpdvim22";
     };
   };
 
@@ -4118,12 +4118,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-06-28";
+    version = "2019-07-01";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "c8341a748340eb3b57fd11fbf9e401c06d5db60e";
-      sha256 = "1bfqj6x4awd6jsn9arc281xfjalgp0bjnsmh1vyjhpa21ij79wk2";
+      rev = "650b06020043a1b66aac3e478e620b40a2346d97";
+      sha256 = "1qimr20ima638f0s40xpap5hkr6h0fwp7cjfbbgv11njr0dmfzlc";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index efd27600887..be34113299e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -41,8 +41,8 @@ christoomey/vim-tmux-navigator
 cocopon/iceberg.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
-dag/vim2hs
 dag/vim-fish
+dag/vim2hs
 dannyob/quickfixstatus
 davidhalter/jedi-vim
 derekelkins/agda-vim
@@ -219,9 +219,9 @@ ncm2/ncm2-ultisnips
 neoclide/coc.nvim
 neoclide/vim-easygit
 neomake/neomake
+neovim/nvimdev.nvim
 neovimhaskell/haskell-vim
 neovimhaskell/nvim-hs.vim
-neovim/nvimdev.nvim
 neutaaaaan/iosvkem
 nixprime/cpsm
 NLKNguyen/papercolor-theme
@@ -346,15 +346,14 @@ valloric/youcompleteme
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
-vimoutliner/vimoutliner
 vim-pandoc/vim-pandoc
 vim-pandoc/vim-pandoc-after
 vim-pandoc/vim-pandoc-syntax
 vim-ruby/vim-ruby
+vim-scripts/a.vim
 vim-scripts/align
 vim-scripts/argtextobj.vim
 vim-scripts/autoload_cscope.vim
-vim-scripts/a.vim
 vim-scripts/bats.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
@@ -372,6 +371,7 @@ vim-scripts/taglist.vim
 vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
 vim-utils/vim-husk
+vimoutliner/vimoutliner
 vimwiki/vimwiki
 vmchale/dhall-vim
 w0rp/ale

From be356cddb94f29665e5effdf6f247755565a8268 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:11:26 -0700
Subject: [PATCH 286/377] Rename vim plugin deoplete-jedi owner to
 deoplete-plugins

---
 pkgs/misc/vim-plugins/generated.nix    | 2 +-
 pkgs/misc/vim-plugins/vim-plugin-names | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d3046ef180c..e38aeff9d49 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -484,7 +484,7 @@ let
     pname = "deoplete-jedi";
     version = "2019-06-30";
     src = fetchFromGitHub {
-      owner = "zchee";
+      owner = "deoplete-plugins";
       repo = "deoplete-jedi";
       rev = "763c7befa7bbe44aa00a0c832916958a16e71254";
       sha256 = "1dvw8l8f0k9hkfv4n791lgm1lipf5n2xhjyrwx1px92j1h94i8f1";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index be34113299e..337fc738326 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -45,6 +45,7 @@ dag/vim-fish
 dag/vim2hs
 dannyob/quickfixstatus
 davidhalter/jedi-vim
+deoplete-plugins/deoplete-jedi
 derekelkins/agda-vim
 derekwyatt/vim-scala
 dhruvasagar/vim-table-mode
@@ -388,5 +389,4 @@ Yggdroot/indentLine
 zah/nim.vim
 zchee/deoplete-clang
 zchee/deoplete-go
-zchee/deoplete-jedi
 zig-lang/zig.vim

From 767e0e590541a97fb4b27cb37312d174e4290842 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:11:57 -0700
Subject: [PATCH 287/377] vimPlugins.LanguageClient-neovim: init at 2018-08-07

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e38aeff9d49..5c7ff9df800 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -958,6 +958,17 @@ let
     };
   };
 
+  LanguageClient-neovim = buildVimPluginFrom2Nix {
+    pname = "LanguageClient-neovim";
+    version = "2018-08-07";
+    src = fetchFromGitHub {
+      owner = "autozimu";
+      repo = "LanguageClient-neovim";
+      rev = "dd45e31449511152f2127fe862d955237caa130f";
+      sha256 = "1i1c98r9fg1mzyl15b3grk6v7s7frwadh86rr1ggz7aq1gwfy7dq";
+    };
+  };
+
   last256 = buildVimPluginFrom2Nix {
     pname = "last256";
     version = "2017-06-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 337fc738326..17db1409c1e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -13,6 +13,7 @@ andviro/flake8-vim
 ap/vim-css-color
 arcticicestudio/nord-vim
 artur-shaik/vim-javacomplete2
+autozimu/LanguageClient-neovim
 bazelbuild/vim-bazel
 bbchung/clighter8
 benmills/vimux

From b414d2a3a3c517a8ad6a9c80c72e04c05e33ed0c Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:12:17 -0700
Subject: [PATCH 288/377] vimPlugins.file-line: init at 2016-10-21

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5c7ff9df800..73ac3e3cf2f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -670,6 +670,17 @@ let
     };
   };
 
+  file-line = buildVimPluginFrom2Nix {
+    pname = "file-line";
+    version = "2016-10-21";
+    src = fetchFromGitHub {
+      owner = "bogado";
+      repo = "file-line";
+      rev = "559088afaf10124ea663ee0f4f73b1de48fb1632";
+      sha256 = "1w183g0hj8jvzm6m1jw7m6xz3x1dld8n8342vnycsh6hyzdcg3mg";
+    };
+  };
+
   flake8-vim = buildVimPluginFrom2Nix {
     pname = "flake8-vim";
     version = "2017-02-17";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 17db1409c1e..a088cdc7f91 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -21,6 +21,7 @@ bhurlow/vim-parinfer
 bitc/vim-hdevtools
 bkad/camelcasemotion
 bling/vim-bufferline
+bogado/file-line
 bronson/vim-trailing-whitespace
 brooth/far.vim
 carlitux/deoplete-ternjs

From 3ed9ac70e973222cb2268afbb04264ac69a9d3f1 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:12:34 -0700
Subject: [PATCH 289/377] vimPlugins.vim-sourcetrail: init at 2018-06-26

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 73ac3e3cf2f..a9f989e8a0d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3775,6 +3775,17 @@ let
     };
   };
 
+  vim-sourcetrail = buildVimPluginFrom2Nix {
+    pname = "vim-sourcetrail";
+    version = "2018-06-26";
+    src = fetchFromGitHub {
+      owner = "CoatiSoftware";
+      repo = "vim-sourcetrail";
+      rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d";
+      sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg";
+    };
+  };
+
   vim-speeddating = buildVimPluginFrom2Nix {
     pname = "vim-speeddating";
     version = "2019-02-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a088cdc7f91..4ce2b441a10 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -40,6 +40,7 @@ chrisgeo/sparkup
 chriskempson/base16-vim
 christoomey/vim-sort-motion
 christoomey/vim-tmux-navigator
+CoatiSoftware/vim-sourcetrail
 cocopon/iceberg.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim

From fa3954073a7304c4a4c107e353c8641c4ba82ae4 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:12:44 -0700
Subject: [PATCH 290/377] vimPlugins.dart-vim-plugin: init at 2019-05-04

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a9f989e8a0d..3fc3d12122d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -401,6 +401,17 @@ let
     };
   };
 
+  dart-vim-plugin = buildVimPluginFrom2Nix {
+    pname = "dart-vim-plugin";
+    version = "2019-05-04";
+    src = fetchFromGitHub {
+      owner = "dart-lang";
+      repo = "dart-vim-plugin";
+      rev = "8ffc3e208c282f19afa237d343fa1533146bd2b4";
+      sha256 = "1ypcn3212d7gzfgvarrsma0pvaial692f3m2c0blyr1q83al1pm8";
+    };
+  };
+
   denite-extra = buildVimPluginFrom2Nix {
     pname = "denite-extra";
     version = "2019-03-29";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4ce2b441a10..aaaf310267d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -47,6 +47,7 @@ ctrlpvim/ctrlp.vim
 dag/vim-fish
 dag/vim2hs
 dannyob/quickfixstatus
+dart-lang/dart-vim-plugin
 davidhalter/jedi-vim
 deoplete-plugins/deoplete-jedi
 derekelkins/agda-vim

From ae082355b78645260f828d58b0aac78ff9647666 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:12:55 -0700
Subject: [PATCH 291/377] vimPlugins.vim-textobj-comment: init at 2014-04-11

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3fc3d12122d..d03d01dc7f1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3918,6 +3918,17 @@ let
     };
   };
 
+  vim-textobj-comment = buildVimPluginFrom2Nix {
+    pname = "vim-textobj-comment";
+    version = "2014-04-11";
+    src = fetchFromGitHub {
+      owner = "glts";
+      repo = "vim-textobj-comment";
+      rev = "58ae4571b76a5bf74850698f23d235eef991dd4b";
+      sha256 = "00wc14chwjfx95gl3yzbxm1ajx88zpzqz0ckl7xvd7gvkrf0mx04";
+    };
+  };
+
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
     pname = "vim-textobj-multiblock";
     version = "2014-06-02";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index aaaf310267d..c092d627de7 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -82,6 +82,7 @@ flazz/vim-colorschemes
 floobits/floobits-neovim
 frigoeu/psc-ide-vim
 garbas/vim-snipmate
+glts/vim-textobj-comment
 gmarik/vundle
 godlygeek/csapprox
 godlygeek/tabular

From cb81314ea06808194ab8fa3d1cdd767da271e0a8 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:13:27 -0700
Subject: [PATCH 292/377] vimPlugins.vim-textobj-function: init at 2014-05-03

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d03d01dc7f1..b500766d068 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3929,6 +3929,17 @@ let
     };
   };
 
+  vim-textobj-function = buildVimPluginFrom2Nix {
+    pname = "vim-textobj-function";
+    version = "2014-05-03";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-textobj-function";
+      rev = "adb50f38499b1f558cbd58845e3e91117e4538cf";
+      sha256 = "0cwl102si9zhhhpg6c0fjnyq35v6bl5f34p2s7b47isxdn0qvris";
+    };
+  };
+
   vim-textobj-multiblock = buildVimPluginFrom2Nix {
     pname = "vim-textobj-multiblock";
     version = "2014-06-02";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c092d627de7..0e5f5fa747f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -146,6 +146,7 @@ kana/vim-niceblock
 kana/vim-operator-replace
 kana/vim-operator-user
 kana/vim-tabpagecd
+kana/vim-textobj-function
 kassio/neoterm
 kchmck/vim-coffee-script
 KeitaNakamura/neodark.vim

From 926cac85cd514624e16a989ae1fc4eaeb966712e Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:13:38 -0700
Subject: [PATCH 293/377] vimPlugins.vim-textobj-user: init at 2018-11-19

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b500766d068..8c24c8bfdbe 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3951,6 +3951,17 @@ let
     };
   };
 
+  vim-textobj-user = buildVimPluginFrom2Nix {
+    pname = "vim-textobj-user";
+    version = "2018-11-19";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-textobj-user";
+      rev = "074ce2575543f790290b189860597a3dcac1f79d";
+      sha256 = "15wnqkxjjksgn8a7d3lkbf8d97r4w159bajrcf1adpxw8hhli1vc";
+    };
+  };
+
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
     version = "2019-03-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0e5f5fa747f..a1599b5722c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -147,6 +147,7 @@ kana/vim-operator-replace
 kana/vim-operator-user
 kana/vim-tabpagecd
 kana/vim-textobj-function
+kana/vim-textobj-user
 kassio/neoterm
 kchmck/vim-coffee-script
 KeitaNakamura/neodark.vim

From 4814e6747be6a7457edb5885e1b3f87d3858e2da Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:04 -0700
Subject: [PATCH 294/377] vimPlugins.lh-vim-lib: init at 2019-05-24

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8c24c8bfdbe..4bb11b3e9b2 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1013,6 +1013,17 @@ let
     };
   };
 
+  lh-vim-lib = buildVimPluginFrom2Nix {
+    pname = "lh-vim-lib";
+    version = "2019-05-24";
+    src = fetchFromGitHub {
+      owner = "LucHermitte";
+      repo = "lh-vim-lib";
+      rev = "113fe7d485a484471b0f8c78cea9acc897728661";
+      sha256 = "1fp3i8mbsb361f5llfxhdryymdzzb4b53sh6gsv49axg34sx4i53";
+    };
+  };
+
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
     version = "2019-06-12";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a1599b5722c..ade7f6b941e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -164,6 +164,7 @@ lepture/vim-jinja
 lervag/vimtex
 lfilho/cosco.vim
 LnL7/vim-nix
+LucHermitte/lh-vim-lib
 ludovicchabant/vim-gutentags
 ludovicchabant/vim-lawrencium
 lukaszkorecki/workflowish

From caf2ab9a01fcbc3667e48ab16259afd7dcccad6c Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:13:56 -0700
Subject: [PATCH 295/377] vimPlugins.lh-brackets: init at 2019-05-23

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4bb11b3e9b2..483709ef443 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1013,6 +1013,17 @@ let
     };
   };
 
+  lh-brackets = buildVimPluginFrom2Nix {
+    pname = "lh-brackets";
+    version = "2019-05-23";
+    src = fetchFromGitHub {
+      owner = "LucHermitte";
+      repo = "lh-brackets";
+      rev = "f3240c3782a97720e9a344b5bd5f6808e156722b";
+      sha256 = "1qyh58xxp6hh86bykk17934pgg72q7xfsngrhrrr3cxb8jpnmx7z";
+    };
+  };
+
   lh-vim-lib = buildVimPluginFrom2Nix {
     pname = "lh-vim-lib";
     version = "2019-05-24";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ade7f6b941e..74dbb316689 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -165,6 +165,7 @@ lervag/vimtex
 lfilho/cosco.vim
 LnL7/vim-nix
 LucHermitte/lh-vim-lib
+LucHermitte/lh-brackets
 ludovicchabant/vim-gutentags
 ludovicchabant/vim-lawrencium
 lukaszkorecki/workflowish

From 00b8139ca073e490e97aeb92fd33f2712fd2fc18 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:21 -0700
Subject: [PATCH 296/377] vimPlugins.lightline-ale: init at 2018-06-12

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 483709ef443..747ec7ba5bb 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1035,6 +1035,17 @@ let
     };
   };
 
+  lightline-ale = buildVimPluginFrom2Nix {
+    pname = "lightline-ale";
+    version = "2018-06-12";
+    src = fetchFromGitHub {
+      owner = "maximbaz";
+      repo = "lightline-ale";
+      rev = "dd59077f9537b344f7ae80f713c1e4856ec1520c";
+      sha256 = "1f9v6nsksy36s5i27nfx6vmyfyjk27p2w2g6x25cw56b0r3sgxmx";
+    };
+  };
+
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
     version = "2019-06-12";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 74dbb316689..a04953b3e39 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -198,6 +198,7 @@ martinda/Jenkinsfile-vim-syntax
 mattn/emmet-vim
 mattn/gist-vim
 mattn/webapi-vim
+maximbaz/lightline-ale
 mbbill/undotree
 megaannum/forms
 megaannum/self

From a0315f788cc48c7f78d5b47062bfb8207c2696ee Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:31 -0700
Subject: [PATCH 297/377] vimPlugins.sky-color-clock-vim: init at 2018-11-03

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 747ec7ba5bb..80cbed90187 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1739,6 +1739,17 @@ let
     };
   };
 
+  sky-color-clock-vim = buildVimPluginFrom2Nix {
+    pname = "sky-color-clock-vim";
+    version = "2018-11-03";
+    src = fetchFromGitHub {
+      owner = "mopp";
+      repo = "sky-color-clock.vim";
+      rev = "9d4232cc249083f3c5d2eb4e2848e491b52df4ca";
+      sha256 = "1ln50rahb177vilzr4zc7v9znm8xfid1v8gddl83gr9srdbn2bbz";
+    };
+  };
+
   sourcemap-vim = buildVimPluginFrom2Nix {
     pname = "sourcemap-vim";
     version = "2012-09-19";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a04953b3e39..28925e6658f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -213,6 +213,7 @@ michaeljsmith/vim-indent-object
 mileszs/ack.vim
 mindriot101/vim-yapf
 mkasa/lushtags
+mopp/sky-color-clock.vim
 morhetz/gruvbox
 motus/pig.vim
 mpickering/hlint-refactor-vim

From a0ee7a59fdef3696ab7a6c3031580b68157af326 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:40 -0700
Subject: [PATCH 298/377] vimPlugins.vim-bufkill: init at 2018-03-20

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 80cbed90187..506dd498de7 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2443,6 +2443,17 @@ let
     };
   };
 
+  vim-bufkill = buildVimPluginFrom2Nix {
+    pname = "vim-bufkill";
+    version = "2018-03-20";
+    src = fetchFromGitHub {
+      owner = "qpkorr";
+      repo = "vim-bufkill";
+      rev = "795dd38f3cff69d0d8fe9e71847907e200860959";
+      sha256 = "1nji86vjjbfjw4xy52yazq53hrlsr7v30xkx2awgiakz7ih0bdxa";
+    };
+  };
+
   vim-choosewin = buildVimPluginFrom2Nix {
     pname = "vim-choosewin";
     version = "2018-06-11";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 28925e6658f..3890f1a3a81 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -258,6 +258,7 @@ posva/vim-vue
 powerman/vim-plugin-AnsiEsc
 PProvost/vim-ps1
 python-mode/python-mode
+qpkorr/vim-bufkill
 Quramy/tsuquyomi
 racer-rust/vim-racer
 rafaqz/ranger.vim

From 3c4c2d718cd1d1189b11a88209c1692e0a6a50a3 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:48 -0700
Subject: [PATCH 299/377] vimPlugins.deoplete-lsp: init at 2018-12-05

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 506dd498de7..29592aa7d87 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -514,6 +514,17 @@ let
     };
   };
 
+  deoplete-lsp = buildVimPluginFrom2Nix {
+    pname = "deoplete-lsp";
+    version = "2018-12-05";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "deoplete-lsp";
+      rev = "c4837884f61a7699f328fb05b93bed0b6395dd70";
+      sha256 = "0ahfffpmc62pqnplm0lmzpam420i578rvyi7zda21nqlir9a53ij";
+    };
+  };
+
   deoplete-rust = buildVimPluginFrom2Nix {
     pname = "deoplete-rust";
     version = "2017-07-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3890f1a3a81..ab57158279c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -288,6 +288,7 @@ sheerun/vim-polyglot
 Shougo/context_filetype.vim
 Shougo/denite.nvim
 Shougo/deol.nvim
+Shougo/deoplete-lsp
 Shougo/deoplete.nvim
 Shougo/echodoc.vim
 Shougo/neco-syntax

From c48441a07a354199fe7d45740719e082af7c9a79 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:14:58 -0700
Subject: [PATCH 300/377] vimPlugins.vim-flutter: init at 2019-06-23

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 29592aa7d87..596f5f63e9e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2806,6 +2806,17 @@ let
     };
   };
 
+  vim-flutter = buildVimPluginFrom2Nix {
+    pname = "vim-flutter";
+    version = "2019-06-23";
+    src = fetchFromGitHub {
+      owner = "thosakwe";
+      repo = "vim-flutter";
+      rev = "8d7a9158cca84c4ea2a5ebc066607652fab7a9e8";
+      sha256 = "0kjr7nlqkkzlvh6p9j996bbcgd0frakla591y4ln12qwa7ys0gd1";
+    };
+  };
+
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
     pname = "vim-ft-diff_fold";
     version = "2013-02-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ab57158279c..8fd9c2a92ec 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -323,6 +323,7 @@ thinca/vim-quickrun
 thinca/vim-scouter
 thinca/vim-themis
 thinca/vim-visualstar
+thosakwe/vim-flutter
 tomasr/molokai
 tomlion/vim-solidity
 tommcdo/vim-lion

From 63738a0e1be378032182f7bbc6c941b7fad77904 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:15:06 -0700
Subject: [PATCH 301/377] vimPlugins.tcomment_vim: init at 2019-04-28

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 596f5f63e9e..8f62d53808f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1937,6 +1937,17 @@ let
     };
   };
 
+  tcomment_vim = buildVimPluginFrom2Nix {
+    pname = "tcomment_vim";
+    version = "2019-04-28";
+    src = fetchFromGitHub {
+      owner = "tomtom";
+      repo = "tcomment_vim";
+      rev = "622cc0551bef87a3dfb2846cb339412eeb8ef133";
+      sha256 = "0zd23520hn5lflcz2jpi22x13kvmy6ry7qqzbi438xyw4j4gwpfs";
+    };
+  };
+
   tender-vim = buildVimPluginFrom2Nix {
     pname = "tender-vim";
     version = "2019-06-15";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8fd9c2a92ec..54eda2477c8 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -327,6 +327,7 @@ thosakwe/vim-flutter
 tomasr/molokai
 tomlion/vim-solidity
 tommcdo/vim-lion
+tomtom/tcomment_vim
 tomtom/tlib_vim
 tpope/vim-abolish
 tpope/vim-commentary

From 8f755e931d3e9347fbc103f9264603282cf59574 Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:15:14 -0700
Subject: [PATCH 302/377] vimPlugins.ir_black: init at 2012-03-05

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8f62d53808f..f38cb25e960 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -946,6 +946,17 @@ let
     };
   };
 
+  ir_black = buildVimPluginFrom2Nix {
+    pname = "ir_black";
+    version = "2012-03-05";
+    src = fetchFromGitHub {
+      owner = "twerth";
+      repo = "ir_black";
+      rev = "4e45f1cbcc9c04cf32c8681c6b3b4534a33610ed";
+      sha256 = "13g9nqlqsjsxnrq37y33ldh41dw9q9dw07spfi7qwrskiwa0ayk7";
+    };
+  };
+
   jdaddy-vim = buildVimPluginFrom2Nix {
     pname = "jdaddy-vim";
     version = "2014-02-22";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 54eda2477c8..168493739b1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -353,6 +353,7 @@ tpope/vim-unimpaired
 tpope/vim-vinegar
 travitch/hasksyn
 troydm/zoomwintab.vim
+twerth/ir_black
 twinside/vim-haskellconceal
 Twinside/vim-hoogle
 tyru/caw.vim

From a35552e6d28b86478630af3ec5935a983199017e Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Mon, 1 Jul 2019 17:15:27 -0700
Subject: [PATCH 303/377] vimPlugins.DoxygenToolkit-vim: init at 2010-11-06

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f38cb25e960..da660e50f44 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -580,6 +580,17 @@ let
     };
   };
 
+  DoxygenToolkit-vim = buildVimPluginFrom2Nix {
+    pname = "DoxygenToolkit-vim";
+    version = "2010-11-06";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "DoxygenToolkit.vim";
+      rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3";
+      sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r";
+    };
+  };
+
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
     version = "2019-06-12";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 168493739b1..ab6416748fa 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -374,6 +374,7 @@ vim-scripts/autoload_cscope.vim
 vim-scripts/bats.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
+vim-scripts/DoxygenToolkit.vim
 vim-scripts/emodeline
 vim-scripts/Improved-AnsiEsc
 vim-scripts/jdaddy.vim

From c9f651e56ef70b62d10ef0c10642698f051798fe Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 2 Jul 2019 14:34:31 +0900
Subject: [PATCH 304/377] i3pystatus: drop praw dependency

praw is a reddit wrapper that sometimes poses problems when installing
i3pystatus (twice in the past 6 months for me).
As its usage should be relatively low, it should be fine to drop.
users can go back the old behavior by overriding extraLibs
---
 pkgs/applications/window-managers/i3/pystatus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index b44aa73bc5a..27ac4180907 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";
   };
 
-  propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+  propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
     [ libpulseaudio ] ++ extraLibs;
 
   libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];

From de3eba1c05ba815e5dd0b84f3eea36a15eb91649 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 01:31:55 -0700
Subject: [PATCH 305/377] pulseeffects: 4.6.3 -> 4.6.5

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

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index b2fd3a52a2d..0a4c9bebde7 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -47,13 +47,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "pulseeffects";
-  version = "4.6.3";
+  version = "4.6.5";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "1gp23hpsnbiymbbhn6hp8sg1pnysgf04bj9k4h9dfinbgshlq6m7";
+    sha256 = "11ihr29szpqlk9wkscns00ijihyvn5659bj1p7r1ixwgfv708apq";
   };
 
   nativeBuildInputs = [

From d80148928b12ffa9c6cc320e107515aa7b7c7994 Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Tue, 4 Jun 2019 09:54:42 +0200
Subject: [PATCH 306/377] coqPackages: fix + add multinomials 1.3 + coqeal
 1.0.0

---
 .../coq-modules/mathcomp/default.nix          | 15 +++-
 .../coq-modules/mathcomp/extra.nix            | 69 ++++++++++++-------
 pkgs/top-level/coq-packages.nix               |  6 +-
 3 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index c769ab5521e..d573eca809a 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -3,6 +3,9 @@
 }:
 with builtins // stdenv.lib;
 let
+  ####################################
+  # CONFIGURATION (please edit this) #
+  ####################################
   # sha256 of released mathcomp versions
   mathcomp-sha256 = {
     "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
@@ -19,8 +22,16 @@ let
   };
   # computes the default version of mathcomp given a version of Coq
   max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
-  default-mathcomp-version = let v = last (naturalSort (["0.0.0"]
-     ++ (attrNames (filterAttrs (_: vs: vs coq.coq-version) mathcomp-coq-versions))));
+  # mathcomp prefered version by decreasing order
+  # (the first version in the list will be tried first)
+  mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];
+
+  ##############################################################
+  # COMPUTED using the configuration above (edit with caution) #
+  ##############################################################
+  default-mathcomp-version = let v = head (
+    filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)
+            mathcomp-version-preference ++ ["0.0.0"]);
      in if v == "0.0.0" then max-mathcomp-version else v;
 
   # list of core mathcomp packages sorted by dependency order
diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix
index c30ba19b75a..0d9557623c3 100644
--- a/pkgs/development/coq-modules/mathcomp/extra.nix
+++ b/pkgs/development/coq-modules/mathcomp/extra.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, coq, mathcomp, coqPackages,
+{ stdenv, fetchFromGitHub, coq, ssreflect, coqPackages,
   recurseIntoAttrs }:
 with builtins // stdenv.lib;
-let current-mathcomp = mathcomp; in
+let current-ssreflect = ssreflect; in
 let
 # configuring packages
 param = {
@@ -20,6 +20,7 @@ param = {
   };
   multinomials = {
     version-sha256 = {
+      "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
       "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
       "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
       "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
@@ -32,7 +33,9 @@ param = {
       "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
       "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
     };
+    compatibleCoqVersions = flip elem ["8.8" "8.9"];
     description = "Analysis library compatible with Mathematical Components";
+    license = stdenv.lib.licenses.cecill-c;
   };
   real-closed = {
     version-sha256 = {
@@ -42,6 +45,15 @@ param = {
     };
     description = "Mathematical Components Library on real closed fields";
   };
+  coqeal = {
+    version-sha256 = {
+      "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii";
+    };
+    description = "CoqEAL - The Coq Effective Algebra Library";
+    owner = "CoqEAL";
+    compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"];
+    license = stdenv.lib.licenses.mit;
+  };
 };
 versions = {
   "1.9.0" = {
@@ -49,13 +61,17 @@ versions = {
     bigenough.version = "1.0.0";
     analysis = {
       version = "0.2.2";
-      core-deps = with coqPackages; [ mathcomp_1_9-field ];
+      core-deps = with coqPackages; [ mathcomp-field_1_9 ];
+      extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
+    };
+    multinomials = {
+      version = "1.3";
+      core-deps = with coqPackages; [ mathcomp-algebra_1_9 ];
       extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ];
     };
-    multinomials = {};
     real-closed = {
       version = "1.0.3";
-      core-deps = with coqPackages; [ mathcomp_1_9-field ];
+      core-deps = with coqPackages; [ mathcomp-field_1_9 ];
       extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ];
     };
   }; 
@@ -64,37 +80,42 @@ versions = {
     bigenough.version = "1.0.0";
     analysis = {
       version = "0.2.2";
-      core-deps = with coqPackages; [ mathcomp_1_8-field ];
+      core-deps = with coqPackages; [ mathcomp-field_1_8 ];
       extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
     };
     multinomials = {
-      version = "1.2";
-      core-deps = with coqPackages; [ mathcomp_1_8-algebra ];
+      version = "1.3";
+      core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
       extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ];
     };
     real-closed = {
       version = "1.0.3";
-      core-deps = with coqPackages; [ mathcomp_1_8-field ];
+      core-deps = with coqPackages; [ mathcomp-field_1_8 ];
       extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];
     };
+    coqeal = {
+      version = "1.0.0";
+      core-deps = with coqPackages; [ mathcomp-algebra_1_8 ];
+      extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ];
+    };
   };
   "1.7.0" = {
     finmap.version = "1.1.0";
     bigenough.version = "1.0.0";
     analysis = {
       version = "0.1.0";
-      core-deps = with coqPackages; [ mathcomp_1_7-field ];
+      core-deps = with coqPackages; [ mathcomp-field_1_7 ];
       extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ];
     };
     multinomials = {
       version = "1.1";
-      core-deps = with coqPackages; [ mathcomp_1_7-algebra ];
+      core-deps = with coqPackages; [ mathcomp-algebra_1_7 ];
       extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ];
     };
     real-closed = {
       version = "1.0.1";
-      core-deps = with coqPackages; [ mathcomp_1_8-field ];
-      extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ];
+      core-deps = with coqPackages; [ mathcomp-field_1_7 ];
+      extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ];
     };
   };
 };
@@ -104,24 +125,25 @@ packageGen = {
   # optional arguments
   src ? "",
   owner ? "math-comp",
-  core-deps ? [ coqPackages.mathcomp-ssreflect ],
   extra-deps ? [],
-  mathcomp ? current-mathcomp,
+  ssreflect ? current-ssreflect,
+  core-deps ? null,
   compatibleCoqVersions ? null,
-  license ? mathcomp.meta.license,
+  license ? ssreflect.meta.license,
   # mandatory
   package, version ? "broken", version-sha256, description
   }:
   let
     theCompatibleCoqVersions = if compatibleCoqVersions == null
-                               then mathcomp.compatibleCoqVersions
+                               then ssreflect.compatibleCoqVersions
                                else compatibleCoqVersions;
+    mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
   in
   { "${package}" = let from = src; in
 
   stdenv.mkDerivation rec {
     inherit version;
-    name = "coq${coq.coq-version}-mathcomp-${mathcomp.version}-${package}-${version}";
+    name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}";
 
     src = if from == "" then fetchFromGitHub {
       owner = owner;
@@ -130,7 +152,7 @@ packageGen = {
       sha256 = version-sha256."${version}";
     } else from;
 
-    propagatedBuildInputs = [ coq mathcomp ] ++ extra-deps;
+    propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
 
     installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
@@ -138,7 +160,7 @@ packageGen = {
       inherit description;
       inherit license;
       inherit (src.meta) homepage;
-      inherit (mathcomp.meta) platforms;
+      inherit (ssreflect.meta) platforms;
       maintainers = [ stdenv.lib.maintainers.vbgl ];
       broken = (version == "broken");
     };
@@ -151,14 +173,14 @@ packageGen = {
   };
   };
 
-current-versions = versions."${current-mathcomp.version}" or {};
+current-versions = versions."${current-ssreflect.version}" or {};
 
 select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
 
 for-version = v: suffix: (mapAttrs' (n: pkg:
         {name = "mathcomp_${suffix}-${n}";
          value = (packageGen ({
-             mathcomp = coqPackages."mathcomp_${suffix}";
+             ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
            } // pkg))."${n}";})
         (select versions."${v}"));
 
@@ -173,7 +195,8 @@ in
 mathcompExtraGen = packageGen;
 mathcomp_1_7-finmap_1_0 =
   (packageGen (select {finmap = {version = "1.0.0";
-                                 mathcomp = coqPackages.mathcomp_1_7;};
+                                 ssreflect = coqPackages.mathcomp-ssreflect_1_7;};
                       }).finmap).finmap;
 multinomials = all.mathcomp-multinomials;
+coqeal = all.mathcomp-coqeal;
 } // all
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 524f3bf4399..8a987c6cf14 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -54,17 +54,17 @@ let
         mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9
         mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9;
       inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { })
-        mathcompExtraGen multinomials
+        mathcompExtraGen multinomials coqeal
 
         mathcomp-finmap mathcomp-bigenough mathcomp-analysis
-        mathcomp-multinomials mathcomp-real-closed
+        mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal
 
         mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis
         mathcomp_1_7-multinomials mathcomp_1_7-real-closed
         mathcomp_1_7-finmap_1_0
 
         mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis
-        mathcomp_1_8-multinomials mathcomp_1_8-real-closed
+        mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal
 
         mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis
         mathcomp_1_9-multinomials mathcomp_1_9-real-closed;

From 593956fe96b92f67c503908d13d38b7a8f16bb83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 00:22:03 -0700
Subject: [PATCH 307/377] plantuml: 1.2019.6 -> 1.2019.7

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 7bd7ac0ee02..42d03c06b87 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2019.6";
+  version = "1.2019.7";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "0sxpk7n96a3vwf0dlf62zs0rgm01gf36k62rbr8cyjf62qgf61lb";
+    sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 09d38ea0d5302ba9390e51fcc74857a65554a313 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 05:50:57 -0700
Subject: [PATCH 308/377] python37Packages.luftdaten: 0.5.0 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index 10d7eda9e04..037644f60b2 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "luftdaten";
-  version = "0.5.0";
+  version = "0.6.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c";
+    sha256 = "0jxp9yfabdgn2d6w69ijrw1bk1d9g897425cyybiyc13zhhs0kwg";
   };
 
   propagatedBuildInputs = [ aiohttp async-timeout ];

From 01f11297e41cc6254e283bed50f0810b843edfcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 07:58:20 -0700
Subject: [PATCH 309/377] pet: 0.3.4 -> 0.3.5 (#64108)

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

diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index 93eea81d043..ce562bbf5ac 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   name = "pet-${version}";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "knqyf263";
     repo = "pet";
     rev = "v${version}";
-    sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s";
+    sha256 = "03fzvvdmb06kf2zglaf8jkqxqv9h1kl7n586ww61z3n3mmp1x4rd";
   };
 
   modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";

From e884852ac4c4e179a0bcfd8cfb52b4d0f3b9c018 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 2 Jul 2019 11:11:00 -0400
Subject: [PATCH 310/377] arrow-cpp: add fixDarwinDylibNames

---
 pkgs/development/libraries/arrow-cpp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 7f7ef3336a4..c4cbd970d41 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
+{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
 
 let
   parquet-testing = fetchFromGitHub {
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     ./darwin.patch
     ];
 
-  nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];
+  nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
   buildInputs = [
     boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
     snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy

From 235bb7febd234433d7c5f4d725dad6f5d12c9d2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 22:34:03 -0700
Subject: [PATCH 311/377] osinfo-db: 20190504 -> 20190611

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

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 0cb3ae5136f..19872bef7fe 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20190504";
+  version = "20190611";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "1yik26gbm3y3wviyabfpyx7pnqx72z5j7267hdgfscdvrwwmyi5z";
+    sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 096a2998f1876da8a5e3e7241cc84a50904250d2 Mon Sep 17 00:00:00 2001
From: Taran Lynn <taranlynn0@gmail.com>
Date: Sat, 4 May 2019 17:26:15 -0700
Subject: [PATCH 312/377] maintainers: add lambda-11235

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 060b5de1e9a..58b52ded6ea 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2758,6 +2758,11 @@
     github = "lasandell";
     name = "Luke Sandell";
   };
+  lambda-11235 = {
+    email = "taranlynn0@gmail.com";
+    github = "lambda-11235";
+    name = "Taran Lynn";
+  };
   lassulus = {
     email = "lassulus@gmail.com";
     github = "Lassulus";

From e706a83f0d2d2fbdcde4d22f28d0e8f874ea39f3 Mon Sep 17 00:00:00 2001
From: Taran Lynn <taranlynn0@gmail.com>
Date: Sat, 4 May 2019 15:52:01 -0700
Subject: [PATCH 313/377] redeclipse: init at 1.6.0.

See www.redeclipse.net for information.
---
 pkgs/games/redeclipse/default.nix | 57 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/games/redeclipse/default.nix

diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix
new file mode 100644
index 00000000000..2825c184bc5
--- /dev/null
+++ b/pkgs/games/redeclipse/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub, fetchurl, fetchpatch
+, curl, ed, pkgconfig, zlib, libX11
+, SDL2, SDL2_image, SDL2_mixer
+}:
+
+stdenv.mkDerivation rec {
+  pname = "redeclipse";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/red-eclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2";
+    sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8";
+  };
+
+  buildInputs = [
+    libX11 zlib
+    SDL2 SDL2_image SDL2_mixer
+  ];
+
+  nativeBuildInputs = [
+    curl ed pkgconfig
+  ];
+
+  makeFlags = [ "-C" "src/" "prefix=$(out)" ];
+
+  patches = [
+    # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise
+    # Is likely to be included in next release
+    (fetchpatch {
+       url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff";
+       sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  installTargets = [ "system-install" ];
+
+  postInstall = ''
+      cp -R -t $out/share/redeclipse/data/ data/*
+  '';
+
+  meta = {
+    description = "A first person arena shooter, featuring parkour, impulse boosts, and more.";
+    longDescription = ''
+      Red Eclipse is a fun-filled new take on the first person arena shooter,
+      featuring parkour, impulse boosts, and more. The development is geared
+      toward balanced gameplay, with a general theme of agility in a variety of
+      environments.
+    '';
+    homepage = https://www.redeclipse.net;
+    license = with stdenv.lib.licenses; [ zlib cc-by-sa-30 ];
+    maintainers = with stdenv.lib.maintainers; [ lambda-11235 ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3e4654c12f..001214093ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21837,6 +21837,8 @@ in
 
   racer = callPackage ../games/racer { };
 
+  redeclipse = callPackage ../games/redeclipse { };
+
   residualvm = callPackage ../games/residualvm { };
 
   rftg = callPackage ../games/rftg { };

From 95d9c2b7a2d938ce03bb49d63f9164f8d52e4ce6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 09:42:50 -0700
Subject: [PATCH 314/377] python37Packages.robotframework-seleniumlibrary:
 3.2.0 -> 3.3.1

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

diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 0affafb1f32..7294126f516 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
 
 buildPythonPackage rec {
-  version = "3.2.0";
+  version = "3.3.1";
   pname = "robotframework-seleniumlibrary";
 
   # no tests included in PyPI tarball
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "SeleniumLibrary";
     rev = "v${version}";
-    sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";
+    sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq";
   };
 
   propagatedBuildInputs = [ robotframework selenium ];

From 97f3269ddb4ad0ce699bb2714324a0bdfaac8c16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 09:57:28 -0700
Subject: [PATCH 315/377] python37Packages.sabyenc: 3.3.5 -> 3.3.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/python3.7-sabyenc/versions
---
 pkgs/development/python-modules/sabyenc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix
index 7c82e22efd6..e8294ce7bcd 100644
--- a/pkgs/development/python-modules/sabyenc/default.nix
+++ b/pkgs/development/python-modules/sabyenc/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sabyenc";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85";
+    sha256 = "1qbymi1626mmcxnsqdwnz2krxg7jvl4qbh8nwjj54z2p681wvjm4";
   };
 
   # tests are not included in pypi distribution

From cd55e52de3c91bfe0eacfe3f28232888e8f4da22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 09:04:38 -0700
Subject: [PATCH 316/377] python37Packages.virtual-display: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix
index 01efc61584f..130c94bc170 100644
--- a/pkgs/development/python-modules/virtual-display/default.nix
+++ b/pkgs/development/python-modules/virtual-display/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "PyVirtualDisplay";
-  version = "0.2.3";
+  version = "0.2.4";
 
   propagatedBuildInputs = [ EasyProcess ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "658d03ea2d6727cbe70c30af71e9014d3d39114a3c50bd661b75aad188fdd3aa";
+    sha256 = "0nybvd7sajig6vya2v3fd20dls6f3nnf12x8anrfxnjs41chgx87";
   };
 
   # requires X server

From 172923ad95e5d0b6af0e4cb85c8900090491b374 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 02:39:59 -0700
Subject: [PATCH 317/377] python37Packages.cherrypy: 18.1.1 -> 18.1.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/python3.7-cherrypy/versions
---
 pkgs/development/python-modules/cherrypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index b39353f649d..a0c8d24889d 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "cherrypy";
-  version = "18.1.1";
+  version = "18.1.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     pname = "CherryPy";
     inherit version;
-    sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b";
+    sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
   };
 
   propagatedBuildInputs = [

From 498f515ae5b42702a6ac82a48933d341903089bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 02:20:47 -0700
Subject: [PATCH 318/377] python37Packages.braintree: 3.54.0 -> 3.55.0

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

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 2d1ca0d5f78..6a5e6f82b7c 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "3.54.0";
+  version = "3.55.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd";
+    sha256 = "0l3i0ayzykrsraqf87z4h39qm3kxyfwrm09n81gnkvsn2126izsd";
   };
 
   propagatedBuildInputs = [ requests ];

From 7ef0c72310fee42f27538a9d5b924d0e28ba8820 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 02:55:48 -0700
Subject: [PATCH 319/377] python37Packages.cmd2: 0.9.13 -> 0.9.14

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

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 8b171fb3c8d..e88f87b7bd0 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.13";
+  version = "0.9.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b873ade57ebf6c42a9d4e8c705fc2b16777e9d2e53fec5b113914dc65f2eae38";
+    sha256 = "0rllwc4h89xdivy85nmgqdi2s0sk1zw31mlvrnlr9gz2902cnq93";
   };
 
   LC_ALL="en_US.UTF-8";

From ce083f4bf4e7aec3f9aa390331b59cb6f3157941 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 01:37:35 -0700
Subject: [PATCH 320/377] pyotherside: 1.5.6 -> 1.5.8

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

diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix
index c7d43ae7026..a7f5e03c738 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/pkgs/development/libraries/pyotherside/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyotherside";
-  version = "1.5.6";
+  version = "1.5.8";
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
     rev = version;
-    sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";
+    sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z";
   };
 
   nativeBuildInputs = [ qmake ];

From f7054527b2cf65dbf48afb582197fda8b8d01ca9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 05:45:52 -0700
Subject: [PATCH 321/377] python37Packages.libversion: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index 2da73b8437a..e5741176426 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "libversion";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ax1bq5hrbs2pq2krya83yj1s5cm33pcpwalnc15cgj73kmhb5fn";
+    sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 31543f144bf7166ca65893ef729b1e68f17be382 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 08:31:20 -0700
Subject: [PATCH 322/377] python37Packages.pytesseract: 0.2.6 -> 0.2.7

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

diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 8fae56e9a23..547e52edbd2 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";
+    sha256 = "0vyv6wnch1l5kcxqzngakx948qz90q604bl5h93x54381lq3ndj6";
   };
 
   patches = [

From 90323c387b55271a59a402976adfbcd79ae3230f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 23:24:11 -0700
Subject: [PATCH 323/377] pdfpc: 4.3.2 -> 4.3.4

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

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 0e424a97d8d..c0dca056476 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.3.2";
+  version = "4.3.4";
 
   src = fetchFromGitHub {
     repo = product;
     owner = product;
     rev = "v${version}";
-    sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z";
+    sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd";
   };
 
   nativeBuildInputs = [

From 2564dac828a8afa6e3054dd75f1e8de3f0ece836 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 16:25:46 -0700
Subject: [PATCH 324/377] lldpd: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index d4ded1142d8..a8e4f2dc83f 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "lldpd-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
-    sha256 = "0q63wiaan85a6d204jgk87w6dw5c9x0rb2z7pwb580b8a4wyvz1r";
+    sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";
   };
 
   configureFlags = [

From 9dfa1f5f55d675ff5b81c30a6a7768b018036946 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 17:16:40 -0700
Subject: [PATCH 325/377] mc: 4.8.22 -> 4.8.23

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index a86b7fecc43..7f0cdac1dbf 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.22";
+  version = "4.8.23";
 
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
-    sha256 = "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f";
+    sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From bcbc159e98e5d25577bf6d02d0533d4ba24ee162 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 15:14:48 -0700
Subject: [PATCH 326/377] libpqxx: 6.4.4 -> 6.4.5

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

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 737c0dc4a0a..f6f2412c818 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libpqxx";
-  version = "6.4.4";
+  version = "6.4.5";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = pname;
     rev = version;
-    sha256 = "0l62qlln5q1qhapbnm8n1k0hbzf3287gld1jpcbwr0yj79l9j579";
+    sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From 48044cda54265ec69d3988bf4d06199b920c212b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 14:58:59 -0700
Subject: [PATCH 327/377] libhandy: 0.0.9 -> 0.0.10

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

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index d32bb82abcb..9c3d9faf1f4 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "libhandy";
-  version = "0.0.9";
+  version = "0.0.10";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0smfnvfba6cnxbrcm1vh3zbr1hww43qcxhawka3hzn2hjr06rfzn";
+    sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs";
   };
 
   nativeBuildInputs = [

From 176e06c360b545a7f4a988422ef4151eb8355c2d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 13:49:59 -0700
Subject: [PATCH 328/377] latte-dock: 0.8.8 -> 0.8.9

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

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index e560fa30294..bdbdef45fe7 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.8.8";
+  version = "0.8.9";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
-    sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd";
+    sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
     name = "${name}.tar.xz";
   };
 

From a5596b451a9e541114659ed03acfb1c449f0b96a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 13:03:50 -0700
Subject: [PATCH 329/377] klavaro: 3.07 -> 3.08

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

diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 9fc7d0c3a7d..4cea30c79e6 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "klavaro-${version}";
-  version = "3.07";
+  version = "3.08";
 
   src = fetchurl {
     url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
-    sha256 = "1zz7kr3rhprn1ixmh58x8sdmdfl42lki7vgbina3sgnamx31zia5";
+    sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc";
   };
 
   nativeBuildInputs = [ intltool makeWrapper pkgconfig ];

From 819bee55b3f1a4b2bb0e4d57bbc2f2f7121adb25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 17:07:29 -0700
Subject: [PATCH 330/377] matio: 1.5.15 -> 1.5.16

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

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 9abdf4bbd85..83673022835 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.15";
+  name = "matio-1.5.16";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "1kxi15ph68nnbi0s1m8icb0685wg8ql8gj7wnkdk20kzpf3lbgr1";
+    sha256 = "0i2g7jqbb4j8xlf1ly7gfpw5zyxmr245qf57v6w0jmwx4rfkvfj7";
   };
 
   meta = with stdenv.lib; {

From a7d23ad1f06d15a8a4d03fa93edb038a0583435f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 14:34:53 -0700
Subject: [PATCH 331/377] libcouchbase: 2.10.3 -> 2.10.4

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

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 77f495e32b8..894faf0b910 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";
+    sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From f2068a351662ae4087123a5330ef75b63d1330d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 10:18:35 -0700
Subject: [PATCH 332/377] groonga: 9.0.3 -> 9.0.4

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

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 6b611ae6762..f69b3637f95 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "9.0.3";
+  version = "9.0.4";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1sj7vq0b6panh3q1br9r30g5nphxjw7brwncrkyxjyawgw7cc94j";
+    sha256 = "00cyzvk8303y0xcmb0hiy45wj2j6baqqzrfda9f6fv3zlfna1n2g";
   };
 
   buildInputs = with stdenv.lib;

From 325556c84e9df6efc72186cd11a8db7e5d9e81f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 06:30:54 -0700
Subject: [PATCH 333/377] flatpak-builder: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index fa00b8e5f89..7eb05765428 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -43,7 +43,7 @@
 let
   installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
-  version = "1.0.7";
+  version = "1.0.8";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "04z9i2kahj4mffzq8ny0jvc4g3ah8kv8ilqv2rx9r1l8fhbq30jj";
+    sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
   };
 
   nativeBuildInputs = [

From b9ac8efcc331dd6a9046fcbdaf231bacd8bcda69 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 03:33:14 -0700
Subject: [PATCH 334/377] dhcpcd: 7.2.2 -> 7.2.3

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 65d4d368b10..6d14789e7f4 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
   # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
-  name = "dhcpcd-7.2.2";
+  name = "dhcpcd-7.2.3";
 
   src = fetchurl {
     url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "17m0ig9n4p6m98j8wp4dwnl2cfg2rg3v6vqpsahls9x9rccgzdrx";
+    sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From df71eaa0b0e9e468850da27fbff9584ab18b9c4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 03:24:49 -0700
Subject: [PATCH 335/377] dehydrated: 0.6.2 -> 0.6.5

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

diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index c9c879becaa..699c86b5fe3 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,7 +1,7 @@
 { stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
-  version = "0.6.2";
+  version = "0.6.5";
 in
 stdenv.mkDerivation rec {
   name = pkgName + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "lukas2511";
     repo = "dehydrated";
     rev = "v${version}";
-    sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4";
+    sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";
   };
 
   buildInputs = [ makeWrapper ];

From 3b27d1c2c0f22d583acb7816fbbc35e157527776 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 02:00:44 -0700
Subject: [PATCH 336/377] cimg: 2.6.5 -> 2.6.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/cimg/versions
---
 pkgs/development/libraries/cimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index bffbf4011de..89dd2b44338 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "cimg-${version}";
-  version = "2.6.5";
+  version = "2.6.6";
 
   src = fetchurl {
     url = "http://cimg.eu/files/CImg_${version}.zip";
-    sha256 = "1q409xrri67vqhda6f6jfqnvzj1b3b9xlpi27vm9vl10k2lv4m3a";
+    sha256 = "06a6qgs7q79asfbfp615h5iin23y7g8y1achnmsp3rpkikssskzv";
   };
 
   nativeBuildInputs = [ unzip ];

From d8a04b449e48ca40ac85dc388924b044b9ccb330 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 04:27:27 -0700
Subject: [PATCH 337/377] ecasound: 2.9.1 -> 2.9.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/ecasound/versions
---
 pkgs/applications/audio/ecasound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index a9d84eb6e6c..1013b8a560c 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   name = "ecasound-${version}";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz";
-    sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r";
+    sha256 = "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1";
   };
 
   buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];

From 3a28589551776c74bb71847e86ccc15b05a42b51 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Jun 2019 22:21:07 -0700
Subject: [PATCH 338/377] mod_wsgi: 4.6.6 -> 4.6.7

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

diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index f51574e68e7..ff71e460b2a 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mod_wsgi-${version}";
-  version = "4.6.6";
+  version = "4.6.7";
 
   src = fetchurl {
     url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
-    sha256 = "1ic5lafqlwpld5jz2irj3yws883xhxldjyyh514w1lad1v085sbq";
+    sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
   };
 
   buildInputs = [ apacheHttpd python2 ];

From f9f010ef94b9c92a36caa22920e26f5c8fd9187d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 11:34:05 -0700
Subject: [PATCH 339/377] python37Packages.vega: 2.1.0 -> 2.3.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/python3.7-vega/versions
---
 pkgs/development/python-modules/vega/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index adbcf539494..f6a9f3153f1 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "2.1.0";
+  version = "2.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb";
+    sha256 = "0f39kfinn297gjhms9jys3ixdlsn0dz3gndgacyimp77jhzir4v1";
   };
 
   buildInputs = [ pytest ];

From 2d0790463ff0358944315f22f03fb205266277a4 Mon Sep 17 00:00:00 2001
From: Craig Hall <ch9871@gmail.com>
Date: Wed, 19 Jun 2019 13:21:36 +0100
Subject: [PATCH 340/377] maintainers: add gloaming

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 58b52ded6ea..1ff47c76fd0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1945,6 +1945,11 @@
     github = "glenns";
     name = "Glenn Searby";
   };
+  gloaming = {
+    email = "ch9871@gmail.com";
+    github = "gloaming";
+    name = "Craig Hall";
+  };
   globin = {
     email = "mail@glob.in";
     github = "globin";

From a87dda41523f363dd08c9c3d21bd554aa023c7ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 12:42:34 -0700
Subject: [PATCH 341/377] qutebrowser: 1.6.2 -> 1.6.3

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4eeef72a4e1..03a5aa7bfe2 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -21,12 +21,12 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.6.2";
+  version = "1.6.3";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1yzwrpqpghlpy2d7pbjgcb73dbngw835l4xbimz5aa90mvqkbwg1";
+    sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy";
   };
 
   # Needs tox

From 5a7ab1963a95a7a805c9b05fe118dd2238815dd3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 12:25:04 -0700
Subject: [PATCH 342/377] qmmp: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 490f8639d38..03f6bb1b793 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.3.2";
+  name = "qmmp-1.3.3";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1rh063kcyg7gs9yj2r4v5irpnq4pjaxaxsgrw30mdr21xhhc15cz";
+    sha256 = "1777kqgvbkshqlawy00gbgwflxflwmjjidqdq29mhqszs76r6727";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 2450a9b5e5957a4be904bcea1c722d52ad898383 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 15:27:41 -0700
Subject: [PATCH 343/377] riemann: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 3f7ef949366..50325144fca 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchurl {
     url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "0vq7yr048sqy8dgs9l3kn1q6s3hhlhs5551hj445cng8z6n4bc4v";
+    sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3f7322ced55c7714783f1c72481759831e5dd99e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 15:54:13 -0700
Subject: [PATCH 344/377] sassc: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index db4d9dcd1ac..07f1581e341 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sassc";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
     rev = version;
-    sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2";
+    sha256 = "1sxm54mkhs9m4vnl7vn11y17mhzamc403hv3966j1c7p2rbzg5pv";
   };
 
   patchPhase = ''

From 13df34a7f3c65c6d2be7e03ec82a96fc578a9564 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:02:56 -0700
Subject: [PATCH 345/377] termdown: 1.14.1 -> 1.15.0

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

diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 65963f9aa34..dc23443489f 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name    = "termdown-${version}";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     rev    = version;
-    sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a";
+    sha256 = "08l03yk5jc1g0gps789q1s2knnaqzlidy4s5q5nhwg9g25la19nr";
     repo   = "termdown";
     owner  = "trehn";
   };

From 07fc403138ee4eb38cfe18a7084afbdff8276e67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:49:59 -0700
Subject: [PATCH 346/377] libtoxcore: 0.2.9 -> 0.2.10

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

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 1605abf6efa..50fdbf2a81f 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -48,7 +48,7 @@ in rec {
   };
 
   libtoxcore_0_2 = generic {
-    version = "0.2.9";
-    sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j";
+    version = "0.2.10";
+    sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn";
   };
 }

From 9e85956c0df80aa07e3bdba0cf3709f7090ec376 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:53:01 -0700
Subject: [PATCH 347/377] tpm2-tools: 3.1.4 -> 3.2.0

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

diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix
index 1d4cb4f2185..1a6c8aaaa5d 100644
--- a/pkgs/tools/security/tpm2-tools/default.nix
+++ b/pkgs/tools/security/tpm2-tools/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tools";
-  version = "3.1.4";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0cv09wnf7sw17z1n898w0zmk58y8b1why58m63hqx5d7x4054l9g";
+    sha256 = "057gg84zly6gjp6ypj6bv6zzmnr77cqsygl8x0147cylwa1ywydd";
   };
 
   nativeBuildInputs = [ pandoc pkgconfig ];

From fae90476b72d6f39ad5e6dc4d387b0fef0d79d1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 19:13:24 -0700
Subject: [PATCH 348/377] typora: 0.9.70 -> 0.9.72

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

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 03a8a55c780..157204ce1ca 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "typora";
-  version = "0.9.70";
+  version = "0.9.72";
 
   src = fetchurl {
     url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-    sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2";
+    sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs";
   };
 
   nativeBuildInputs = [

From b247ffdf766730ad75cbe7249d03e00eb1c1deeb Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 2 Jul 2019 16:59:38 +0900
Subject: [PATCH 349/377] i3pystatus: 2019-02-10 -> 2019-06-10

---
 pkgs/applications/window-managers/i3/pystatus.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index 27ac4180907..20ea0dd03cc 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -3,16 +3,15 @@
 python3Packages.buildPythonApplication rec {
   # i3pystatus moved to rolling release:
   # https://github.com/enkore/i3pystatus/issues/584
-  version = "unstable-2019-02-10";
+  version = "unstable-2019-06-10";
   pname = "i3pystatus";
-  disabled = !python3Packages.isPy3k;
 
   src = fetchFromGitHub
   {
     owner = "enkore";
     repo = "i3pystatus";
-    rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e";
-    sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";
+    rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
+    sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
   };
 
   propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++

From bb7a367fed1e1b99b7d3bb276076a760db6fc708 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 2 Jul 2019 20:31:38 -0700
Subject: [PATCH 350/377] redeclipse: fix license info

---
 pkgs/games/redeclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix
index 2825c184bc5..fe8fb5243b8 100644
--- a/pkgs/games/redeclipse/default.nix
+++ b/pkgs/games/redeclipse/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       cp -R -t $out/share/redeclipse/data/ data/*
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A first person arena shooter, featuring parkour, impulse boosts, and more.";
     longDescription = ''
       Red Eclipse is a fun-filled new take on the first person arena shooter,
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
       toward balanced gameplay, with a general theme of agility in a variety of
       environments.
     '';
-    homepage = https://www.redeclipse.net;
-    license = with stdenv.lib.licenses; [ zlib cc-by-sa-30 ];
-    maintainers = with stdenv.lib.maintainers; [ lambda-11235 ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://www.redeclipse.net";
+    license = with licenses; [ licenses.zlib cc-by-sa-30 ];
+    maintainers = with maintainers; [ lambda-11235 ];
+    platforms = platforms.linux;
     hydraPlatforms = [];
   };
 }

From f4398b3212844a56ecbe36f6ccebd9344aac8c7c Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 3 Jul 2019 01:41:07 +0200
Subject: [PATCH 351/377] transgui: 5.0.1-svn-r988 -> 5.17.0

---
 .../networking/p2p/transgui/default.nix       | 21 +++++++++---------
 .../p2p/transgui/r988-compile-fix.patch       | 22 -------------------
 2 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch

diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index f047b630ec4..d4823988526 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
+{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
 libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "transgui-5.0.1-svn-r${revision}";
-  revision = "988";
+  pname = "transgui";
+  version = "5.17.0";
 
-  src = fetchsvn {
-    url = "https://svn.code.sf.net/p/transgui/code/trunk/";
-    rev = revision;
-    sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
+  src = fetchFromGitHub {
+    owner = "transmission-remote-gui";
+    repo = "transgui";
+    rev = "v${version}";
+    sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -27,9 +28,9 @@ stdenv.mkDerivation rec {
     substituteInPlace restranslator.pas --replace /usr/ $out/
   '';
 
-  patches = [
-    ./r988-compile-fix.patch
-  ];
+  preBuild = ''
+    lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
+  '';
 
   makeFlags = [
     "FPC=fpc"
diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
deleted file mode 100644
index 4b070d0cbe8..00000000000
--- a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/utils.pas b/utils.pas
-index eb8b828..1ff2440 100644
---- a/utils.pas
-+++ b/utils.pas
-@@ -100,7 +100,7 @@ uses
- {$ifdef CALLSTACK}
-   lineinfo2,
- {$endif CALLSTACK}
--  LazFileUtils, LazUtf8, StdCtrls, Graphics;
-+  LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;
- 
- {$ifdef windows}
- function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
-@@ -235,7 +235,7 @@ end;
- 
- function ParamStrUTF8(Param: Integer): utf8string;
- begin
--  Result:=FileUtil.ParamStrUTF8(Param);
-+  Result:=LazUtf8.ParamStrUTF8(Param);
- end;
- 
- function ParamCount: integer;

From 5568ec4c14fe3346cee7dc70e0d9230842d3e91a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 21:23:49 -0700
Subject: [PATCH 352/377] xlockmore: 5.56 -> 5.57

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

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index 47c3c67366e..c3cfbaf23b3 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
 , libXdmcp, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "xlockmore-5.56";
+  name = "xlockmore-5.57";
 
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "1dg1n79rnswhxqz36mxnl5lp8p37i9fbibnzzyrqknmvf2s8xpd0";
+    sha256 = "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From 0c96c9b5050fcf063f7ac2c9e92fb06b71fa6021 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 22:14:45 -0700
Subject: [PATCH 353/377] zsh-autosuggestions: 0.5.2 -> 0.6.3

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

diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index dc8c88b77cb..6af1869da7e 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-autosuggestions-${version}";
-  version = "0.5.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-autosuggestions";
     rev = "v${version}";
-    sha256 = "1xhrdv6cgmq9qslb476rcs8ifw8i2vf43yvmmscjcmpz0jac4sbx";
+    sha256 = "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c";
   };
 
   buildInputs = [ zsh ];

From 9bd257455e2deb77b9646b71534e819e895e4c72 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 22:01:05 -0700
Subject: [PATCH 354/377] yubikey-manager-qt: 1.1.1 -> 1.1.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/yubikey-manager-qt/versions
---
 pkgs/tools/misc/yubikey-manager-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix
index 6eda3e6e436..a1d0b185a0a 100644
--- a/pkgs/tools/misc/yubikey-manager-qt/default.nix
+++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix
@@ -27,11 +27,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "yubikey-manager-qt";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "0hcfl0mh4gqy9c8ghmi58asqr8v009n6li0mgcy3r8fyjr7qryvy";
+    sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8";
   };
 
   nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython qmake ];

From 48a1b8e25ad1a295536f7a1de941c73888ac82b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 20:16:34 -0700
Subject: [PATCH 355/377] virtmanager: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index bb16660db87..392517e3ab2 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -10,12 +10,12 @@ with stdenv.lib;
 
 python3Packages.buildPythonApplication rec {
   name = "virt-manager-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
-    sha256 = "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil";
+    sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9";
   };
 
   nativeBuildInputs = [

From 4bf65cf0fa646a73170c73c84afcd42ca391592c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 20:10:41 -0700
Subject: [PATCH 356/377] verilator: 4.014 -> 4.016

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

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 36a504e86fa..b531563c5c1 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "4.014";
+  version = "4.016";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1srk9a03hbq8rdp4mma817aiq61c2hbrs66qv25zj3dfnfqigxgd";
+    sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
   };
 
   enableParallelBuilding = true;

From 458c936fc8bc2389e33a89eece4e5f5df22ad9cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 19:49:38 -0700
Subject: [PATCH 357/377] urh: 2.7.0 -> 2.7.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/urh/versions
---
 pkgs/applications/radio/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 11a132ba06f..58a0b8048b5 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urh";
-  version = "2.7.0";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yxv38p8a2srk9c55jj96vcib6m6pb6m485ysfg2ilwjzipx2ab0";
+    sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv";
   };
 
   buildInputs = [ hackrf rtl-sdr airspy limesuite ];

From c650aa2d9e123c8f4096f0b99b7cca04a6d4d8b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:42:47 -0700
Subject: [PATCH 358/377] tomb: 2.5 -> 2.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/tomb/versions
---
 pkgs/os-specific/linux/tomb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index d932ebd776b..880fd61ec2c 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tomb-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner  = "dyne";
     repo   = "Tomb";
     rev    = "v${version}";
-    sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1";
+    sha256 = "0pr0lw1byxwkgv857zfmd8yqa03a7mckhzklrf9rkv1l6nisz0z0";
   };
 
   buildInputs = [ sudo zsh pinentry ];

From b85a00ee67aa1716becd1ec14c20271dabb11f39 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:32:42 -0700
Subject: [PATCH 359/377] tintin: 2.01.7 -> 2.01.8

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

diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index 50fb7ba19c4..eb4299a4092 100644
--- a/pkgs/games/tintin/default.nix
+++ b/pkgs/games/tintin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "tintin-2.01.7";
+  name = "tintin-2.01.8";
 
   src = fetchurl {
     url    = "mirror://sourceforge/tintin/${name}.tar.gz";
-    sha256 = "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v";
+    sha256 = "056g82yi784mf4gbrida9fxqmz347m2l9vad2ksv2fhl7g553y2s";
   };
 
   buildInputs = [ zlib pcre ];

From 5e4bbd8bee12a1d2c2eb2b9944b95acc2e64e2a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 18:06:05 -0700
Subject: [PATCH 360/377] tengine: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index 12dc207002d..cac31ed9d59 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -10,12 +10,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.3.1";
   name = "tengine-${version}";
 
   src = fetchurl {
     url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
-    sha256 = "09165sdzad8bjxhnwphbags6yvxnz2rkf14p0w3vgvzssj017kqp";
+    sha256 = "075blm2d62a0bdixc3vngrxpgr7ngl1s4y8hm20pbvc07f0kzn9x";
   };
 
   buildInputs =

From 7f67dba302b2a2737b40df88f3f1cdea88d20a8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 17:53:13 -0700
Subject: [PATCH 361/377] tautulli: 2.1.29 -> 2.1.32

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

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 68c922783c3..b19b4d13893 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.29";
+  version = "2.1.32";
   pname = "Tautulli";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1n5kpfcm59qg27xhlan3w2x71dp1h3gycdlp0iyxaqzaaw5splry";
+    sha256 = "05z6l3qs2m72c1hcl3qd1lm17hsmyqk48f8dcsvrxa5hibmf84j4";
   };
 
   buildPhase = ":";

From 3aa55684c3133a4596e08f7b1e4836f6ee56bbac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 17:46:31 -0700
Subject: [PATCH 362/377] sysvinit: 2.94 -> 2.95

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

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 8549e7ccd54..a29c6152aaa 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, withoutInitTools ? false }:
 
-let version = "2.94"; in
+let version = "2.95"; in
 
 stdenv.mkDerivation {
   name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
 
   src = fetchurl {
     url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";
-    sha256 = "05wshfgrijp3pi9rpfsa0yx4w3bf5v6hlwjqw79nlhz53xjca2by";
+    sha256 = "1j46dydib9yd2a46w43is9b61lplwrsry46fw7cbmfrn7ywrq0n9";
   };
 
   prePatch = ''

From ad1be0083c3be40e67cf91be5464fdf75a64c21e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 16:56:41 -0700
Subject: [PATCH 363/377] smtube: 18.11.0 -> 19.6.0

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index c5dcec38723..41f82a8bdd5 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmake, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "18.11.0";
+  version = "19.6.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp";
+    sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
   };
 
   makeFlags = [

From e6bde6dd79407f6892173a784ef6d69dbc1e9b23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 12:06:25 -0700
Subject: [PATCH 364/377] python37Packages.zconfig: 3.4.0 -> 3.5.0

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

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 24cb00c2b18..f68164284da 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "ZConfig";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998";
+    sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550";
   };
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;

From 24ed4749d735bce26ee6a2b266610fa4256f069b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 12:03:38 -0700
Subject: [PATCH 365/377] python37Packages.yamllint: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 53ad728cc29..b22b9554fa6 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7";
+    sha256 = "1bw39aiyqspjsxps5m3skaszih8vap8kyialbzg7jjc080nyqkws";
   };
 
   checkInputs = [ nose ];

From 19ee6c8e0a5046ec23343f951e01acbe3bbf2019 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 11:57:33 -0700
Subject: [PATCH 366/377] python37Packages.xarray: 0.12.1 -> 0.12.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/python3.7-xarray/versions
---
 pkgs/development/python-modules/xarray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index d547d4a15d1..930729c052e 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac09a819e791be208ae33fa7ecee19d0fe7b5479906f927d358a61957ce27e10";
+    sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s";
   };
 
   checkInputs = [ pytest ];

From 857c4536f8aab4df50a6643f2d528fa1e443af7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 11:13:40 -0700
Subject: [PATCH 367/377] python37Packages.twilio: 6.28.0 -> 6.29.0

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

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index a30c173b68b..f7772492dfd 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.28.0";
+  version = "6.29.0";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "161s4nb4hhqgb8kc5wiq3s4jkv9a3fg9vycf5ga804vzfr04zlki";
+    sha256 = "1xsg862d68rdrl6m3v9zcq20h42jn6x9cv1bk2ydiizyn6ngqz8w";
   };
 
   buildInputs = [ nose mock ];

From 05ce9d889e0dfc88ef5c7d7b0ad5264b865a6c96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 11:08:36 -0700
Subject: [PATCH 368/377] python37Packages.tomlkit: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 47cf737f188..1c87a3f1837 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hjfzlb6y694pkadygcaq1n63di97pxgq2zpc74in1axc5166l6n";
+    sha256 = "1pby2lbzwy2pwdbq8xaqi4560b1ih5m0y141mmbc446j3w168fvv";
   };
 
   propagatedBuildInputs =

From cae7022c700ab4224707dcabe0ffaf196a8011d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 10:42:35 -0700
Subject: [PATCH 369/377] python37Packages.statsmodels: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index ba26ba5e651..25019155905 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6461f93a842c649922c2c9a9bc9d9c4834110b89de8c4af196a791ab8f42ba3b";
+    sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5";
   };
 
   checkInputs = with self; [ nose ];

From eaecad655f000c666e403193048cb9e9fd24e644 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 10:24:58 -0700
Subject: [PATCH 370/377] python37Packages.snakeviz: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index b41633da4d3..c55d6c7376a 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "snakeviz";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa";
+    sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40";
   };
 
   # Upstream doesn't run tests from setup.py

From 3936095feb3233908abf9241b51fc45d8ce0523f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 09:13:57 -0700
Subject: [PATCH 371/377] python37Packages.qtpy: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index 24e607f2849..19cfcff4ab1 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtPy";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17pdn4d77gjjrsq7m1i6dz9px0dfi6wgaqz2v3sa3crl15spawp9";
+    sha256 = "14hws3zc2d548bfkxk1j2xy4ll368rak3z16bz3pdlj9j259jrpb";
   };
 
   # no concrete propagatedBuildInputs as multiple backends are supposed

From 7990d1bf47da7f8e4e7b4effe06b1c76aeee3cb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 08:41:05 -0700
Subject: [PATCH 372/377] python37Packages.pytest-django: 3.4.8 -> 3.5.1

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

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 60b8e7f0852..794a1e8bf20 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
 }:
 buildPythonPackage rec {
   pname = "pytest-django";
-  version = "3.4.8";
+  version = "3.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vj2xfb6jl570zmmwlhvfpj7af5q554z72z51ril07gyfkkq6cjd";
+    sha256 = "1fynkswykgnqn8wqibavf598md5p005ilcac6sk4hpfv0v2v8kr6";
   };
 
   nativeBuildInputs = [ pytest setuptools_scm ];

From e1bd47a7b76f36f087cce27cba9cba00630f732f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 03:15:35 -0700
Subject: [PATCH 373/377] python37Packages.confluent-kafka: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 4f9794b034e..9e4f4072bf6 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "1.0.1";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7427944af963410479c2aaae27cc9d28db39c9a93299f14dcf16df80092c63a";
+    sha256 = "04bsnyhldcvscdj0dg3hm5k27vmhfi9k6bwz963sd3q2h7g9k6kg";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;

From 7eb22c8fe4ea35f6cd42aa0a02308068c99e4823 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 02:52:55 -0700
Subject: [PATCH 374/377] python37Packages.chameleon: 3.6.1 -> 3.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/python3.7-chameleon/versions
---
 pkgs/development/python-modules/chameleon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index 7f146537585..eec8dcf29aa 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Chameleon";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed";
+    sha256 = "0aw6cqnychmsxjjgihwr7df92xw6ac1wr4x70mvq28z3iq35x7ls";
   };
 
   meta = with stdenv.lib; {

From 513bd49b4496765342db7b218ec91d2c1cb48666 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 13 Jun 2019 21:20:37 +0200
Subject: [PATCH 375/377] rustc: 1.34.2 -> 1.35.0

---
 pkgs/development/compilers/rust/bootstrap.nix | 16 +++---
 .../rust/patches/net-tcp-disable-tests.patch  | 53 +++++++++----------
 pkgs/development/compilers/rust/rustc.nix     |  4 +-
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index b3446436179..5eccc92a0c7 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.33.0";
+  version = "1.34.2";
 
-  # fetch hashes by running `print-hashes.sh 1.33.0`
+  # fetch hashes by running `print-hashes.sh 1.34.2`
   hashes = {
-    i686-unknown-linux-gnu = "c379203687d98e60623aa88c4df4992dd5a9548bc30674b9fc8e671a979e9f3a";
-    x86_64-unknown-linux-gnu = "6623168b9ee9de79deb0d9274c577d741ea92003768660aca184e04fe774393f";
-    armv7-unknown-linux-gnueabihf = "f6f0ec0a98d922c4bfd79703bc9e9eef439ba347453f33608a87cd63c47e7245";
-    aarch64-unknown-linux-gnu = "a308044e4076b62f637313ea803fa0a8f340b0f1b53136856f2c43afcabe5387";
-    i686-apple-darwin = "ed20809d56bbaea041721ce6fc9f10f7ae7a720c5821587f01a537d07a5454b1";
-    x86_64-apple-darwin = "864e7c074a0b88e38883c87c169513d072300bb52e1d320a067bd34cf14f66bd";
+    i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04";
+    x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f";
+    armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e";
+    aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8";
+    i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c";
+    x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
index 1bb9a98f7b6..57abb3117ec 100644
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
@@ -1,8 +1,7 @@
-diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 86ecb10edf..626be0a52d 100644
---- a/src/libstd/net/tcp.rs
-+++ b/src/libstd/net/tcp.rs
-@@ -955,6 +955,7 @@ mod tests {
+diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs
+--- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs	2019-05-20 14:10:15.000000000 +0200
++++ rustc-1.35.0-src/src/libstd/net/tcp.rs	2019-06-13 19:59:46.740611889 +0200
+@@ -973,6 +973,7 @@
          }
      }
  
@@ -10,7 +9,7 @@ index 86ecb10edf..626be0a52d 100644
      #[test]
      fn listen_localhost() {
          let socket_addr = next_test_ip4();
-@@ -1013,6 +1014,7 @@ mod tests {
+@@ -1031,6 +1032,7 @@
          })
      }
  
@@ -18,7 +17,7 @@ index 86ecb10edf..626be0a52d 100644
      #[test]
      fn read_eof() {
          each_ip(&mut |addr| {
-@@ -1032,6 +1034,7 @@ mod tests {
+@@ -1050,6 +1052,7 @@
          })
      }
  
@@ -26,7 +25,7 @@ index 86ecb10edf..626be0a52d 100644
      #[test]
      fn write_close() {
          each_ip(&mut |addr| {
-@@ -1058,6 +1061,7 @@ mod tests {
+@@ -1076,6 +1079,7 @@
          })
      }
  
@@ -34,7 +33,7 @@ index 86ecb10edf..626be0a52d 100644
      #[test]
      fn multiple_connect_serial() {
          each_ip(&mut |addr| {
-@@ -1080,6 +1084,7 @@ mod tests {
+@@ -1098,6 +1102,7 @@
          })
      }
  
@@ -42,7 +41,7 @@ index 86ecb10edf..626be0a52d 100644
      #[test]
      fn multiple_connect_interleaved_greedy_schedule() {
          const MAX: usize = 10;
-@@ -1116,6 +1121,7 @@ mod tests {
+@@ -1134,6 +1139,7 @@
      }
  
      #[test]
@@ -50,7 +49,7 @@ index 86ecb10edf..626be0a52d 100644
      fn multiple_connect_interleaved_lazy_schedule() {
          const MAX: usize = 10;
          each_ip(&mut |addr| {
-@@ -1394,6 +1400,7 @@ mod tests {
+@@ -1467,6 +1473,7 @@
      }
  
      #[test]
@@ -58,7 +57,7 @@ index 86ecb10edf..626be0a52d 100644
      fn clone_while_reading() {
          each_ip(&mut |addr| {
              let accept = t!(TcpListener::bind(&addr));
-@@ -1504,7 +1511,10 @@ mod tests {
+@@ -1597,7 +1604,10 @@
  
      // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
      //        no longer has rounding errors.
@@ -67,30 +66,30 @@ index 86ecb10edf..626be0a52d 100644
 +                   target_os = "netbsd",
 +                   target_os = "openbsd",
 +                   target_os = "macos"), ignore)]
+     #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
      #[test]
      fn timeouts() {
-         let addr = next_test_ip4();
-@@ -1591,6 +1601,7 @@ mod tests {
+@@ -1643,6 +1653,7 @@
          drop(listener);
      }
  
 +    #[cfg_attr(target_os = "macos", ignore)]
      #[test]
+     #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
+     fn test_read_with_timeout() {
+@@ -1687,6 +1698,7 @@
+         drop(listener);
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     #[cfg_attr(target_env = "sgx", ignore)]
      fn nodelay() {
-         let addr = next_test_ip4();
-@@ -1605,6 +1616,7 @@ mod tests {
-         assert_eq!(false, t!(stream.nodelay()));
+@@ -1719,6 +1731,7 @@
+         assert_eq!(ttl, t!(stream.ttl()));
      }
  
 +    #[cfg_attr(target_os = "macos", ignore)]
      #[test]
-     fn ttl() {
-         let ttl = 100;
-@@ -1642,6 +1654,7 @@ mod tests {
-         }
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn peek() {
-         each_ip(&mut |addr| {
+     #[cfg_attr(target_env = "sgx", ignore)]
+     fn set_nonblocking() {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index fb658afe07e..099e41805ab 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -17,11 +17,11 @@ let
   llvmShared = llvm_7.override { enableSharedLibraries = true; };
 in stdenv.mkDerivation rec {
   pname = "rustc";
-  version = "1.34.2";
+  version = "1.35.0";
 
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0mig0prkmlnpbba1cmi17vlsl88ikv5pi26zjy2kcr64l62lm6n6";
+    sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas";
   };
 
   __darwinAllowLocalNetworking = true;

From 3a0b18054fb2db9309e61287df59bea737a6f015 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 13 Jun 2019 21:45:31 +0200
Subject: [PATCH 376/377] rustfmt: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index b37292b6afa..b98ab0dc74d 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustfmt";
     rev = "v${version}";
-    sha256 = "153pas7d5fchkmiw6mkbhn75lv3y69k85spzmm5i4lqnq7f0yqap";
+    sha256 = "1k9p6sp8q87flx9vzg46880ir7likvbydai3g6q76278h86rn0v8";
   };
 
   cargoSha256 = "08x6vy5v2vgrk3gsw3qcvv52a7hifsgcsnsg1phlk1ikaff21y4z";

From 368c415a01ee0df1e03682879ee9c396047b588f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 28 Jun 2019 20:42:12 +0200
Subject: [PATCH 377/377] rustc: don't patch precompiled binaries on darwin

This doesn't work anymore since 1.35.0 because the load commands end up
being too large, but this is a precompiled binary anyway so it's not
really needed or more impure to use the expected system versions.
---
 .../compilers/rust/binaryBuild.nix            | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 77dba7f9e62..cb2fba96e18 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -31,7 +31,8 @@ rec {
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+    buildInputs = [ bash ]
+      ++ stdenv.lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -53,17 +54,6 @@ rec {
           "$out/bin/cargo"
       ''}
 
-      ${optionalString (stdenv.isDarwin && bootstrapping) ''
-        install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc"
-        install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
-        install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
-        for f in $out/lib/lib*.dylib; do
-          install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
-        done
-      ''}
-
       # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
       # (or similar) here. It causes strange effects where rustc loads
       # the wrong libraries in a bootstrap-build causing failures that
@@ -85,7 +75,8 @@ rec {
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
+    buildInputs = [ makeWrapper bash ]
+      ++ stdenv.lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -102,12 +93,6 @@ rec {
           "$out/bin/cargo"
       ''}
 
-      ${optionalString (stdenv.isDarwin && bootstrapping) ''
-        install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
-      ''}
-
       wrapProgram "$out/bin/cargo" \
         --suffix PATH : "${rustc}/bin"
     '';